[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 04/21] pc_piix: cleanup init compat handling
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 04/21] pc_piix: cleanup init compat handling |
Date: |
Tue, 25 Jun 2013 18:40:50 +0300 |
Make sure 1.4 calls 1.5, 1.3 calls 1.4 etc.
This way it's enough to add enough new compat hook
in a single place in piix.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/pc_piix.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index d87da95..234424a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -268,38 +268,28 @@ static void pc_init_pci_1_5(QEMUMachineInitArgs *args)
static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
{
- has_pci_info = false;
has_pvpanic = false;
x86_cpu_compat_set_features("n270", FEAT_1_ECX, 0, CPUID_EXT_MOVBE);
- pc_init_pci(args);
+ pc_init_pci_1_5(args);
}
static void pc_init_pci_1_3(QEMUMachineInitArgs *args)
{
- has_pci_info = false;
enable_compat_apic_id_mode();
- has_pvpanic = false;
- pc_init_pci(args);
+ pc_init_pci_1_4(args);
}
/* PC machine init function for pc-1.1 to pc-1.2 */
static void pc_init_pci_1_2(QEMUMachineInitArgs *args)
{
- has_pci_info = false;
disable_kvm_pv_eoi();
- enable_compat_apic_id_mode();
- has_pvpanic = false;
- pc_init_pci(args);
+ pc_init_pci_1_3(args);
}
/* PC machine init function for pc-0.14 to pc-1.0 */
static void pc_init_pci_1_0(QEMUMachineInitArgs *args)
{
- has_pci_info = false;
- disable_kvm_pv_eoi();
- enable_compat_apic_id_mode();
- has_pvpanic = false;
- pc_init_pci(args);
+ pc_init_pci_1_2(args);
}
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
--
MST
- [Qemu-devel] [PULL v2 19/21] pci: Remove domain from PCIHostBus, (continued)
- [Qemu-devel] [PULL v2 19/21] pci: Remove domain from PCIHostBus, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 11/21] pci: Cleanup configuration for pci-hotplug.c, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 20/21] pci: Fold host_buses list into PCIHostState functionality, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 17/21] pci: Add root bus parameter to pci_nic_init(), Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 02/21] pci: store PCI hole ranges in guestinfo structure, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 21/21] net: add support of mac-programming over macvtap in QEMU side, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 09/21] pvpanic: initialization cleanup, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 07/21] kvm: skip system call when msi route is unchanged, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 08/21] MAINTAINERS: s/Marcelo/Paolo/, Michael S. Tsirkin, 2013/06/25
- [Qemu-devel] [PULL v2 04/21] pc_piix: cleanup init compat handling,
Michael S. Tsirkin <=
- Re: [Qemu-devel] [PULL v2 00/21] pci,kvm,misc enhancements, Anthony Liguori, 2013/06/25
- Re: [Qemu-devel] [PULL v2 00/21] pci,kvm,misc enhancements, Markus Armbruster, 2013/06/28