From patchwork Fri May 15 17:19:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 472881 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 C347614027F for ; Sat, 16 May 2015 03:20:22 +1000 (AEST) Received: from localhost ([::1]:60685 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtJHY-0000na-Rd for incoming@patchwork.ozlabs.org; Fri, 15 May 2015 13:20:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtJGl-0007nq-Uk for qemu-devel@nongnu.org; Fri, 15 May 2015 13:19:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtJGk-0002xM-Vg for qemu-devel@nongnu.org; Fri, 15 May 2015 13:19:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtJGk-0002xD-QL for qemu-devel@nongnu.org; Fri, 15 May 2015 13:19:30 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 80C382BB39B; Fri, 15 May 2015 17:19:30 +0000 (UTC) Received: from localhost (ovpn-113-57.phx2.redhat.com [10.3.113.57]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4FHJT5O003828; Fri, 15 May 2015 13:19:30 -0400 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 15 May 2015 14:19:00 -0300 Message-Id: <1431710341-24696-10-git-send-email-ehabkost@redhat.com> In-Reply-To: <1431710341-24696-1-git-send-email-ehabkost@redhat.com> References: <1431710341-24696-1-git-send-email-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, jasowang@redhat.com, rth@twiddle.net, Alexander Graf , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 09/10] 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 The function is not needed anymore, we can simply call pc_init1() directly. Signed-off-by: Eduardo Habkost --- 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)