diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2013-08-21 15:14:44 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-08-21 23:30:22 +0300 |
| commit | 396f79f45ea75bd1c421522f29b4f91d490df7cc (patch) | |
| tree | 199a4d0388da61d5e208274c1e9bf4d2cf90ce62 /hw | |
| parent | 89b439f3136644b07c2e25bb4ceeb9466ae23fe5 (diff) | |
| download | qemu-396f79f45ea75bd1c421522f29b4f91d490df7cc.tar.gz qemu-396f79f45ea75bd1c421522f29b4f91d490df7cc.tar.bz2 qemu-396f79f45ea75bd1c421522f29b4f91d490df7cc.zip | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc_piix.c | 4 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 4 |
2 files changed, 4 insertions, 4 deletions
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); } |