summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kiszka2013-09-03 18:08:51 +0200
committerPaolo Bonzini2013-09-20 12:37:52 +0200
commitc056bc3f3464cfae1c94b7dd633d3ec13b13b655 (patch)
treee9706fb05a686557eb3d5d416d46533195cc91f7
parentkvmvapic: Catch invalid ROM size (diff)
downloadqemu-c056bc3f3464cfae1c94b7dd633d3ec13b13b655.tar.gz
qemu-c056bc3f3464cfae1c94b7dd633d3ec13b13b655.tar.xz
qemu-c056bc3f3464cfae1c94b7dd633d3ec13b13b655.zip
kvmvapic: Enter inactive state on hardware reset
ROM layout may change after reset of devices are hotplugged, so we have to pick up the physical address again when the ROM is initialized. This is best achieved by resetting the state to INACTIVE. CC: qemu-stable@nongnu.org Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/i386/kvmvapic.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index c66fbf2fdb..e4cea34865 100644
--- a/hw/i386/kvmvapic.c
+++ b/hw/i386/kvmvapic.c
@@ -510,9 +510,7 @@ static void vapic_reset(DeviceState *dev)
{
VAPICROMState *s = VAPIC(dev);
- if (s->state == VAPIC_ACTIVE) {
- s->state = VAPIC_STANDBY;
- }
+ s->state = VAPIC_INACTIVE;
vapic_enable_tpr_reporting(false);
}