Comment 12 for bug 1561019

Revision history for this message
Stefan Bader (smb) wrote :

I think I understand... x86_cpu_change_kvm_default("svm", NULL) causes the default of "off" to be removed for compat levels of 2.1 and older... So what we actually want is either move that line to be applied for all compat levels or remove them and also remove the default of "off". Like below (but I want to test this first):

Index: qemu-2.5+dfsg/hw/i386/pc_piix.c
===================================================================
--- qemu-2.5+dfsg.orig/hw/i386/pc_piix.c 2016-04-21 11:24:12.000000000 +0200
+++ qemu-2.5+dfsg/hw/i386/pc_piix.c 2016-04-21 16:03:59.421505982 +0200
@@ -325,7 +325,6 @@ static void pc_compat_2_1(MachineState *

     pc_compat_2_2(machine);
     smbios_uuid_encoded = false;
- x86_cpu_change_kvm_default("svm", NULL);
     pcms->enforce_aligned_dimm = false;
 }

Index: qemu-2.5+dfsg/hw/i386/pc_q35.c
===================================================================
--- qemu-2.5+dfsg.orig/hw/i386/pc_q35.c 2015-12-12 13:16:02.000000000 +0100
+++ qemu-2.5+dfsg/hw/i386/pc_q35.c 2016-04-21 16:04:17.725505700 +0200
@@ -309,7 +309,6 @@ static void pc_compat_2_1(MachineState *
     pc_compat_2_2(machine);
     pcms->enforce_aligned_dimm = false;
     smbios_uuid_encoded = false;
- x86_cpu_change_kvm_default("svm", NULL);
 }

 static void pc_compat_2_0(MachineState *machine)
Index: qemu-2.5+dfsg/target-i386/cpu.c
===================================================================
--- qemu-2.5+dfsg.orig/target-i386/cpu.c 2016-04-21 11:24:12.000000000 +0200
+++ qemu-2.5+dfsg/target-i386/cpu.c 2016-04-21 16:03:31.797506408 +0200
@@ -1380,7 +1380,6 @@ static PropValue kvm_default_props[] = {
     { "x2apic", "on" },
     { "acpi", "off" },
     { "monitor", "off" },
- { "svm", "off" },
     { NULL, NULL },
 };