Add VMState support for structs

This patch adds support for saving one VMStateDescription from other
VMStateDescription.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/hw/hw.h b/hw/hw.h
index a8534fa1e8..2ee307e7fb 100644
--- a/hw/hw.h
+++ b/hw/hw.h
@@ -283,6 +283,7 @@ enum VMStateFlags {
     VMS_SINGLE  = 0x001,
     VMS_POINTER = 0x002,
     VMS_ARRAY   = 0x004,
+    VMS_STRUCT  = 0x008,
 };
 
 typedef struct {
@@ -292,6 +293,7 @@ typedef struct {
     int num;
     const VMStateInfo *info;
     enum VMStateFlags flags;
+    const VMStateDescription *vmsd;
     int version_id;
 } VMStateField;
 
@@ -349,6 +351,16 @@ extern const VMStateInfo vmstate_info_timer;
         + type_check_array(_type,typeof_field(_state, _field),_num)  \
 }
 
+#define VMSTATE_STRUCT(_field, _state, _version, _vmsd, _type) {     \
+    .name       = (stringify(_field)),                               \
+    .version_id = (_version),                                        \
+    .vmsd       = &(_vmsd),                                          \
+    .size       = sizeof(_type),                                     \
+    .flags      = VMS_STRUCT,                                        \
+    .offset     = offsetof(_state, _field)                           \
+            + type_check(_type,typeof_field(_state, _field))         \
+}
+
 /* _f : field name
    _n : num of elements
    _s : struct state name