|
 |
218e99 |
From 196b2691b4d55361527b887ec7bc044d423b7757 Mon Sep 17 00:00:00 2001
|
|
|
218e99 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
Date: Wed, 31 Jul 2013 08:04:01 +0200
|
|
|
218e99 |
Subject: pc: Drop RHEL-6 compat_props {apic, kvm-apic}.vapic
|
|
|
218e99 |
|
|
|
218e99 |
Message-id: <1375201922-6794-8-git-send-email-armbru@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52816
|
|
|
218e99 |
O-Subject: [RHEL-7 PATCH v3 07/15] pc: Drop RHEL-6 compat_props {apic, kvm-apic}.vapic
|
|
|
218e99 |
Bugzilla: 983991
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
RHEL-6's kvm_arch_create() calls kvm_tpr_opt_setup() #ifdef
|
|
|
218e99 |
KVM_EXIT_TPR_ACCESS, which is defined in RHEL-6. Adds migration
|
|
|
218e99 |
section "kvm-tpr-opt" when KVM is enabled. Comes from qemu-kvm,
|
|
|
218e99 |
initial commit 885e90b.
|
|
|
218e99 |
|
|
|
218e99 |
It went into upstream qemu v1.1.0, but in different form (commit
|
|
|
218e99 |
e5ad936 "kvmvapic: Introduce TPR access optimization for Windows
|
|
|
218e99 |
guests"). Here, migration section "kvm-tpr-opt" belongs to qdev
|
|
|
218e99 |
"kvmvapic", which is created when the property kvm-apic.vapic
|
|
|
218e99 |
(inherited from apic_common) is on. Commit 9bea6a2 disables it for
|
|
|
218e99 |
older machine types, with suitable compat_props.
|
|
|
218e99 |
|
|
|
218e99 |
Drop them from the RHEL-6 machine types.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
218e99 |
index 5dffeb2..9e96b79 100644
|
|
|
218e99 |
--- a/hw/i386/pc_piix.c
|
|
|
218e99 |
+++ b/hw/i386/pc_piix.c
|
|
|
218e99 |
@@ -900,10 +900,6 @@ static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
.property = "class",\
|
|
|
218e99 |
.value = stringify(PCI_CLASS_MEMORY_RAM),\
|
|
|
218e99 |
},{\
|
|
|
218e99 |
- .driver = "apic",\
|
|
|
218e99 |
- .property = "vapic",\
|
|
|
218e99 |
- .value = "off",\
|
|
|
218e99 |
- },{\
|
|
|
218e99 |
.driver = "virtio-blk-pci",\
|
|
|
218e99 |
.property = "event_idx",\
|
|
|
218e99 |
.value = "off",\
|