diff options
| author | Juan Quintela <quintela@redhat.com> | 2014-04-16 16:01:33 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@trasno.org> | 2014-05-14 15:24:51 +0200 |
| commit | 35d08458a9ee5fb9c8518207cc85d0a4f2ef3165 (patch) | |
| tree | 9120b9be3a47709bf776533258aa3c3dad389263 /hw/intc | |
| parent | 6e3d652ab204c6f8f1846639bca802fb9c8a9a6d (diff) | |
| download | qemu-35d08458a9ee5fb9c8518207cc85d0a4f2ef3165.zip qemu-35d08458a9ee5fb9c8518207cc85d0a4f2ef3165.tar.gz qemu-35d08458a9ee5fb9c8518207cc85d0a4f2ef3165.tar.bz2 | |
savevm: Remove all the unneeded version_minimum_id_old (rest)
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>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/intc')
| -rw-r--r-- | hw/intc/lm32_pic.c | 3 | ||||
| -rw-r--r-- | hw/intc/slavio_intctl.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/intc/lm32_pic.c b/hw/intc/lm32_pic.c index 32d009f..72fc9ef 100644 --- a/hw/intc/lm32_pic.c +++ b/hw/intc/lm32_pic.c @@ -169,8 +169,7 @@ static const VMStateDescription vmstate_lm32_pic = { .name = "lm32-pic", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField[]) { + .fields = (VMStateField[]) { VMSTATE_UINT32(im, LM32PicState), VMSTATE_UINT32(ip, LM32PicState), VMSTATE_UINT32(irq_state, LM32PicState), diff --git a/hw/intc/slavio_intctl.c b/hw/intc/slavio_intctl.c index b10fb66..f22aba0 100644 --- a/hw/intc/slavio_intctl.c +++ b/hw/intc/slavio_intctl.c @@ -381,8 +381,7 @@ static const VMStateDescription vmstate_intctl_cpu = { .name ="slavio_intctl_cpu", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(intreg_pending, SLAVIO_CPUINTCTLState), VMSTATE_END_OF_LIST() } @@ -392,9 +391,8 @@ static const VMStateDescription vmstate_intctl = { .name ="slavio_intctl", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .post_load = vmstate_intctl_post_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_STRUCT_ARRAY(slaves, SLAVIO_INTCTLState, MAX_CPUS, 1, vmstate_intctl_cpu, SLAVIO_CPUINTCTLState), VMSTATE_UINT32(intregm_pending, SLAVIO_INTCTLState), |