From patchwork Wed Aug 6 06:50:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 376919 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 DF4E1140086 for ; Wed, 6 Aug 2014 16:55:58 +1000 (EST) Received: from localhost ([::1]:36927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv8f-0007sw-5H for incoming@patchwork.ozlabs.org; Wed, 06 Aug 2014 02:55:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6e-0004ZK-DL for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XEv6Z-0007mB-Aa for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:52 -0400 Received: from mga01.intel.com ([192.55.52.88]:48322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XEv6Z-0007m7-5M for qemu-devel@nongnu.org; Wed, 06 Aug 2014 02:53:47 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 05 Aug 2014 23:53:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,810,1400050800"; d="scan'208";a="580695010" Received: from tchen0-linux.bj.intel.com ([10.238.154.58]) by fmsmga002.fm.intel.com with ESMTP; 05 Aug 2014 23:53:27 -0700 From: Tiejun Chen To: mst@redhat.com Date: Wed, 6 Aug 2014 14:50:32 +0800 Message-Id: <1407307835-9692-3-git-send-email-tiejun.chen@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> References: <1407307835-9692-1-git-send-email-tiejun.chen@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Cc: pbonzini@redhat.com, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, stefano.stabellini@eu.citrix.com Subject: [Qemu-devel] [v4][PATCH 2/5] pc_init1: pass parameters just with types 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 Pass types to configure pc_init1(). Signed-off-by: Tiejun Chen --- hw/i386/pc_piix.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) v4: * New patch to work for patch #1 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index bf26550..2bf8046 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -74,7 +74,9 @@ static bool has_reserved_memory = true; /* PC hardware initialisation */ static void pc_init1(MachineState *machine, int pci_enabled, - int kvmclock_enabled) + int kvmclock_enabled, + const char *host_type, + const char *pci_type) { PCMachineState *pc_machine = PC_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); @@ -201,8 +203,8 @@ static void pc_init1(MachineState *machine, } if (pci_enabled) { - pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, - TYPE_I440FX_PCI_DEVICE, + pci_bus = i440fx_init(host_type, + pci_type, &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, @@ -303,7 +305,8 @@ static void pc_init1(MachineState *machine, static void pc_init_pci(MachineState *machine) { - pc_init1(machine, 1, 1); + pc_init1(machine, 1, 1, TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_I440FX_PCI_DEVICE); } static void pc_compat_2_0(MachineState *machine) @@ -419,7 +422,8 @@ static void pc_init_pci_1_2(MachineState *machine) static void pc_init_pci_no_kvmclock(MachineState *machine) { pc_compat_1_2(machine); - pc_init1(machine, 1, 0); + pc_init1(machine, 1, 0, TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_I440FX_PCI_DEVICE); } static void pc_init_isa(MachineState *machine) @@ -437,7 +441,8 @@ static void pc_init_isa(MachineState *machine) } x86_cpu_compat_disable_kvm_features(FEAT_KVM, KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); - pc_init1(machine, 0, 1); + pc_init1(machine, 0, 1, TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_I440FX_PCI_DEVICE); } #ifdef CONFIG_XEN