From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fY-0000Xv-KK for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XI0fR-0006Vf-3H for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XI0fQ-0006VK-Rp for qemu-devel@nongnu.org; Thu, 14 Aug 2014 15:26:33 -0400 From: Eduardo Habkost Date: Thu, 14 Aug 2014 16:25:34 -0300 Message-Id: <1408044362-11621-6-git-send-email-ehabkost@redhat.com> In-Reply-To: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> References: <1408044362-11621-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH v4 05/33] piix: Eliminate pc_init_pci() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Now we can use pc_init1() directly. Signed-off-by: Eduardo Habkost --- hw/i386/pc_piix.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 02c99a4..ff75ca1 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -298,11 +298,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) { /* This value depends on the actual DSDT and SSDT compiled into @@ -378,51 +373,51 @@ static void pc_compat_0_13(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 */ 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) @@ -448,7 +443,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) { @@ -470,7 +465,7 @@ static QEMUMachine pc_i440fx_machine_v2_1 = { PC_I440FX_2_1_MACHINE_OPTIONS, .name = "pc-i440fx-2.1", .alias = "pc", - .init = pc_init_pci, + .init = pc_init1, .is_default = 1, }; -- 1.9.3