[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/2] Move hardcoded initialization of xen-platfo
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH 2/2] Move hardcoded initialization of xen-platform device. |
Date: |
Tue, 18 Jun 2013 12:31:13 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 |
Am 18.06.2013 11:59, schrieb Paul Durrant:
> Creation of the xen-platform device is currently hardcoded into machine
> type pc's initialization code, guarded by a test for the whether the xen
> accelerator is enabled. This patch moves the creation of xen-platform into
> the initialization code of the xenfv machine type. This maintains backwards
> compatibility for that machine type but allows more flexibility if another
> machine type is used with Xen HVM domains.
>
> Signed-off-by: Paul Durrant <address@hidden>
> ---
> hw/i386/pc_piix.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 7bbb59a..8dd487e 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -179,9 +179,6 @@ static void pc_init1(MemoryRegion *system_memory,
> pc_register_ferr_irq(gsi[13]);
>
> pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);
> - if (xen_enabled()) {
> - pci_create_simple(pci_bus, -1, "xen-platform");
> - }
>
> /* init basic PC hardware */
> pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy, xen_enabled());
> @@ -325,7 +322,13 @@ static void pc_init_isa(QEMUMachineInitArgs *args)
> #ifdef CONFIG_XEN
> static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> {
> + PCIBus *bus;
> +
> pc_init_pci(args);
> +
> + bus = pci_find_root_bus(0);
> + if (bus != NULL)
> + pci_create_simple(bus, -1, "xen-platform");
scripts/checkpatch.pl will complain about missing braces for if, but
otherwise looks okay to me.
Andreas
> }
> #endif
>
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg