OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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 <ehabkost@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Eduardo Habkost 2013-08-21 15:14:44 -03:00 committed by Michael S. Tsirkin
parent 89b439f313
commit 396f79f45e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/i386/pc_piix.c
View File

@ -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);
}

4
hw/i386/pc_q35.c
View File

@ -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);
}