revert to non-vmstate supporting usb-hub.c

diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index 50160ad..9c2221a 100644 (file)
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -696,6 +696,73 @@ int smc91c111_iomemtype(void *opaque) {
     return s->iomemtype;
 }
 
+static void smc91c111_save_state(QEMUFile *f, void *opaque)
+{
+    smc91c111_state *s = (smc91c111_state *)opaque;
+    int i;
+    
+    qemu_put_be16(f, s->tcr);
+    qemu_put_be16(f, s->rcr);
+    qemu_put_be16(f, s->cr);
+    qemu_put_be16(f, s->ctr);
+    qemu_put_be16(f, s->gpr);
+    qemu_put_be16(f, s->ptr);
+    qemu_put_be16(f, s->ercv);
+    qemu_put_sbe32(f, s->bank);
+    qemu_put_sbe32(f, s->packet_num);
+    qemu_put_sbe32(f, s->tx_alloc);
+    qemu_put_sbe32(f, s->allocated);
+    qemu_put_sbe32(f, s->tx_fifo_len);
+    qemu_put_sbe32(f, s->rx_fifo_len);
+    qemu_put_sbe32(f, s->tx_fifo_done_len);
+    qemu_put_byte(f, s->int_level);
+    qemu_put_byte(f, s->int_mask);
+    qemu_put_buffer(f, s->macaddr, sizeof(s->macaddr));
+    for (i = 0; i < NUM_PACKETS; i++) {
+        qemu_put_sbe32(f, s->tx_fifo[i]);
+        qemu_put_sbe32(f, s->rx_fifo[i]);
+        qemu_put_sbe32(f, s->tx_fifo_done[i]);
+        qemu_put_buffer(f, s->data[i], sizeof(s->data[i]));
+    }
+}
+
+static int smc91c111_load_state(QEMUFile *f, void *opaque, int version_id)
+{
+    smc91c111_state *s = (smc91c111_state *)opaque;
+    int i;
+    
+    if (version_id)
+        return -EINVAL;
+    
+    s->tcr = qemu_get_be16(f);
+    s->rcr = qemu_get_be16(f);
+    s->cr = qemu_get_be16(f);
+    s->ctr = qemu_get_be16(f);
+    s->gpr = qemu_get_be16(f);
+    s->ptr = qemu_get_be16(f);
+    s->ercv = qemu_get_be16(f);
+    s->bank = qemu_get_sbe32(f);
+    s->packet_num = qemu_get_sbe32(f);
+    s->tx_alloc = qemu_get_sbe32(f);
+    s->allocated = qemu_get_sbe32(f);
+    s->tx_fifo_len = qemu_get_sbe32(f);
+    s->rx_fifo_len = qemu_get_sbe32(f);
+    s->tx_fifo_done_len = qemu_get_sbe32(f);
+    s->int_level = qemu_get_byte(f);
+    s->int_mask = qemu_get_byte(f);
+    qemu_get_buffer(f, s->macaddr, sizeof(s->macaddr));
+    for (i = 0; i < NUM_PACKETS; i++) {
+        s->tx_fifo[i] = qemu_get_sbe32(f);
+        s->rx_fifo[i] = qemu_get_sbe32(f);
+        s->tx_fifo_done[i] = qemu_get_sbe32(f);
+        qemu_get_buffer(f, s->data[i], sizeof(s->data[i]));
+    }
+    
+    smc91c111_update(s);
+    
+    return 0;
+}
+
 void *smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq, int phys_alloc)
 {
     smc91c111_state *s;
@@ -716,5 +783,7 @@ void *smc91c111_init(NICInfo *nd, uint32_t base, qemu_irq irq, int phys_alloc)
                                  smc91c111_receive, smc91c111_can_receive, s);
     qemu_format_nic_info_str(s->vc, s->macaddr);
     /* ??? Save/restore.  */
+    register_savevm("smc91c111", -1, 0,
+                    smc91c111_save_state, smc91c111_load_state, s);
     return s;
 }

diff --git a/hw/usb-hub.c b/hw/usb-hub.c
index f7cebed..1708aff 100644 (file)
--- a/hw/usb-hub.c
+++ b/hw/usb-hub.c
@@ -23,7 +23,6 @@
  */
 #include "qemu-common.h"
 #include "usb.h"
-#include "hw.h"
 
 //#define DEBUG
 
@@ -41,37 +40,6 @@ typedef struct USBHubState {
     USBHubPort ports[MAX_PORTS];
 } USBHubState;
 
-static void usb_hub_save_state(QEMUFile *f, void *opaque)
-{
-    USBHubState *s = (USBHubState *)opaque;
-    int i;
-    
-    qemu_put_sbe32(f, s->nb_ports);
-    for (i = 0; i < s->nb_ports; i++) {
-        qemu_put_be16(f, s->ports[i].wPortStatus);
-        qemu_put_be16(f, s->ports[i].wPortChange);
-    }
-}
-
-static int usb_hub_load_state(QEMUFile *f, void *opaque, int version_id)
-{
-    USBHubState *s = (USBHubState *)opaque;
-    int i;
-    
-    if (version_id)
-        return -EINVAL;
-    
-    if (qemu_get_sbe32(f) != s->nb_ports)
-        return -EINVAL;
-    
-    for (i = 0; i < s->nb_ports; i++) {
-        s->ports[i].wPortStatus = qemu_get_be16(f);
-        s->ports[i].wPortChange = qemu_get_be16(f);
-    }
-    
-    return 0;
-}
-
 #define ClearHubFeature                (0x2000 | USB_REQ_CLEAR_FEATURE)
 #define ClearPortFeature       (0x2300 | USB_REQ_CLEAR_FEATURE)
 #define GetHubDescriptor       (0xa000 | USB_REQ_GET_DESCRIPTOR)
@@ -580,9 +548,5 @@ USBDevice *usb_hub_init(int nb_ports)
         port->wPortStatus = PORT_STAT_POWER;
         port->wPortChange = 0;
     }
-    
-    register_savevm("usb hub", -1, 0,
-                    usb_hub_save_state, usb_hub_load_state, s);
-    
     return (USBDevice *)s;
 }