From patchwork Thu Dec 7 21:46:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 10101145 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 36E8C60329 for ; Thu, 7 Dec 2017 21:51:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2998A28734 for ; Thu, 7 Dec 2017 21:51:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D0B6287F4; Thu, 7 Dec 2017 21:51:01 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 78BAF2879E for ; Thu, 7 Dec 2017 21:51:00 +0000 (UTC) Received: from localhost ([::1]:34520 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN44J-0007vG-Cq for patchwork-qemu-devel@patchwork.kernel.org; Thu, 07 Dec 2017 16:50:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eN403-00042v-0F for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eN401-0006Rh-VK for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:35 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eN401-0006Qe-Oq for qemu-devel@nongnu.org; Thu, 07 Dec 2017 16:46:33 -0500 Received: by mail-pf0-x244.google.com with SMTP id p84so5683269pfd.3 for ; Thu, 07 Dec 2017 13:46: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=NA08dy/kaR5uBsMTC17SfMbDCJfWDF1R8gD8SDh/I4A=; b=exQRKH/4VTk3CVmB8L9pDj4zopS/+pI0cvuNF5X6CTC1to8rY7/ZXPyPowbg0TWk6l +Z8bSrOT8PFXnHVloyNHrxRN0cUDzskOFLa4WJFk96ym0WgoKUoz8PIljhT10SdvT5wf 0v7SRfliwecOhAdLKjNorIKBBXp+dh1kKT2YLTnp0q8QA2BjzsogafdL8q/NAFbLR/pf FyPjDHemHdGKRXGU+/aVZjvJGP4OSEIgL9bb2LcxfBQk1MnoHcIJpVMQoWnKZFN7PoZG 5m8zCddMF9+vJooJ2at3Sdwr6rSBI3e7VCJSdFvAfa8/41IhNcJtG+xu/dHcS4YO4HNC ZKtw== 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=NA08dy/kaR5uBsMTC17SfMbDCJfWDF1R8gD8SDh/I4A=; b=ksfKAeZ/sd1Yu78WcfuQK6lcp1/FeLagwWSz5Pi8UZa3md/K+twRPoE5ibH2nvv39g O9/sPFDBLsvUTdBqQmOfPodkvrvAf9mVoiOgVZpp8+mgsrf1+CNzZ9ZPYmCz/0xbqKbE 8fvkQjqBul5FDLdqvoHZapR55ss48vt9JY9mb1Y+E/jrogkAIIJPW4GjT/l44rADxqZG 51nbjtigCEza/m48PisfAJFxS9m1Wvpx6f5j9Iaqn1LGulZk6oAng//CLIjG5BrHCfCg vVi/aZtFcmitapnil5hUY68nc/FFCH0RfVuTUAoVeVb46J24UPXEiropPIr/XZ2ktwmH pawA== X-Gm-Message-State: AJaThX6Vo/FQl98Fx0gIZggy0yBPLj9WrSoLjnG5B6lDBakOjf4NCt1z VZWL3+huxBNTJ1YMvH4MDg== X-Google-Smtp-Source: AGs4zMZQjWAeIlZAU6JHyxeo7nMpJkh01iXLn2GA8KbkRME87VWH0r3gmfzRyesCIJGgSLxk9D4Rgg== X-Received: by 10.101.64.130 with SMTP id t2mr26026925pgp.299.1512683192747; Thu, 07 Dec 2017 13:46:32 -0800 (PST) Received: from serve.minyard.net ([47.184.168.85]) by smtp.gmail.com with ESMTPSA id l21sm10936820pfg.156.2017.12.07.13.46.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 13:46:29 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 5D847EB7; Thu, 7 Dec 2017 15:46:25 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 51672302368; Thu, 7 Dec 2017 15:46:23 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 7 Dec 2017 15:46:15 -0600 Message-Id: <1512683181-8420-9-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512683181-8420-1-git-send-email-minyard@acm.org> References: <1512683181-8420-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [PATCH 08/14] i2c: Add an SMBus vmstate structure 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: Corey Minyard 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 Signed-off-by: Corey Minyard --- hw/i2c/smbus.c | 14 ++++++++++++++ include/hw/i2c/smbus.h | 18 +++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index 4b0e264..e15f3f2 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -357,6 +357,20 @@ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, return 0; } +const VMStateDescription vmstate_smbus_device = { + .name = TYPE_SMBUS_DEVICE, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_I2C_SLAVE(i2c, SMBusDevice), + VMSTATE_INT32(mode, SMBusDevice), + VMSTATE_INT32(data_len, SMBusDevice), + VMSTATE_UINT8_ARRAY(data_buf, SMBusDevice, SMBUS_DATA_MAX_LEN), + VMSTATE_UINT8(command, SMBusDevice), + VMSTATE_END_OF_LIST() + } +}; + static void smbus_device_class_init(ObjectClass *klass, void *data) { I2CSlaveClass *sc = I2C_SLAVE_CLASS(klass); diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index f1b8078..7794026 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -54,14 +54,16 @@ typedef struct SMBusDeviceClass uint8_t (*read_data)(SMBusDevice *dev, uint8_t cmd, int n); } SMBusDeviceClass; +#define SMBUS_DATA_MAX_LEN 34 /* command + len + 32 bytes of data. */ + struct SMBusDevice { /* The SMBus protocol is implemented on top of I2C. */ I2CSlave i2c; /* Remaining fields for internal use only. */ - int mode; - int data_len; - uint8_t data_buf[34]; /* command + len + 32 bytes of data. */ + int32_t mode; + int32_t data_len; + uint8_t data_buf[SMBUS_DATA_MAX_LEN]; uint8_t command; }; @@ -93,4 +95,14 @@ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, const uint8_t *eeprom_spd, int size); +extern const VMStateDescription vmstate_smbus_device; + +#define VMSTATE_SMBUS_DEVICE(_field, _state) { \ + .name = (stringify(_field)), \ + .size = sizeof(SMBusDevice), \ + .vmsd = &vmstate_smbus_device, \ + .flags = VMS_STRUCT, \ + .offset = vmstate_offset_value(_state, _field, SMBusDevice), \ +} + #endif