[Qemu-devel] [PATCH 080/124] vmstate: Move all users of versioning to VMSTATE_STRUCT_TEST

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 hw/usb/hcd-ehci-pci.c    | 3 ++-
 hw/usb/hcd-ehci-sysbus.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c
index 505741a..6ada623 100644
--- a/hw/usb/hcd-ehci-pci.c
+++ b/hw/usb/hcd-ehci-pci.c
@@ -110,7 +110,8 @@ static const VMStateDescription vmstate_ehci_pci = {
     .minimum_version_id  = 1,
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(pcidev, EHCIPCIState),
-        VMSTATE_STRUCT(ehci, EHCIPCIState, 2, vmstate_ehci, EHCIState),
+        VMSTATE_STRUCT_TEST(ehci, EHCIPCIState, vmstate_2_plus,
+                            vmstate_ehci, EHCIState),
         VMSTATE_END_OF_LIST()
     }
 };
diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c
index 19ed2c2..2c28555 100644
--- a/hw/usb/hcd-ehci-sysbus.c
+++ b/hw/usb/hcd-ehci-sysbus.c
@@ -22,7 +22,8 @@ static const VMStateDescription vmstate_ehci_sysbus = {
     .version_id  = 2,
     .minimum_version_id  = 1,
     .fields = (VMStateField[]) {
-        VMSTATE_STRUCT(ehci, EHCISysBusState, 2, vmstate_ehci, EHCIState),
+        VMSTATE_STRUCT_TEST(ehci, EHCISysBusState, vmstate_2_plus,
+                            vmstate_ehci, EHCIState),
         VMSTATE_END_OF_LIST()
     }
 };
-- 
1.9.0