diff options
| author | Juan Quintela <quintela@redhat.com> | 2014-04-16 15:32:32 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2014-06-16 04:55:26 +0200 |
| commit | d49805aeea558474b18663268b243cee4a520fe8 (patch) | |
| tree | a436d5626a9b20e16ec764988997e45007295d0b /hw/input | |
| parent | 3aff6c2fea770a5e8a00ff43d7665f4d28e935cd (diff) | |
| download | qemu-d49805aeea558474b18663268b243cee4a520fe8.zip qemu-d49805aeea558474b18663268b243cee4a520fe8.tar.gz qemu-d49805aeea558474b18663268b243cee4a520fe8.tar.bz2 | |
savevm: Remove all the unneeded version_minimum_id_old (x86)
After previous Peter patch, they are redundant. This way we don't
assign them except when needed. Once there, there were lots of case
where the ".fields" indentation was wrong:
.fields = (VMStateField []) {
and
.fields = (VMStateField []) {
Change all the combinations to:
.fields = (VMStateField[]){
The biggest problem (appart from aesthetics) was that checkpatch complained
when we copy&pasted the code from one place to another.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Acked-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/input')
| -rw-r--r-- | hw/input/pckbd.c | 6 | ||||
| -rw-r--r-- | hw/input/ps2.c | 12 | ||||
| -rw-r--r-- | hw/input/vmmouse.c | 3 |
3 files changed, 7 insertions, 14 deletions
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 29af3d7..ca1cffc 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -373,8 +373,7 @@ static const VMStateDescription vmstate_kbd = { .name = "pckbd", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(write_cmd, KBDState), VMSTATE_UINT8(status, KBDState), VMSTATE_UINT8(mode, KBDState), @@ -462,8 +461,7 @@ static const VMStateDescription vmstate_kbd_isa = { .name = "pckbd", .version_id = 3, .minimum_version_id = 3, - .minimum_version_id_old = 3, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(kbd, ISAKBDState, 0, vmstate_kbd, KBDState), VMSTATE_END_OF_LIST() } diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 22b77df..a466e25 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -633,8 +633,7 @@ static const VMStateDescription vmstate_ps2_common = { .name = "PS2 Common State", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32(write_cmd, PS2State), VMSTATE_INT32(queue.rptr, PS2State), VMSTATE_INT32(queue.wptr, PS2State), @@ -663,9 +662,8 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = { .name = "ps2kbd/ledstate", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ps2_kbd_ledstate_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32(ledstate, PS2KbdState), VMSTATE_END_OF_LIST() } @@ -696,10 +694,9 @@ static const VMStateDescription vmstate_ps2_keyboard = { .name = "ps2kbd", .version_id = 3, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ps2_kbd_post_load, .pre_save = ps2_kbd_pre_save, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(common, PS2KbdState, 0, vmstate_ps2_common, PS2State), VMSTATE_INT32(scan_enabled, PS2KbdState), VMSTATE_INT32(translate, PS2KbdState), @@ -738,10 +735,9 @@ static const VMStateDescription vmstate_ps2_mouse = { .name = "ps2mouse", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .post_load = ps2_mouse_post_load, .pre_save = ps2_mouse_pre_save, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT(common, PS2MouseState, 0, vmstate_ps2_common, PS2State), VMSTATE_UINT8(mouse_status, PS2MouseState), VMSTATE_UINT8(mouse_resolution, PS2MouseState), diff --git a/hw/input/vmmouse.c b/hw/input/vmmouse.c index 6a50533..d7b1c76 100644 --- a/hw/input/vmmouse.c +++ b/hw/input/vmmouse.c @@ -240,9 +240,8 @@ static const VMStateDescription vmstate_vmmouse = { .name = "vmmouse", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, .post_load = vmmouse_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_INT32_EQUAL(queue_size, VMMouseState), VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), VMSTATE_UINT16(nb_queue, VMMouseState), |