[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/14] pc: cleanup 1.4 compat support
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 01/14] pc: cleanup 1.4 compat support |
Date: |
Mon, 26 Aug 2013 19:43:02 +0300 |
Make 1.4 compat code call the 1.6 one, reducing
code duplication. Add comment explaining why we can't
make 1.4 call 1.5 as usual.
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <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 6e1e654..46f1fd7 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -265,8 +265,8 @@ static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
{
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);
- has_pci_info = false;
- pc_init_pci(args);
+ /* 1.5 was special - it enabled pvpanic in builtin machine */
+ pc_init_pci_1_6(args);
}
static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 10e770e..ab0aa70 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -234,8 +234,8 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
{
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);
- has_pci_info = false;
- pc_q35_init(args);
+ /* 1.5 was special - it enabled pvpanic in builtin machine */
+ pc_q35_init_1_6(args);
}
static QEMUMachine pc_q35_machine_v1_6 = {
--
MST
- [Qemu-devel] [PULL 00/14] pc,pci,virtio fixes and cleanups, Michael S. Tsirkin, 2013/08/26
- [Qemu-devel] [PULL 01/14] pc: cleanup 1.4 compat support,
Michael S. Tsirkin <=
- [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