From patchwork Wed Mar 18 09:06:33 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 451288 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 BCFFF14008F for ; Wed, 18 Mar 2015 20:12:26 +1100 (AEDT) Received: from localhost ([::1]:59928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYA1Y-00037b-U1 for incoming@patchwork.ozlabs.org; Wed, 18 Mar 2015 05:12:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YY9xE-0003tt-3T for qemu-devel@nongnu.org; Wed, 18 Mar 2015 05:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YY9x9-0001uS-1I for qemu-devel@nongnu.org; Wed, 18 Mar 2015 05:07:56 -0400 Received: from mga03.intel.com ([134.134.136.65]:50843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YY9x8-0001uB-Rx for qemu-devel@nongnu.org; Wed, 18 Mar 2015 05:07:50 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP; 18 Mar 2015 02:04:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,421,1422950400"; d="scan'208";a="468829549" Received: from tchen0-linux.bj.intel.com ([10.238.154.91]) by FMSMGA003.fm.intel.com with ESMTP; 18 Mar 2015 02:00:31 -0700 From: Tiejun Chen To: mst@redhat.com, kraxel@redhat.com, pbonzini@redhat.com, rth@twiddle.net Date: Wed, 18 Mar 2015 17:06:33 +0800 Message-Id: <1426669601-13891-3-git-send-email-tiejun.chen@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426669601-13891-1-git-send-email-tiejun.chen@intel.com> References: <1426669601-13891-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: 134.134.136.65 Cc: allen.m.kay@intel.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [v7][PATCH 02/10] 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(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 07faec9..cea3a5c 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -75,7 +75,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(); @@ -202,8 +204,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, @@ -309,7 +311,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_2(MachineState *machine) @@ -478,7 +481,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) @@ -495,7 +499,8 @@ static void pc_init_isa(MachineState *machine) } x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << 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