[Qemu-devel] [PATCH 96/97] vmstate: Rename VMS_VBUFFER to VMST_VBUFFER_INT32 for consintency

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 include/migration/vmstate.h | 6 +++---
 vmstate.c                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h
index 976d83e..145c198 100644
--- a/include/migration/vmstate.h
+++ b/include/migration/vmstate.h
@@ -96,7 +96,7 @@ enum VMStateFlags {
     VMS_BUFFER           = 0x020,  /* static sized buffer */
     VMS_ARRAY_OF_POINTER = 0x040,
     VMS_VARRAY_UINT16    = 0x080,  /* Array with size in uint16_t field */
-    VMS_VBUFFER          = 0x100,  /* Buffer with size in int32_t field */
+    VMS_VBUFFER_INT32    = 0x100,  /* Buffer with size in int32_t field */
     VMS_VBUFFER_UINT32   = 0x200,  /* Buffer with size in uint32_t field */
     VMS_VARRAY_UINT8     = 0x400,  /* Array with size in uint8_t field*/
     VMS_VARRAY_UINT32    = 0x800,  /* Array with size in uint32_t field*/
@@ -436,7 +436,7 @@ extern const VMStateInfo vmstate_info_bitmap;
     .name         = (stringify(_field)),                             \
     .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
     .info         = &vmstate_info_buffer,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER,                         \
+    .flags        = VMS_VBUFFER_INT32|VMS_POINTER,                   \
     .offset       = offsetof(_state, _field),                        \
 }

@@ -480,7 +480,7 @@ extern const VMStateInfo vmstate_info_bitmap;
     .name         = (stringify(_field)),                             \
     .size_offset  = vmstate_offset_value(_state, _field_size, int32_t),\
     .info         = &vmstate_info_bitmap,                            \
-    .flags        = VMS_VBUFFER|VMS_POINTER,                         \
+    .flags        = VMS_VBUFFER_INT32|VMS_POINTER,                   \
     .offset       = offsetof(_state, _field),                        \
 }

diff --git a/vmstate.c b/vmstate.c
index da5c49d..b1ff280 100644
--- a/vmstate.c
+++ b/vmstate.c
@@ -33,7 +33,7 @@ static int vmstate_size(void *opaque, VMStateField *field)
 {
     int size = field->size;

-    if (field->flags & VMS_VBUFFER) {
+    if (field->flags & VMS_VBUFFER_INT32) {
         size = *(int32_t *)(opaque+field->size_offset);
     } else if (field->flags & VMS_VBUFFER_UINT32) {
         size = *(uint32_t *)(opaque+field->size_offset);
-- 
1.9.0