diff options
| author | Juan Quintela <quintela@redhat.com> | 2014-04-16 15:24:04 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2014-06-16 04:55:26 +0200 |
| commit | 3aff6c2fea770a5e8a00ff43d7665f4d28e935cd (patch) | |
| tree | b68ee06e449b67a01d0a625f2fa6e478a6100563 /hw/intc | |
| parent | 06a59afac4505f5ed942db4200e5ca16fcbba74d (diff) | |
| download | qemu-3aff6c2fea770a5e8a00ff43d7665f4d28e935cd.tar.gz | |
savevm: Remove all the unneeded version_minimum_id_old (ppc)
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>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/heathrow_pic.c | 6 | ||||
| -rw-r--r-- | hw/intc/xics.c | 9 |
2 files changed, 5 insertions, 10 deletions
diff --git a/hw/intc/heathrow_pic.c b/hw/intc/heathrow_pic.c index 9818f2430c..9ff3119edc 100644 --- a/hw/intc/heathrow_pic.c +++ b/hw/intc/heathrow_pic.c @@ -159,8 +159,7 @@ static const VMStateDescription vmstate_heathrow_pic_one = { .name = "heathrow_pic_one", .version_id = 0, .minimum_version_id = 0, - .minimum_version_id_old = 0, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT32(events, HeathrowPIC), VMSTATE_UINT32(mask, HeathrowPIC), VMSTATE_UINT32(levels, HeathrowPIC), @@ -173,8 +172,7 @@ static const VMStateDescription vmstate_heathrow_pic = { .name = "heathrow_pic", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_STRUCT_ARRAY(pics, HeathrowPICS, 2, 1, vmstate_heathrow_pic_one, HeathrowPIC), VMSTATE_END_OF_LIST() diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 64aabe753d..76dd6f5708 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -330,10 +330,9 @@ static const VMStateDescription vmstate_icp_server = { .name = "icp/server", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = icp_dispatch_pre_save, .post_load = icp_dispatch_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { /* Sanity check */ VMSTATE_UINT32(xirr, ICPState), VMSTATE_UINT8(pending_priority, ICPState), @@ -566,8 +565,7 @@ static const VMStateDescription vmstate_ics_irq = { .name = "ics/irq", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(server, ICSIRQState), VMSTATE_UINT8(priority, ICSIRQState), VMSTATE_UINT8(saved_priority, ICSIRQState), @@ -580,10 +578,9 @@ static const VMStateDescription vmstate_ics = { .name = "ics", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_save = ics_dispatch_pre_save, .post_load = ics_dispatch_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { /* Sanity check */ VMSTATE_UINT32_EQUAL(nr_irqs, ICSState), |