From 6a287ba88eaa19541bb1a0f00d009de0b6d8839b Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sun, 11 Mar 2018 13:37:55 -0400 Subject: [PATCH] piix: Eliminate pc_init_pci() Backports commit 211b5b1d0a31f2f7593d6858a0b10487fb7b7fac from qemu --- qemu/hw/i386/pc_piix.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/qemu/hw/i386/pc_piix.c b/qemu/hw/i386/pc_piix.c index bc7e2cd1..c737a839 100644 --- a/qemu/hw/i386/pc_piix.c +++ b/qemu/hw/i386/pc_piix.c @@ -44,11 +44,6 @@ static int pc_init1(struct uc_struct *uc, MachineState *machine) return pc_cpus_init(uc, machine->cpu_model); } -static int pc_init_pci(struct uc_struct *uc, MachineState *machine) -{ - return pc_init1(uc, machine); -} - static void pc_compat_2_2(struct uc_struct *uc, MachineState *machine) { } @@ -56,7 +51,7 @@ static void pc_compat_2_2(struct uc_struct *uc, MachineState *machine) static int pc_init_pci_2_2(struct uc_struct *uc, MachineState *machine) { pc_compat_2_2(uc, machine); - return pc_init_pci(uc, machine); + return pc_init1(uc, machine); } DEFINE_PC_MACHINE(v2_2, "pc-i440fx-2.2", pc_init_pci_2_2);