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