| Message ID | 1398091304-10677-70-git-send-email-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
* Juan Quintela (quintela@redhat.com) wrote: > It was unused. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > include/migration/vmstate.h | 13 ------------- > vmstate.c | 3 --- > 2 files changed, 16 deletions(-) > > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index f5687b7..7e3877d 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -97,7 +97,6 @@ enum VMStateFlags { > 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_MULTIPLY = 0x200, /* multiply "size" field by field_size */ > VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ > VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/ > }; > @@ -392,18 +391,6 @@ extern const VMStateInfo vmstate_info_bitmap; > .offset = vmstate_offset_buffer(_state, _field) + _start, \ > } > > -#define VMSTATE_VBUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ > - .name = (stringify(_field)), \ > - .version_id = (_version), \ > - .field_exists = (_test), \ > - .size_offset = vmstate_offset_value(_state, _field_size, uint32_t),\ > - .size = (_multiply), \ > - .info = &vmstate_info_buffer, \ > - .flags = VMS_VBUFFER|VMS_POINTER|VMS_MULTIPLY, \ > - .offset = offsetof(_state, _field), \ > - .start = (_start), \ > -} > - > #define VMSTATE_VBUFFER(_field, _state, _test, _start, _field_size) { \ > .name = (stringify(_field)), \ > .field_exists = (_test), \ > diff --git a/vmstate.c b/vmstate.c > index abade3f..dd74730 100644 > --- a/vmstate.c > +++ b/vmstate.c > @@ -35,9 +35,6 @@ static int vmstate_size(void *opaque, VMStateField *field) > > if (field->flags & VMS_VBUFFER) { > size = *(int32_t *)(opaque+field->size_offset); > - if (field->flags & VMS_MULTIPLY) { > - size *= field->size; > - } > } > > return size; > -- > 1.9.0 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index f5687b7..7e3877d 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -97,7 +97,6 @@ enum VMStateFlags { 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_MULTIPLY = 0x200, /* multiply "size" field by field_size */ VMS_VARRAY_UINT8 = 0x400, /* Array with size in uint8_t field*/ VMS_VARRAY_UINT32 = 0x800, /* Array with size in uint32_t field*/ }; @@ -392,18 +391,6 @@ extern const VMStateInfo vmstate_info_bitmap; .offset = vmstate_offset_buffer(_state, _field) + _start, \ } -#define VMSTATE_VBUFFER_MULTIPLY(_field, _state, _version, _test, _start, _field_size, _multiply) { \ - .name = (stringify(_field)), \ - .version_id = (_version), \ - .field_exists = (_test), \ - .size_offset = vmstate_offset_value(_state, _field_size, uint32_t),\ - .size = (_multiply), \ - .info = &vmstate_info_buffer, \ - .flags = VMS_VBUFFER|VMS_POINTER|VMS_MULTIPLY, \ - .offset = offsetof(_state, _field), \ - .start = (_start), \ -} - #define VMSTATE_VBUFFER(_field, _state, _test, _start, _field_size) { \ .name = (stringify(_field)), \ .field_exists = (_test), \ diff --git a/vmstate.c b/vmstate.c index abade3f..dd74730 100644 --- a/vmstate.c +++ b/vmstate.c @@ -35,9 +35,6 @@ static int vmstate_size(void *opaque, VMStateField *field) if (field->flags & VMS_VBUFFER) { size = *(int32_t *)(opaque+field->size_offset); - if (field->flags & VMS_MULTIPLY) { - size *= field->size; - } } return size;
It was unused. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/migration/vmstate.h | 13 ------------- vmstate.c | 3 --- 2 files changed, 16 deletions(-)