From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 3 Sep 2013 16:08:51 +0000 (+0200)
Subject: kvmvapic: Enter inactive state on hardware reset
X-Git-Tag: v1.7.0-rc0~105^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c056bc3f3464cfae1c94b7dd633d3ec13b13b655;p=thirdparty%2Fqemu.git

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>
---

diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
index c66fbf2fdb3..e4cea34865b 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);
 }