[Qemu-devel] [PATCH V3 7/8] hw/mdio: Add VMState support

[Grant Likely]

The MDIO model needs to have VMState support before it can be used by
devices that support VMState. This patch adds VMState macros for both
qemu_mdio and qemu_phy.

Cc: Peter Maydell <address@hidden>
Cc: Paul Brook <address@hidden>
Cc: Edgar E. Iglesias <address@hidden>
Cc: Anthony Liguori <address@hidden>
Cc: Andreas Färber <address@hidden>
Signed-off-by: Grant Likely <address@hidden>
---
 hw/mdio.c |   30 ++++++++++++++++++++++++++++++
 hw/mdio.h |   21 +++++++++++++++++++++
 2 files changed, 51 insertions(+)

diff --git a/hw/mdio.c b/hw/mdio.c
index 79f0e3b..023ad90 100644
--- a/hw/mdio.c
+++ b/hw/mdio.c
@@ -244,3 +244,33 @@ void mdio_bitbang_set_clk(struct qemu_mdio *bus, bool mdc)
         break;
     }
 }
+
+const VMStateDescription vmstate_mdio = {
+    .name = "mdio",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_BOOL(mdc, struct qemu_mdio),
+        VMSTATE_BOOL(mdio, struct qemu_mdio),
+        VMSTATE_UINT32(state, struct qemu_mdio),
+        VMSTATE_UINT16(cnt, struct qemu_mdio),
+        VMSTATE_UINT16(addr, struct qemu_mdio),
+        VMSTATE_UINT16(opc, struct qemu_mdio),
+        VMSTATE_UINT16(req, struct qemu_mdio),
+        VMSTATE_UINT32(shiftreg, struct qemu_mdio),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+const VMStateDescription vmstate_mdio_phy = {
+    .name = "mdio",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .minimum_version_id_old = 1,
+    .fields = (VMStateField[]) {
+        VMSTATE_UINT16_ARRAY(regs, struct qemu_phy, 32),
+        VMSTATE_BOOL(link, struct qemu_phy),
+        VMSTATE_END_OF_LIST()
+    }
+};
diff --git a/hw/mdio.h b/hw/mdio.h
index 340501e..62d292b 100644
--- a/hw/mdio.h
+++ b/hw/mdio.h
@@ -26,6 +26,7 @@
  */
 
 #include <stdint.h>
+#include "migration/vmstate.h"
 
 /* PHY MII Register/Bit Definitions */
 /* PHY Registers defined by IEEE */
@@ -63,6 +64,16 @@ struct qemu_phy {
     void (*write)(struct qemu_phy *phy, unsigned int req, uint16_t data);
 };
 
+extern const VMStateDescription vmstate_mdio_phy;
+
+#define VMSTATE_MDIO_PHY(_field, _state) {                           \
+    .name   = (stringify(_field)),                                   \
+    .size   = sizeof(struct qemu_phy),                               \
+    .vmsd   = &vmstate_mdio_phy,                                     \
+    .flags  = VMS_STRUCT,                                            \
+    .offset = vmstate_offset_value(_state, _field, struct qemu_phy), \
+}
+
 struct qemu_mdio {
     /* bitbanging state machine */
     bool mdc;
@@ -85,6 +96,16 @@ struct qemu_mdio {
     struct qemu_phy *devs[32];
 };
 
+extern const VMStateDescription vmstate_mdio;
+
+#define VMSTATE_MDIO(_field, _state) {                                 \
+    .name   = (stringify(_field)),                                     \
+    .size   = sizeof(struct qemu_mdio),                                \
+    .vmsd   = &vmstate_mdio,                                           \
+    .flags  = VMS_STRUCT,                                              \
+    .offset = vmstate_offset_value(_state, _field, struct qemu_mdio),  \
+}
+
 void mdio_phy_init(struct qemu_phy *phy, uint16_t id1, uint16_t id2);
 void mdio_attach(struct qemu_mdio *bus, struct qemu_phy *phy,
                  unsigned int addr);
-- 
1.7.10.4