diff options
author | Jan Kiszka <jan.kiszka@siemens.com> | 2013-09-03 18:08:51 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-09-24 22:54:18 -0500 |
commit | 7ea8a3c12aa49efc8f503a019dd764f8a0add2cb (patch) | |
tree | 5365509d68f9ba7baf6f7095e67b7b21388859a8 | |
parent | 50b31e80525d03ef406a8c9f55ff2ae1655a3b66 (diff) | |
download | qemu-7ea8a3c12aa49efc8f503a019dd764f8a0add2cb.tar.gz |
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>
(cherry picked from commit c056bc3f3464cfae1c94b7dd633d3ec13b13b655)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | hw/i386/kvmvapic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index 7ac0fe1299..f2e335d96a 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); } |