|
 |
218e99 |
From 9d0c4b3d52464cb38b531e610a71ff1e0f6fcf61 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
Date: Wed, 6 Nov 2013 02:11:03 +0100
|
|
|
218e99 |
Subject: [PATCH 56/81] kvmvapic: Clear also physical ROM address when entering INACTIVE state
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
Message-id: <1383703863-4840-3-git-send-email-bsd@redhat.com>
|
|
|
218e99 |
Patchwork-id: 55473
|
|
|
218e99 |
O-Subject: [PATCH RHEL-7.0 qemu-kvm 3/3] kvmvapic: Clear also physical ROM address when entering INACTIVE state
|
|
|
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 |
To avoid misinterpreting INACTIVE after migration as old qemu-kvm's
|
|
|
218e99 |
STANDBY, also clear rom_state_paddr when going back to this state.
|
|
|
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 4357930b8a7d2fcff2d8121ec518117428a781e7)
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/kvmvapic.c | 2 ++
|
|
|
218e99 |
1 file changed, 2 insertions(+)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/kvmvapic.c | 2 ++
|
|
|
218e99 |
1 files changed, 2 insertions(+), 0 deletions(-)
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c
|
|
|
218e99 |
index a96ea85..577ae64 100644
|
|
|
218e99 |
--- a/hw/i386/kvmvapic.c
|
|
|
218e99 |
+++ b/hw/i386/kvmvapic.c
|
|
|
218e99 |
@@ -505,6 +505,7 @@ static void vapic_reset(DeviceState *dev)
|
|
|
218e99 |
VAPICROMState *s = DO_UPCAST(VAPICROMState, busdev.qdev, dev);
|
|
|
218e99 |
|
|
|
218e99 |
s->state = VAPIC_INACTIVE;
|
|
|
218e99 |
+ s->rom_state_paddr = 0;
|
|
|
218e99 |
vapic_enable_tpr_reporting(false);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
@@ -655,6 +656,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,
|
|
|
218e99 |
}
|
|
|
218e99 |
if (vapic_prepare(s) < 0) {
|
|
|
218e99 |
s->state = VAPIC_INACTIVE;
|
|
|
218e99 |
+ s->rom_state_paddr = 0;
|
|
|
218e99 |
break;
|
|
|
218e99 |
}
|
|
|
218e99 |
break;
|
|
|
218e99 |
--
|
|
|
218e99 |
1.7.1
|
|
|
218e99 |
|