From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkq-0007Au-7U for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOkp-0007aO-7d for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41739) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkp-0007aI-34 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:43 -0400 Date: Mon, 1 Jun 2015 14:23:39 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-25-git-send-email-mst@redhat.com> References: <1433161230-29421-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433161230-29421-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 24/60] piix: Add kvmclock_enabled, pci_enabled globals List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Eduardo Habkost , Paolo Bonzini From: Eduardo Habkost This looks like a step backwards, but it will allow pc-0.1[0123] and isapc to follow the same compat+init pattern used by the other machine-types, allowing us to generate all init function using the same macro later. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 052fca2..cdc0443 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -59,6 +59,7 @@ static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] = { 14, 15 }; +static bool pci_enabled = true; static bool has_acpi_build = true; static bool rsdp_in_ram = true; static int legacy_acpi_table_size; @@ -71,11 +72,10 @@ static bool smbios_uuid_encoded = true; */ static bool gigabyte_align = true; static bool has_reserved_memory = true; +static bool kvmclock_enabled = true; /* PC hardware initialisation */ -static void pc_init1(MachineState *machine, - int pci_enabled, - int kvmclock_enabled) +static void pc_init1(MachineState *machine) { PCMachineState *pc_machine = PC_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); @@ -307,7 +307,7 @@ static void pc_init1(MachineState *machine, static void pc_init_pci(MachineState *machine) { - pc_init1(machine, 1, 1); + pc_init1(machine); } static void pc_compat_2_3(MachineState *machine) @@ -430,6 +430,13 @@ static void pc_init_pci_2_2(MachineState *machine) pc_init_pci(machine); } +/* PC compat function for pc-0.10 to pc-0.13 */ +static void pc_compat_0_13(MachineState *machine) +{ + pc_compat_1_2(machine); + kvmclock_enabled = false; +} + static void pc_init_pci_2_1(MachineState *machine) { pc_compat_2_1(machine); @@ -482,12 +489,13 @@ static void pc_init_pci_1_2(MachineState *machine) /* PC init function for pc-0.10 to pc-0.13 */ static void pc_init_pci_no_kvmclock(MachineState *machine) { - pc_compat_1_2(machine); - pc_init1(machine, 1, 0); + pc_compat_0_13(machine); + pc_init_pci(machine); } static void pc_init_isa(MachineState *machine) { + pci_enabled = false; has_acpi_build = false; smbios_defaults = false; gigabyte_align = false; @@ -500,7 +508,7 @@ static void pc_init_isa(MachineState *machine) } x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); - pc_init1(machine, 0, 1); + pc_init1(machine); } #ifdef CONFIG_XEN -- MST