From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:60699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDCF-00042f-9N for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:44:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TrDC8-0005W8-Vr for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:44:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TrDC8-0005Vb-Nl for qemu-devel@nongnu.org; Fri, 04 Jan 2013 14:44:44 -0500 Date: Fri, 4 Jan 2013 14:44:42 -0500 From: Jason Baron Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 2/2] ahci: add migration support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com, afaerber@suse.de, agraf@suse.de Cc: i.mitsyanko@samsung.com, quintela@redhat.com, jan.kiszka@siemens.com, qemu-devel@nongnu.org, aderumier@odiso.com, yamahata@valinux.co.jp From: Jason Baron I've tested these patches by migrating Windows 7 and Fedora 17 guests (wh= ile uunder i/o) on both piix with ahci attached and on q35 (which has a built= -in ahci controller). Changes from v2: -migrate all relevant ahci fields -flush any pending i/o in 'post_load' Changes from v1: -extend Andreas F=C3=A4rber's patch Signed-off-by: Jason Baron Signed-off-by: Andreas F=C3=A4rber Cc: Alexander Graf Cc: Kevin Wolf Cc: Juan Quintela Cc: Igor Mitsyanko --- hw/ide/ahci.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++= +++++- hw/ide/ahci.h | 10 +++++++ hw/ide/ich.c | 11 +++++-- 3 files changed, 97 insertions(+), 4 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 72cd1c8..96f224b 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1199,6 +1199,81 @@ 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_INT32(done_atapi_packet, AHCIDevice), + VMSTATE_INT32(busy_slot, AHCIDevice), + VMSTATE_INT32(init_d2h_sent, AHCIDevice), + VMSTATE_END_OF_LIST() + }, +}; + +static int ahci_state_post_load(void *opaque, int version_id) +{ + int i; + struct AHCIDevice *ad; + AHCIState *s =3D opaque; + + for (i =3D 0; i < s->ports; i++) { + ad =3D &s->dev[i]; + AHCIPortRegs *pr =3D &ad->port_regs; + + map_page(&ad->lst, + ((uint64_t)pr->lst_addr_hi << 32) | pr->lst_addr, 1024)= ; + map_page(&ad->res_fis, + ((uint64_t)pr->fis_addr_hi << 32) | pr->fis_addr, 256); + /* + * All pending i/o should be flushed out on a migrate. However, + * we might not have cleared the busy_slot since this is done + * in a bh. Also, issue i/o against any slots that are pending. + */ + if (ad->busy_slot !=3D -1) { + pr->cmd_issue &=3D ~(1 << ad->busy_slot); + ad->busy_slot =3D -1; + } + check_cmd(s, i); + } + + return 0; +} + +const VMStateDescription vmstate_ahci =3D { + .name =3D "ahci", + .version_id =3D 1, + .post_load =3D ahci_state_post_load, + .fields =3D (VMStateField []) { + VMSTATE_STRUCT_VARRAY_POINTER_INT32(dev, AHCIState, ports, + 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_INT32(ports, AHCIState), + VMSTATE_END_OF_LIST() + }, +}; + typedef struct SysbusAHCIState { SysBusDevice busdev; AHCIState ahci; @@ -1207,7 +1282,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 735b379..67b818f 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -305,6 +305,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 de39b30..0c4206a 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.1