@@ -261,11 +261,6 @@ static void pc_init1(MachineState *machine)
}
}
-static void pc_init_pci(MachineState *machine)
-{
- pc_init1(machine);
-}
-
static void pc_compat_2_0(MachineState *machine)
{
}
@@ -309,44 +304,44 @@ static void pc_compat_1_2(MachineState *machine)
static void pc_init_pci_2_0(MachineState *machine)
{
pc_compat_2_0(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
static void pc_init_pci_1_7(MachineState *machine)
{
pc_compat_1_7(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
static void pc_init_pci_1_6(MachineState *machine)
{
pc_compat_1_6(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
static void pc_init_pci_1_5(MachineState *machine)
{
pc_compat_1_5(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
static void pc_init_pci_1_4(MachineState *machine)
{
pc_compat_1_4(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
static void pc_init_pci_1_3(MachineState *machine)
{
pc_compat_1_3(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
/* PC machine init function for pc-0.14 to pc-1.2 */
static void pc_init_pci_1_2(MachineState *machine)
{
pc_compat_1_2(machine);
- pc_init_pci(machine);
+ pc_init1(machine);
}
/* PC init function for pc-0.10 to pc-0.13, and reused by xenfv */
@@ -372,7 +367,7 @@ static void pc_xen_hvm_init(MachineState *machine)
{
PCIBus *bus;
- pc_init_pci(machine);
+ pc_init1(machine);
bus = pci_find_primary_bus();
if (bus != NULL) {
@@ -403,7 +398,7 @@ static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *data)
PCMachineClass *pcmc = PC_MACHINE_CLASS(oc);
mc->default_machine_opts = "firmware=bios-256k.bin";
mc->alias = "pc";
- mc->init = pc_init_pci;
+ mc->init = pc_init1;
mc->is_default = 1;
mc->name = "pc-i440fx-2.1";
pcmc->pci_enabled = true;
Now pc_init1() can be called directly. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- hw/i386/pc_piix.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)