From patchwork Sat Jul 5 00:09:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 367276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5129214011D for ; Sat, 5 Jul 2014 10:27:48 +1000 (EST) Received: from localhost ([::1]:38653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DpS-0008TA-HA for incoming@patchwork.ozlabs.org; Fri, 04 Jul 2014 20:27:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3Da0-0003D6-36 for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X3DZt-0005MJ-Sc for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X3DZt-0005MF-JW for qemu-devel@nongnu.org; Fri, 04 Jul 2014 20:11:41 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s650Benh007921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 4 Jul 2014 20:11:41 -0400 Received: from localhost (ovpn-113-142.phx2.redhat.com [10.3.113.142]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s650BdvD020218; Fri, 4 Jul 2014 20:11:40 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 4 Jul 2014 21:09:57 -0300 Message-Id: <1404519002-10224-31-git-send-email-ehabkost@redhat.com> In-Reply-To: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> References: <1404519002-10224-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Marcel Apfelbaum , "Michael S. Tsirkin" , Alexander Graf , Don Slutz , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [RFC v3 30/35] piix: Eliminate pc_init_pci() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now pc_init1() can be called 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 18ac698..5fca2c5 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -279,11 +279,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) { } @@ -333,51 +328,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, and reused by xenfv */ 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) @@ -395,7 +390,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) { @@ -425,7 +420,7 @@ static void pc_i440fx_machine_v2_1_class_init(ObjectClass *oc, void *data) MachineClass *mc = 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"; }