From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re6YX-0002zM-7z for qemu-devel@nongnu.org; Fri, 23 Dec 2011 09:57:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Re6YV-0007YE-1N for qemu-devel@nongnu.org; Fri, 23 Dec 2011 09:57:09 -0500 Received: from cantor2.suse.de ([195.135.220.15]:50664 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Re6YU-0007Xr-Ol for qemu-devel@nongnu.org; Fri, 23 Dec 2011 09:57:07 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 23 Dec 2011 15:55:51 +0100 Message-Id: <1324652151-4299-3-git-send-email-afaerber@suse.de> In-Reply-To: <1324652151-4299-1-git-send-email-afaerber@suse.de> References: <1324652151-4299-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC 2/2] ahci: Add migration support for ICH9 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Alexander Graf , mjt@tls.msk.ru, =?UTF-8?q?Andreas=20F=C3=A4rber?= , brogers@suse.com Introduce generic vmstate_ahci and VMSTATE_AHCI macro. Resolve name conflict and hook it up for ich9-ahci. Signed-off-by: Andreas F=C3=A4rber Cc: Kevin Wolf Cc: Alexander Graf --- hw/ide/ahci.c | 41 +++++++++++++++++++++++++++++++++++++++++ hw/ide/ahci.h | 10 ++++++++++ hw/ide/ich.c | 11 ++++++++--- 3 files changed, 59 insertions(+), 3 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 51cb48b..7d1415b 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1213,3 +1213,44 @@ void ahci_reset(void *opaque) ahci_reset_port(&d->ahci, i); } } + +const VMStateDescription vmstate_ahci_device =3D { + .name =3D "ahci port", + .version_id =3D 1, + .fields =3D (VMStateField []) { + VMSTATE_IDE_BUS(port, AHCIDevice), + VMSTATE_UINT32(port_state, AHCIDevice), + VMSTATE_UINT32(finished, AHCIDevice), + VMSTATE_UINT32(port_regs.lst_addr, AHCIDevice), + VMSTATE_UINT32(port_regs.lst_addr_hi, AHCIDevice), + VMSTATE_UINT32(port_regs.fis_addr, AHCIDevice), + VMSTATE_UINT32(port_regs.fis_addr_hi, AHCIDevice), + VMSTATE_UINT32(port_regs.irq_stat, AHCIDevice), + VMSTATE_UINT32(port_regs.irq_mask, AHCIDevice), + VMSTATE_UINT32(port_regs.cmd, AHCIDevice), + VMSTATE_UINT32(port_regs.tfdata, AHCIDevice), + VMSTATE_UINT32(port_regs.sig, AHCIDevice), + VMSTATE_UINT32(port_regs.scr_stat, AHCIDevice), + VMSTATE_UINT32(port_regs.scr_ctl, AHCIDevice), + VMSTATE_UINT32(port_regs.scr_err, AHCIDevice), + VMSTATE_UINT32(port_regs.scr_act, AHCIDevice), + VMSTATE_UINT32(port_regs.cmd_issue, AHCIDevice), + VMSTATE_END_OF_LIST() + }, +}; + +const VMStateDescription vmstate_ahci =3D { + .name =3D "ahci", + .version_id =3D 1, + .fields =3D (VMStateField []) { + VMSTATE_STRUCT_ARRAY(dev, AHCIState, AHCI_MAX_PORTS, 0, + vmstate_ahci_device, AHCIDevice), + VMSTATE_UINT32(control_regs.cap, AHCIState), + VMSTATE_UINT32(control_regs.ghc, AHCIState), + VMSTATE_UINT32(control_regs.irqstatus, AHCIState), + VMSTATE_UINT32(control_regs.impl, AHCIState), + VMSTATE_UINT32(control_regs.version, AHCIState), + VMSTATE_UINT32(idp_index, AHCIState), + VMSTATE_END_OF_LIST() + }, +}; diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 4df7c2b..56ee621 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -306,6 +306,16 @@ typedef struct AHCIPCIState { AHCIState ahci; } AHCIPCIState; =20 +extern const VMStateDescription vmstate_ahci; + +#define VMSTATE_AHCI(_field, _state) { \ + .name =3D (stringify(_field)), \ + .size =3D sizeof(AHCIState), \ + .vmsd =3D &vmstate_ahci, \ + .flags =3D VMS_STRUCT, \ + .offset =3D vmstate_offset_value(_state, _field, AHCIState), \ +} + typedef struct NCQFrame { uint8_t fis_type; uint8_t c; diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 3f7510f..851b6a9 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -79,9 +79,14 @@ #define ICH9_IDP_INDEX 0x10 #define ICH9_IDP_INDEX_LOG2 0x04 =20 -static const VMStateDescription vmstate_ahci =3D { +static const VMStateDescription vmstate_ich9_ahci =3D { .name =3D "ahci", - .unmigratable =3D 1, + .version_id =3D 1, + .fields =3D (VMStateField []) { + VMSTATE_PCI_DEVICE(card, AHCIPCIState), + VMSTATE_AHCI(ahci, AHCIPCIState), + VMSTATE_END_OF_LIST() + }, }; =20 static int pci_ich9_ahci_init(PCIDevice *dev) @@ -151,7 +156,7 @@ static PCIDeviceInfo ich_ahci_info[] =3D { .qdev.name =3D "ich9-ahci", .qdev.alias =3D "ahci", .qdev.size =3D sizeof(AHCIPCIState), - .qdev.vmsd =3D &vmstate_ahci, + .qdev.vmsd =3D &vmstate_ich9_ahci, .init =3D pci_ich9_ahci_init, .exit =3D pci_ich9_uninit, .config_write =3D pci_ich9_write_config, --=20 1.7.7