From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36606) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSLS-0004i6-4F for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SzSLJ-0006VB-Ve for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:00:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:55139 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SzSLJ-0006U4-MM for qemu-devel@nongnu.org; Thu, 09 Aug 2012 09:00:01 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 9 Aug 2012 14:59:54 +0200 Message-Id: <1344517195-3462-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 v2] ahci: Add support for migration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Igor Mitsyanko , Juan Quintela , Jason Baron , Alexander Graf , =?UTF-8?q?Andreas=20F=C3=A4rber?= Define generic VMState for AHCI and reuse it together with PCI for ICH and on its own for the SysBus version. Note: ICH9 initializes AHCI with 6 ports, which dynamically allocates 6 AHCIDevice structs. Thus we change the ports field type to uint32_t for compatibility with VMState macros. Signed-off-by: Andreas F=C3=A4rber Cc: Alexander Graf Cc: Jason Baron Cc: Kevin Wolf Cc: Juan Quintela Cc: Igor Mitsyanko --- hw/ide/ahci.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- hw/ide/ahci.h | 12 +++++++++++- hw/ide/ich.c | 11 ++++++++--- 3 files changed, 64 insertions(+), 5 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index efea93f..08856fa 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1173,6 +1173,47 @@ void ahci_reset(AHCIState *s) } } =20 +static 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_VARRAY_UINT32(dev, AHCIState, 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() + }, +}; + typedef struct SysbusAHCIState { SysBusDevice busdev; AHCIState ahci; @@ -1181,7 +1222,10 @@ typedef struct SysbusAHCIState { =20 static const VMStateDescription vmstate_sysbus_ahci =3D { .name =3D "sysbus-ahci", - .unmigratable =3D 1, + .fields =3D (VMStateField []) { + VMSTATE_AHCI(ahci, AHCIPCIState), + VMSTATE_END_OF_LIST() + }, }; =20 static void sysbus_ahci_reset(DeviceState *dev) diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 1200a56..e7ad1d9 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -297,7 +297,7 @@ typedef struct AHCIState { MemoryRegion idp; /* Index-Data Pair I/O port space */ unsigned idp_offset; /* Offset of index in I/O port space */ uint32_t idp_index; /* Current IDP index */ - int ports; + uint32_t ports; qemu_irq irq; DMAContext *dma; } AHCIState; @@ -307,6 +307,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 272b773..ae6f56f 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 void pci_ich9_reset(DeviceState *dev) @@ -152,7 +157,7 @@ static void ich_ahci_class_init(ObjectClass *klass, v= oid *data) k->device_id =3D PCI_DEVICE_ID_INTEL_82801IR; k->revision =3D 0x02; k->class_id =3D PCI_CLASS_STORAGE_SATA; - dc->vmsd =3D &vmstate_ahci; + dc->vmsd =3D &vmstate_ich9_ahci; dc->reset =3D pci_ich9_reset; } =20 --=20 1.7.7