From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34244) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkt-0007Fz-Dg for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzOks-0007bb-5O for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41752) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzOkr-0007bV-Ux for qemu-devel@nongnu.org; Mon, 01 Jun 2015 08:23:46 -0400 Date: Mon, 1 Jun 2015 14:23:42 +0200 From: "Michael S. Tsirkin" Message-ID: <1433161230-29421-26-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 25/60] piix: Eliminate pc_init_pci() 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 The function is not needed anymore, we can simply call pc_init1() directly. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index cdc0443..01f938f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -305,11 +305,6 @@ static void pc_init1(MachineState *machine) } } -static void pc_init_pci(MachineState *machine) -{ - pc_init1(machine); -} - static void pc_compat_2_3(MachineState *machine) { } @@ -421,13 +416,13 @@ static void pc_compat_1_2(MachineState *machine) static void pc_init_pci_2_3(MachineState *machine) { pc_compat_2_3(machine); - pc_init_pci(machine); + pc_init1(machine); } static void pc_init_pci_2_2(MachineState *machine) { pc_compat_2_2(machine); - pc_init_pci(machine); + pc_init1(machine); } /* PC compat function for pc-0.10 to pc-0.13 */ @@ -440,57 +435,57 @@ static void pc_compat_0_13(MachineState *machine) static void pc_init_pci_2_1(MachineState *machine) { pc_compat_2_1(machine); - pc_init_pci(machine); + pc_init1(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 */ static void pc_init_pci_no_kvmclock(MachineState *machine) { pc_compat_0_13(machine); - pc_init_pci(machine); + pc_init1(machine); } static void pc_init_isa(MachineState *machine) @@ -516,7 +511,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) { @@ -543,7 +538,7 @@ static void pc_i440fx_2_4_machine_options(MachineClass *m) m->is_default = 1; } -DEFINE_PC_MACHINE(v2_4, "pc-i440fx-2.4", pc_init_pci, +DEFINE_PC_MACHINE(v2_4, "pc-i440fx-2.4", pc_init1, pc_i440fx_2_4_machine_options) -- MST