diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2014-10-29 11:26:07 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-11-02 13:44:50 +0200 |
| commit | 2cad57c7177766e2779f30fed9e4578bc7ad62ac (patch) | |
| tree | ca9b68194dc196d14a975727b4e1b18360114e9b /hw/i386/pc_piix.c | |
| parent | a3614c65cfc3ba2958b69befdc156101953f8a8c (diff) | |
| download | focaccia-qemu-2cad57c7177766e2779f30fed9e4578bc7ad62ac.tar.gz focaccia-qemu-2cad57c7177766e2779f30fed9e4578bc7ad62ac.zip | |
pc: Add pc_compat_2_1() function
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/pc_piix.c')
| -rw-r--r-- | hw/i386/pc_piix.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index bfa4edcbb8..ce8745df25 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -302,8 +302,13 @@ static void pc_init_pci(MachineState *machine) pc_init1(machine, 1, 1); } +static void pc_compat_2_1(MachineState *machine) +{ +} + static void pc_compat_2_0(MachineState *machine) { + pc_compat_2_1(machine); /* This value depends on the actual DSDT and SSDT compiled into * the source QEMU; unfortunately it depends on the binary and * not on the machine type, so we cannot make pc-i440fx-1.7 work on @@ -368,6 +373,12 @@ static void pc_compat_1_2(MachineState *machine) x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); } +static void pc_init_pci_2_1(MachineState *machine) +{ + pc_compat_2_1(machine); + pc_init_pci(machine); +} + static void pc_init_pci_2_0(MachineState *machine) { pc_compat_2_0(machine); @@ -472,7 +483,7 @@ static QEMUMachine pc_i440fx_machine_v2_2 = { static QEMUMachine pc_i440fx_machine_v2_1 = { PC_I440FX_2_1_MACHINE_OPTIONS, .name = "pc-i440fx-2.1", - .init = pc_init_pci, + .init = pc_init_pci_2_1, .compat_props = (GlobalProperty[]) { HW_COMPAT_2_1, { /* end of list */ } |