[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 27/38] openpic: fix up loadvm under -M mac99
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PULL 27/38] openpic: fix up loadvm under -M mac99 |
Date: |
Sun, 8 Mar 2015 09:44:46 +0100 |
From: Mark Cave-Ayland <address@hidden>
Issuing loadvm under -M mac99 would fail for two reasons: firstly an incorrect
version number for openpic would cause openpic_load() to abort, and secondly
a cut/paste error when restoring the IVPR and IDR registers caused subsequent
vmstate sections to become misaligned and abort early.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/intc/openpic.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index e76d7d1..9d3beb1 100644
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -1366,7 +1366,7 @@ static int openpic_load(QEMUFile* f, void *opaque, int
version_id)
OpenPICState *opp = (OpenPICState *)opaque;
unsigned int i, nb_cpus;
- if (version_id != 1) {
+ if (version_id != 2) {
return -EINVAL;
}
@@ -1399,12 +1399,10 @@ static int openpic_load(QEMUFile* f, void *opaque, int
version_id)
uint32_t val;
val = qemu_get_be32(f);
- write_IRQreg_idr(opp, i, val);
- val = qemu_get_be32(f);
write_IRQreg_ivpr(opp, i, val);
+ val = qemu_get_be32(f);
+ write_IRQreg_idr(opp, i, val);
- qemu_get_be32s(f, &opp->src[i].ivpr);
- qemu_get_be32s(f, &opp->src[i].idr);
qemu_get_be32s(f, &opp->src[i].destmask);
qemu_get_sbe32s(f, &opp->src[i].last_cpu);
qemu_get_sbe32s(f, &opp->src[i].pending);
--
1.8.1.4
- [Qemu-devel] [PULL 18/38] pseries: Switch VGA endian on H_SET_MODE, (continued)
- [Qemu-devel] [PULL 18/38] pseries: Switch VGA endian on H_SET_MODE, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 35/38] PPC: Introduce the Virtual Time Base (VTB) SPR register, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 07/38] Add more VMSTATE_*_TEST variants for integers, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 19/38] Openpic: check that cpu id is within the number of cpus, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 30/38] spapr_vio: Convert to realize(), Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 10/38] pseries: Add spapr_rtc_read() helper function, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 26/38] openpic: fix segfault on -M mac99 savevm, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 36/38] target-ppc: Add versions to server CPU descriptions, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 03/38] pseries: Limit PCI host bridge "index" value, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 34/38] PPC: Remove duplicate OPENPIC defines in default-configs, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 27/38] openpic: fix up loadvm under -M mac99,
Alexander Graf <=
- [Qemu-devel] [PULL 29/38] openpic: convert to vmstate, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 17/38] vga: Expose framebuffer byteorder as a QOM property, Alexander Graf, 2015/03/08
- [Qemu-devel] [PULL 37/38] sPAPR: Implement EEH RTAS calls, Alexander Graf, 2015/03/08
- Re: [Qemu-devel] [PULL 2.3 00/38] ppc patch queue 2015-03-08, Peter Maydell, 2015/03/09