9e0a86718c
Fix crash with -M isapc -cpu Haswell (bz #986790) Fix crash in lsi_soft_reset (bz #1000947) Fix initial /dev/kvm permissions (bz #993491)
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From 56cee96f3c71ffee457d8fbdf427c47824a12e05 Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Tue, 13 Aug 2013 00:02:18 +0200
|
|
Subject: [PATCH] isapc: disable kvmvapic
|
|
|
|
vapic requires the VAPIC ROM to be mapped into RAM. This is not
|
|
possible without PAM hardware. This fixes a segmentation fault
|
|
running with -M isapc.
|
|
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
|
(crobinso: s/kvmvapic/vapic/g)
|
|
|
|
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
---
|
|
hw/i386/pc_piix.c | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
index 4fd5b6d..462d991 100644
|
|
--- a/hw/i386/pc_piix.c
|
|
+++ b/hw/i386/pc_piix.c
|
|
@@ -795,7 +795,11 @@ static QEMUMachine isapc_machine = {
|
|
.init = pc_init_isa,
|
|
.max_cpus = 1,
|
|
.compat_props = (GlobalProperty[]) {
|
|
- { /* end of list */ }
|
|
+ {
|
|
+ .driver = "apic-common",
|
|
+ .property = "vapic",
|
|
+ .value = "off",
|
|
+ },
|
|
},
|
|
DEFAULT_MACHINE_OPTIONS,
|
|
};
|