From 396f79f45ea75bd1c421522f29b4f91d490df7cc Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Wed, 21 Aug 2013 15:14:44 -0300 Subject: pc: pc_compat_1_4() now can call pc_compat_1_5() It just needs to set has_pvpanic=false after calling it. This way, it won't be a special case anymore. Signed-off-by: Eduardo Habkost Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 4 ++-- hw/i386/pc_q35.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'hw') diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a5e5bec037..d3d48934ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -250,8 +250,8 @@ static void pc_compat_1_5(QEMUMachineInitArgs *args) static void pc_compat_1_4(QEMUMachineInitArgs *args) { - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_compat_1_6(args); + pc_compat_1_5(args); + has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index f5e0b941e0..198c7851b3 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -229,8 +229,8 @@ static void pc_compat_1_5(QEMUMachineInitArgs *args) static void pc_compat_1_4(QEMUMachineInitArgs *args) { - /* 1.5 was special - it enabled pvpanic in builtin machine */ - pc_compat_1_6(args); + pc_compat_1_5(args); + has_pvpanic = false; x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE); x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_PCLMULQDQ); } -- cgit v1.2.3