[Qemu-devel] ahci live migration

[Qemu-devel] ahci live migration

[Jason Baron]

Hi,

vmstate_ahci has its 'unmigratable' bit set. Gerd suggested that there was work
in this area. Anybody know the status on it?

Thanks,

-Jason

Re: [Qemu-devel] ahci live migration

[Andreas Färber]

Hi Jason,

Am 07.08.2012 18:01, schrieb Jason Baron:
> Hi,
> 
> vmstate_ahci has its 'unmigratable' bit set. Gerd suggested that there was work
> in this area. Anybody know the status on it?

That was me working on it. I have a branch corresponding to an RFC I
sent around Christmas - issue being how to model the variable number of
ports in VMSD - that I need to update to the latest suggestion by Igor.

Jason/Kevin, should I prioritize that for 1.2? Or is that a -next topic?

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] ahci live migration

[Jason Baron]

On Tue, Aug 07, 2012 at 06:13:25PM +0200, Andreas Färber wrote:
> Hi Jason,
> 
> Am 07.08.2012 18:01, schrieb Jason Baron:
> > Hi,
> > 
> > vmstate_ahci has its 'unmigratable' bit set. Gerd suggested that there was work
> > in this area. Anybody know the status on it?
> 
> That was me working on it. I have a branch corresponding to an RFC I
> sent around Christmas - issue being how to model the variable number of
> ports in VMSD - that I need to update to the latest suggestion by Igor.
> 
> Jason/Kevin, should I prioritize that for 1.2? Or is that a -next topic?
> 

I ran into while trying to test q35 live migration (which currently
aborts due to no ahci support). If you have any updated code, I can test
it for you :)

Thanks,

-Jason

Re: [Qemu-devel] ahci live migration

[Andreas Färber]

Am 07.08.2012 18:20, schrieb Jason Baron:
> On Tue, Aug 07, 2012 at 06:13:25PM +0200, Andreas Färber wrote:
>> Hi Jason,
>>
>> Am 07.08.2012 18:01, schrieb Jason Baron:
>>> Hi,
>>>
>>> vmstate_ahci has its 'unmigratable' bit set. Gerd suggested that there was work
>>> in this area. Anybody know the status on it?
>>
>> That was me working on it. I have a branch corresponding to an RFC I
>> sent around Christmas - issue being how to model the variable number of
>> ports in VMSD - that I need to update to the latest suggestion by Igor.
>>
>> Jason/Kevin, should I prioritize that for 1.2? Or is that a -next topic?
>>
> 
> I ran into while trying to test q35 live migration (which currently
> aborts due to no ahci support). If you have any updated code, I can test
> it for you :)

This is the updated approach that I mentioned in the other thread:

http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/ahci-migration

Totally untested so far and as before there is a disconnect between
AHCIState and AHCIDevice.

Andreas

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index efea93f..12b9e0d 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1173,6 +1173,47 @@ void ahci_reset(AHCIState *s)
     }
 }

+const VMStateDescription vmstate_ahci_device = {
+    .name = "ahci port",
+    .version_id = 1,
+    .fields = (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 = {
+    .name = "ahci",
+    .version_id = 1,
+    .fields = (VMStateField []) {
+        VMSTATE_BUFFER_MULTIPLY(dev, AHCIState, 0, NULL, 0, ports,
+                                sizeof(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 {

 static const VMStateDescription vmstate_sysbus_ahci = {
     .name = "sysbus-ahci",
-    .unmigratable = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_AHCI(ahci, AHCIPCIState),
+        VMSTATE_END_OF_LIST()
+    },
 };

 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;

+extern const VMStateDescription vmstate_ahci;
+
+#define VMSTATE_AHCI(_field, _state) {                               \
+    .name       = (stringify(_field)),                               \
+    .size       = sizeof(AHCIState),                                 \
+    .vmsd       = &vmstate_ahci,                                     \
+    .flags      = VMS_STRUCT,                                        \
+    .offset     = 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

-static const VMStateDescription vmstate_ahci = {
+static const VMStateDescription vmstate_ich9_ahci = {
     .name = "ahci",
-    .unmigratable = 1,
+    .version_id = 1,
+    .fields = (VMStateField []) {
+        VMSTATE_PCI_DEVICE(card, AHCIPCIState),
+        VMSTATE_AHCI(ahci, AHCIPCIState),
+        VMSTATE_END_OF_LIST()
+    },
 };

 static void pci_ich9_reset(DeviceState *dev)
@@ -152,7 +157,7 @@ static void ich_ahci_class_init(ObjectClass *klass,
void *data)
     k->device_id = PCI_DEVICE_ID_INTEL_82801IR;
     k->revision = 0x02;
     k->class_id = PCI_CLASS_STORAGE_SATA;
-    dc->vmsd = &vmstate_ahci;
+    dc->vmsd = &vmstate_ich9_ahci;
     dc->reset = pci_ich9_reset;
 }


-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] ahci live migration

[Kevin Wolf]

Am 07.08.2012 18:13, schrieb Andreas Färber:
> Hi Jason,
> 
> Am 07.08.2012 18:01, schrieb Jason Baron:
>> Hi,
>>
>> vmstate_ahci has its 'unmigratable' bit set. Gerd suggested that there was work
>> in this area. Anybody know the status on it?
> 
> That was me working on it. I have a branch corresponding to an RFC I
> sent around Christmas - issue being how to model the variable number of
> ports in VMSD - that I need to update to the latest suggestion by Igor.
> 
> Jason/Kevin, should I prioritize that for 1.2? Or is that a -next topic?

Unless someone tries hard to convince me otherwise, I'd default to -next.

Kevin