[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/14] pc: pc_compat_1_4() now can call pc_compat_1_5
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/14] pc: pc_compat_1_4() now can call pc_compat_1_5() |
Date: |
Mon, 26 Aug 2013 19:43:36 +0300 |
From: Eduardo Habkost <address@hidden>
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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc_piix.c | 4 ++--
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 a5e5bec..d3d4893 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 f5e0b94..198c785 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);
}
--
MST
- [Qemu-devel] [PULL 02/14] arch_init: align MR size to target page size, (continued)
- [Qemu-devel] [PULL 02/14] arch_init: align MR size to target page size, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 03/14] loader: store FW CFG ROM files in RAM, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 04/14] q35: Add PCIe switch to example q35 configuration, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 05/14] sun4: Don't prematurely explode QEMUMachineInitArgs, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 06/14] ppc: Don't explode QEMUMachineInitArgs into local variables needlessly, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 07/14] ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 08/14] pc: Don't prematurely explode QEMUMachineInitArgs, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 09/14] pc: Don't explode QEMUMachineInitArgs into local variables needlessly, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 10/14] pc: Kill pc_init_pci_1_0(), Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 11/14] pc: Create pc_compat_*() functions, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 12/14] pc: pc_compat_1_4() now can call pc_compat_1_5(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 13/14] pc_piix: Kill pc_init1() memory region args, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 14/14] virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table, Michael S. Tsirkin, 2013/08/26