From patchwork Thu Jul 31 12:09:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiejun Chen X-Patchwork-Id: 375233 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 B148D140129 for ; Thu, 31 Jul 2014 22:16:20 +1000 (EST) Received: from localhost ([::1]:56121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCpHO-000437-RP for incoming@patchwork.ozlabs.org; Thu, 31 Jul 2014 08:16:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCpDi-000755-Q5 for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XCpDa-00077H-NI for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:12:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:30428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XCpDa-00074I-Ad for qemu-devel@nongnu.org; Thu, 31 Jul 2014 08:12:22 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 31 Jul 2014 05:12:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="366182721" Received: from tchen0-linux.bj.intel.com ([10.238.154.58]) by FMSMGA003.fm.intel.com with ESMTP; 31 Jul 2014 05:09:13 -0700 From: Tiejun Chen To: mst@redhat.com Date: Thu, 31 Jul 2014 20:09:34 +0800 Message-Id: <1406808574-19728-5-git-send-email-tiejun.chen@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406808574-19728-1-git-send-email-tiejun.chen@intel.com> References: <1406808574-19728-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] [v3][PATCH 4/4] xen:hw:i386:pc_piix: introduce new machine for IGD passthrough 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 we can introduce a new machine, xenigd, specific to IGD passthrough. This can avoid involving other common codes. Signed-off-by: Tiejun Chen --- hw/i386/pc_piix.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) v3: * Rebase v2: * Unify prefix with XEN_IGD_PASSTHROUGH/xen_igd_passthrough like patch #3 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0c40b06..cde39d6 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -232,6 +232,46 @@ static void pc_machine_pci_bus_init(MachineState *machine, *pc_isa_bus = isa_bus; } +#ifdef CONFIG_XEN +static void xen_igd_passthrough_pc_machine_pci_bus_init(MachineState *machine, + int pci_enabled, + PCII440FXState **pc_i440fx_state, + int *pc_piix3_devfn, + PCIBus **pc_pci_bus, + ISABus **pc_isa_bus, + qemu_irq *gsi, + MemoryRegion *pci_memory, + MemoryRegion *ram_memory) +{ + MemoryRegion *system_memory = get_system_memory(); + MemoryRegion *system_io = get_system_io(); + PCII440FXState *i440fx_state; + int piix3_devfn; + PCIBus *pci_bus; + ISABus *isa_bus; + + if (pci_enabled) { + pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_XEN_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, + &i440fx_state, &piix3_devfn, &isa_bus, gsi, + system_memory, system_io, machine->ram_size, + below_4g_mem_size, + above_4g_mem_size, + pci_memory, ram_memory); + } else { + pci_bus = NULL; + i440fx_state = NULL; + isa_bus = isa_bus_new(NULL, system_io); + no_hpet = 1; + } + + *pc_i440fx_state = i440fx_state; + *pc_piix3_devfn = piix3_devfn; + *pc_pci_bus = pci_bus; + *pc_isa_bus = isa_bus; +} +#endif + static void pc_machine_device_init(MachineState *machine, int pci_enabled, GSIState *gsi_state, @@ -368,6 +408,38 @@ static void pc_init_pci(MachineState *machine) pc_init1(machine, 1, 1); } +#ifdef CONFIG_XEN +static void xen_igd_passthrough_pc_init1(MachineState *machine, + int pci_enabled, + int kvmclock_enabled) +{ + PCIBus *pci_bus = NULL; + ISABus *isa_bus = NULL; + PCII440FXState *i440fx_state = NULL; + int piix3_devfn = -1; + qemu_irq *gsi = NULL; + GSIState *gsi_state = NULL; + MemoryRegion *ram_memory = NULL; + MemoryRegion *pci_memory = NULL; + DeviceState *icc_bridge = NULL; + FWCfgState *fw_cfg = NULL; + + pc_machine_base_init(machine, pci_enabled, kvmclock_enabled, &icc_bridge, + &ram_memory, &pci_memory, &gsi, &gsi_state, &fw_cfg); + xen_igd_passthrough_pc_machine_pci_bus_init(machine, pci_enabled, + &i440fx_state, &piix3_devfn, + &pci_bus, &isa_bus, gsi, + pci_memory, ram_memory); + pc_machine_device_init(machine, pci_enabled, gsi_state, icc_bridge, + piix3_devfn, fw_cfg, pci_bus, isa_bus, gsi); +} + +static void xen_igd_passthrough_pc_init_pci(MachineState *machine) +{ + xen_igd_passthrough_pc_init1(machine, 1, 1); +} +#endif + static void pc_compat_2_0(MachineState *machine) { /* This value depends on the actual DSDT and SSDT compiled into @@ -514,6 +586,18 @@ static void pc_xen_hvm_init(MachineState *machine) pci_create_simple(bus, -1, "xen-platform"); } } + +static void xen_igd_passthrough_pc_hvm_init(MachineState *machine) +{ + PCIBus *bus; + + xen_igd_passthrough_pc_init_pci(machine); + + bus = pci_find_primary_bus(); + if (bus != NULL) { + pci_create_simple(bus, -1, "xen-platform"); + } +} #endif #define PC_I440FX_MACHINE_OPTIONS \ @@ -963,6 +1047,27 @@ static QEMUMachine xenfv_machine = { { /* end of list */ } }, }; + +static QEMUMachine xenigd_machine = { + PC_COMMON_MACHINE_OPTIONS, + .name = "xenigd", + .desc = "Xen Fully-virtualized PC specific to IGD", + .init = xen_igd_passthrough_pc_hvm_init, + .max_cpus = HVM_MAX_VCPUS, + .default_machine_opts = "accel=xen", + .hot_add_cpu = pc_hot_add_cpu, + .compat_props = (GlobalProperty[]) { + /* xenfv has no fwcfg and so does not load acpi from QEMU. + * as such new acpi features don't work. + */ + { + .driver = "PIIX4_PM", + .property = "acpi-pci-hotplug-with-bridge-support", + .value = "off", + }, + { /* end of list */ } + }, +}; #endif static void pc_machine_init(void) @@ -986,6 +1091,7 @@ static void pc_machine_init(void) qemu_register_pc_machine(&isapc_machine); #ifdef CONFIG_XEN qemu_register_pc_machine(&xenfv_machine); + qemu_register_pc_machine(&xenigd_machine); #endif }