|
 |
218e99 |
From 1199c18251b039c80d66b0036e4f22bb2ce7dbd8 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 02:11:02 +0100
|
|
|
218e99 |
Subject: [PATCH 55/81] kvmvapic: Enter inactive state on hardware reset
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
Message-id: <1383703863-4840-2-git-send-email-bsd@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55472
|
|
|
218e99 |
O-Subject: [PATCH RHEL-7.0 qemu-kvm 2/3] kvmvapic: Enter inactive state on hardware reset
|
|
|
218e99 |
Bugzilla: 920021
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Jan Kiszka <jan.kiszka@siemens.com>
|
|
|
218e99 |
|
|
|
218e99 |
ROM layout may change after reset of devices are hotplugged, so we have
|
|
|
218e99 |
to pick up the physical address again when the ROM is initialized. This
|
|
|
218e99 |
is best achieved by resetting the state to INACTIVE.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
|
|
|
218e99 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
(cherry picked from commit c056bc3f3464cfae1c94b7dd633d3ec13b13b655)
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/kvmvapic.c | 4 +---
|
|
|
218e99 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/kvmvapic.c | 4 +---
|
|
|
218e99 |
1 files changed, 1 insertions(+), 3 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
|
|
|
218e99 |
index a2c7e8f..a96ea85 100644
|
|
|
218e99 |
--- a/hw/i386/kvmvapic.c
|
|
|
218e99 |
+++ b/hw/i386/kvmvapic.c
|
|
|
218e99 |
@@ -504,9 +504,7 @@ static void vapic_reset(DeviceState *dev)
|
|
|
218e99 |
{
|
|
|
218e99 |
VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
|
|
|
218e99 |
|
|
|
218e99 |
- if (s->state == VAPIC_ACTIVE) {
|
|
|
218e99 |
- s->state = VAPIC_STANDBY;
|
|
|
218e99 |
- }
|
|
|
218e99 |
+ s->state = VAPIC_INACTIVE;
|
|
|
218e99 |
vapic_enable_tpr_reporting(false);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|