Patchwork [1/2] usb-uhci: Add num_ports_vmstate to UHCIState

login
register
mail settings
Submitter Juan Quintela
Date Oct. 14, 2009, 10:57 a.m.
Message ID <83251b908bbcbe75dcd512d41e3cf5bf4f1b7567.1255517667.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/35938/
State New
Headers show

Comments

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

Patch

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);