diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-05-15 14:18:59 -0300 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-05-31 16:26:42 +0200 |
| commit | 72d164aa73b7c8d22a63b8ee789f97e4a8d2aa5c (patch) | |
| tree | 9415db976069a1333ef0ed6281dcac2ab3f09619 /hw/i386 | |
| parent | d48f4fa69eb3efb03a2efe2e4606a97a17cf222f (diff) | |
piix: Add kvmclock_enabled, pci_enabled globals
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 <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 052fca26ef..cdc0443937 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 |