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/timer | |
| 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/timer')
| -rw-r--r-- | hw/timer/hpet.c | 9 | ||||
| -rw-r--r-- | hw/timer/i8254_common.c | 1 | ||||
| -rw-r--r-- | hw/timer/mc146818rtc.c | 3 |
3 files changed, 4 insertions, 9 deletions
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 2792f89..e160e8f 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -282,8 +282,7 @@ static const VMStateDescription vmstate_hpet_rtc_irq_level = { .name = "hpet/rtc_irq_level", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT8(rtc_irq_level, HPETState), VMSTATE_END_OF_LIST() } @@ -293,8 +292,7 @@ static const VMStateDescription vmstate_hpet_timer = { .name = "hpet_timer", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT8(tn, HPETTimer), VMSTATE_UINT64(config, HPETTimer), VMSTATE_UINT64(cmp, HPETTimer), @@ -310,11 +308,10 @@ static const VMStateDescription vmstate_hpet = { .name = "hpet", .version_id = 2, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = hpet_pre_save, .pre_load = hpet_pre_load, .post_load = hpet_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT64(config, HPETState), VMSTATE_UINT64(isr, HPETState), VMSTATE_UINT64(hpet_counter, HPETState), diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c index 9db5c9d..07345f6 100644 --- a/hw/timer/i8254_common.c +++ b/hw/timer/i8254_common.c @@ -180,7 +180,6 @@ static const VMStateDescription vmstate_pit_channel = { .name = "pit channel", .version_id = 2, .minimum_version_id = 2, - .minimum_version_id_old = 2, .fields = (VMStateField[]) { VMSTATE_INT32(count, PITChannelState), VMSTATE_UINT16(latched_count, PITChannelState), diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index df54546..1201f90 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -720,9 +720,8 @@ static const VMStateDescription vmstate_rtc = { .name = "mc146818rtc", .version_id = 3, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = rtc_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_BUFFER(cmos_data, RTCState), VMSTATE_UINT8(cmos_index, RTCState), VMSTATE_UNUSED(7*4), |