From patchwork Wed Nov 7 15:54:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 10672605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3D3517D4 for ; Wed, 7 Nov 2018 15:55:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3D602C7FA for ; Wed, 7 Nov 2018 15:55:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A86722C7E4; Wed, 7 Nov 2018 15:55:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3B0382C79E for ; Wed, 7 Nov 2018 15:55:59 +0000 (UTC) Received: from localhost ([::1]:49050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQBS-0001VT-FF for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Nov 2018 10:55:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQAE-0000VJ-Fg for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKQAA-00020b-91 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:42 -0500 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]:36242) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKQA8-0001xP-FL for qemu-devel@nongnu.org; Wed, 07 Nov 2018 10:54:37 -0500 Received: by mail-oi1-x244.google.com with SMTP id r127-v6so14209887oie.3 for ; Wed, 07 Nov 2018 07:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uy2OKLTiDnFEns3o9LzMnFpxj5U0/822p3D8iG2rJbQ=; b=AmdosAyKvPXRBnhOOuEJAoqrTT/OlhEcHRq4+7wg2ISyO7H7nIxbxrC2sTPTW2lJax DIZJYqW9cM8wSCy/GnQd4FrHty2hsUnbM/7k8s4n9nG0SwmACu4O9rbUP0AxFd9ou20x 4DP9N9smVAXStPmHRSpA1mddUcAXxzpHJN9RRy8bbakNpuG84AsVM0sOK4dH3OFtiHBd KmxUEMo/sN3E8fcBRhIbneChqUW1kv72QC6mvSWs2r566iqkdMpDPfxEg+Ir097pgebW H3YtN1GETN2j4pLNmitDAGCEaKQWTeum5zcdEWe1jCG2A0n69SxDLCvU52UVAc1Mb6yA VmjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uy2OKLTiDnFEns3o9LzMnFpxj5U0/822p3D8iG2rJbQ=; b=TGQZ+VTmtnbJ/t2dDv8Vq6k1iILFZWdTDzldOWdkLFcRAc4K5HV8ySJQYdY9yy2OsM N0irebCX0KShmyP+Sro1V6RkPImPhj0fMc3O8ait9Lf+9vm64mtfrprmXNYi4NS5AlFs XXAuHjmlhJBev+ZUlNkZy3AsHr/nNnglSczZkrnWEXFk7/qYGw6gAWA4264u+mcDQ1I3 L2oFZj2FwWOjb4rbILWoWe0S3/pYvSPSUuCpWV8m6X8i9gNQHpIMabhbYI5wEG8XuIEP SxdCVWOgArbqCaooILPgRQModNLxprjkMtBmr1DH8E2IMREyzzp5cUg6m+Xnu8knBM01 RAGw== X-Gm-Message-State: AGRZ1gISyLaY0VSl5VMpmgej292VHOZ7lyIRrUf9kHmQuMoCEXhwl+/l 0zHn6gOkctABXfltXC8gniOcuZA= X-Google-Smtp-Source: AJdET5dTRaVhT6yC2Rkqwr6VYquxMZ/3MCR7RZJDyllKaLGnDGRr022Bhp9av4XgwdcCBT3z7e2EIA== X-Received: by 2002:a54:488f:: with SMTP id r15-v6mr457446oic.80.1541606072791; Wed, 07 Nov 2018 07:54:32 -0800 (PST) Received: from serve.minyard.net ([47.184.170.128]) by smtp.gmail.com with ESMTPSA id i35sm345275ote.69.2018.11.07.07.54.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 07:54:30 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 4614DF26; Wed, 7 Nov 2018 09:54:29 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 5E2D9301154; Wed, 7 Nov 2018 09:54:28 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Wed, 7 Nov 2018 09:54:05 -0600 Message-Id: <20181107155405.24013-4-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181107155405.24013-1-minyard@acm.org> References: <20181107155405.24013-1-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::244 Subject: [Qemu-devel] [PATCH 3/3] i2c: Add vmstate handling to the smbus eeprom X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Corey Minyard , "Dr . David Alan Gilbert" , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Corey Minyard This was if the eeprom is accessed during a state transfer, the transfer will be reliable. Signed-off-by: Corey Minyard Cc: Paolo Bonzini Cc: Michael S. Tsirkin Cc: Dr. David Alan Gilbert --- hw/i2c/smbus_eeprom.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hw/i2c/smbus_eeprom.c b/hw/i2c/smbus_eeprom.c index f18aa3de35..d4430b0c5d 100644 --- a/hw/i2c/smbus_eeprom.c +++ b/hw/i2c/smbus_eeprom.c @@ -29,6 +29,8 @@ //#define DEBUG +#define TYPE_SMBUS_EEPROM_DEVICE "smbus-eeprom" + typedef struct SMBusEEPROMDevice { SMBusDevice smbusdev; void *data; @@ -97,6 +99,17 @@ static uint8_t eeprom_read_data(SMBusDevice *dev, uint8_t cmd, int n) return eeprom_receive_byte(dev); } +static const VMStateDescription vmstate_smbus_eeprom = { + .name = TYPE_SMBUS_EEPROM_DEVICE, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_SMBUS_DEVICE(smbusdev, SMBusEEPROMDevice), + VMSTATE_UINT8(offset, SMBusEEPROMDevice), + VMSTATE_END_OF_LIST() + } +}; + static void smbus_eeprom_realize(DeviceState *dev, Error **errp) { SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev; @@ -121,12 +134,13 @@ static void smbus_eeprom_class_initfn(ObjectClass *klass, void *data) sc->write_data = eeprom_write_data; sc->read_data = eeprom_read_data; dc->props = smbus_eeprom_properties; + dc->vmsd = &vmstate_smbus_eeprom; /* Reason: pointer property "data" */ dc->user_creatable = false; } static const TypeInfo smbus_eeprom_info = { - .name = "smbus-eeprom", + .name = TYPE_SMBUS_EEPROM_DEVICE, .parent = TYPE_SMBUS_DEVICE, .instance_size = sizeof(SMBusEEPROMDevice), .class_init = smbus_eeprom_class_initfn,