[Qemu-devel] [PATCH 0/2] Port usb-uhci to VMState

[Qemu-devel] [PATCH 0/2] Port usb-uhci to VMState

[Juan Quintela]

1st add num_ports to UCHIState
Then port it to VMSTate.

Just mechanical translation.

Juan Quintela (2):
  usb-uhci: Add num_ports_vmstate to UHCIState
  usb-uhci: port to vmstate

 hw/usb-uhci.c |   85 +++++++++++++++++++++++++--------------------------------
 1 files changed, 37 insertions(+), 48 deletions(-)

[Qemu-devel] [PATCH 1/2] usb-uhci: Add num_ports_vmstate to UHCIState

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/usb-uhci.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index a3ed9b2..99aa7d1 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -139,6 +139,7 @@ typedef struct UHCIState {
     /* Active packets */
     UHCIAsync *async_pending;
     UHCIAsync *async_pool;
+    uint8_t num_ports_vmstate;
 } UHCIState;

 typedef struct UHCI_TD {
@@ -353,15 +354,14 @@ static void uhci_reset(void *opaque)
 static void uhci_save(QEMUFile *f, void *opaque)
 {
     UHCIState *s = opaque;
-    uint8_t num_ports = NB_PORTS;
     int i;

     uhci_async_cancel_all(s);

     pci_device_save(&s->dev, f);

-    qemu_put_8s(f, &num_ports);
-    for (i = 0; i < num_ports; ++i)
+    qemu_put_8s(f, &s->num_ports_vmstate);
+    for (i = 0; i < s->num_ports_vmstate; ++i)
         qemu_put_be16s(f, &s->ports[i].ctrl);
     qemu_put_be16s(f, &s->cmd);
     qemu_put_be16s(f, &s->status);
@@ -376,7 +376,6 @@ static void uhci_save(QEMUFile *f, void *opaque)
 static int uhci_load(QEMUFile *f, void *opaque, int version_id)
 {
     UHCIState *s = opaque;
-    uint8_t num_ports;
     int i, ret;

     if (version_id > 1)
@@ -386,11 +385,11 @@ static int uhci_load(QEMUFile *f, void *opaque, int version_id)
     if (ret < 0)
         return ret;

-    qemu_get_8s(f, &num_ports);
-    if (num_ports != NB_PORTS)
+    qemu_get_8s(f, &s->num_ports_vmstate);
+    if (s->num_ports_vmstate != NB_PORTS)
         return -EINVAL;

-    for (i = 0; i < num_ports; ++i)
+    for (i = 0; i < s->num_ports_vmstate; ++i)
         qemu_get_be16s(f, &s->ports[i].ctrl);
     qemu_get_be16s(f, &s->cmd);
     qemu_get_be16s(f, &s->status);
@@ -1088,6 +1087,7 @@ static int usb_uhci_common_initfn(UHCIState *s)
         usb_register_port(&s->bus, &s->ports[i].port, s, i, uhci_attach);
     }
     s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s);
+    s->num_ports_vmstate = NB_PORTS;

     qemu_register_reset(uhci_reset, s);
     uhci_reset(s);
-- 
1.6.2.5

[Qemu-devel] [PATCH 2/2] usb-uhci: port to vmstate

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/usb-uhci.c |   81 ++++++++++++++++++++++++--------------------------------
 1 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c
index 99aa7d1..67a9a23 100644
--- a/hw/usb-uhci.c
+++ b/hw/usb-uhci.c
@@ -351,57 +351,46 @@ static void uhci_reset(void *opaque)
     uhci_async_cancel_all(s);
 }

-static void uhci_save(QEMUFile *f, void *opaque)
+static void uhci_pre_save(void *opaque)
 {
     UHCIState *s = opaque;
-    int i;

     uhci_async_cancel_all(s);
-
-    pci_device_save(&s->dev, f);
-
-    qemu_put_8s(f, &s->num_ports_vmstate);
-    for (i = 0; i < s->num_ports_vmstate; ++i)
-        qemu_put_be16s(f, &s->ports[i].ctrl);
-    qemu_put_be16s(f, &s->cmd);
-    qemu_put_be16s(f, &s->status);
-    qemu_put_be16s(f, &s->intr);
-    qemu_put_be16s(f, &s->frnum);
-    qemu_put_be32s(f, &s->fl_base_addr);
-    qemu_put_8s(f, &s->sof_timing);
-    qemu_put_8s(f, &s->status2);
-    qemu_put_timer(f, s->frame_timer);
 }

-static int uhci_load(QEMUFile *f, void *opaque, int version_id)
-{
-    UHCIState *s = opaque;
-    int i, ret;
-
-    if (version_id > 1)
-        return -EINVAL;
-
-    ret = pci_device_load(&s->dev, f);
-    if (ret < 0)
-        return ret;
-
-    qemu_get_8s(f, &s->num_ports_vmstate);
-    if (s->num_ports_vmstate != NB_PORTS)
-        return -EINVAL;
-
-    for (i = 0; i < s->num_ports_vmstate; ++i)
-        qemu_get_be16s(f, &s->ports[i].ctrl);
-    qemu_get_be16s(f, &s->cmd);
-    qemu_get_be16s(f, &s->status);
-    qemu_get_be16s(f, &s->intr);
-    qemu_get_be16s(f, &s->frnum);
-    qemu_get_be32s(f, &s->fl_base_addr);
-    qemu_get_8s(f, &s->sof_timing);
-    qemu_get_8s(f, &s->status2);
-    qemu_get_timer(f, s->frame_timer);
+static const VMStateDescription vmstate_uhci_port = {
+    .name = "uhci port",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT16(ctrl, UHCIPort),
+        VMSTATE_END_OF_LIST()
+    }
+};

-    return 0;
-}
+static const VMStateDescription vmstate_uhci = {
+    .name = "uhci",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .pre_save = uhci_pre_save,
+    .fields      = (VMStateField []) {
+        VMSTATE_PCI_DEVICE(dev, UHCIState),
+        VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState),
+        VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS, 1,
+                             vmstate_uhci_port, UHCIPort),
+        VMSTATE_UINT16(cmd, UHCIState),
+        VMSTATE_UINT16(status, UHCIState),
+        VMSTATE_UINT16(intr, UHCIState),
+        VMSTATE_UINT16(frnum, UHCIState),
+        VMSTATE_UINT32(fl_base_addr, UHCIState),
+        VMSTATE_UINT8(sof_timing, UHCIState),
+        VMSTATE_UINT8(status2, UHCIState),
+        VMSTATE_TIMER(frame_timer, UHCIState),
+        VMSTATE_END_OF_LIST()
+    }
+};

 static void uhci_ioport_writeb(void *opaque, uint32_t addr, uint32_t val)
 {
@@ -1097,7 +1086,7 @@ static int usb_uhci_common_initfn(UHCIState *s)
     pci_register_bar(&s->dev, 4, 0x20,
                            PCI_ADDRESS_SPACE_IO, uhci_map);

-    register_savevm("uhci", 0, 1, uhci_save, uhci_load, s);
+    vmstate_register(0, &vmstate_uhci, s);
     return 0;
 }

-- 
1.6.2.5