On Tue, 18 Jun 2013, Paul Durrant wrote:
> Xen HVM domains normally spawn QEMU with a dedicated xenfv machine type. The
> initialization code for this machine type can easily be pulled into the
> generic pc initialization code and guarded with a test for whether the xen
> accelerator options is specified, which is more consistent with the way
> other accelerators are used.
>
> Signed-off-by: Paul Durrant <paul.durr...@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabell...@eu.citrix.com>
> hw/i386/pc_piix.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index d618570..f96e0c2 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -91,6 +91,11 @@ static void pc_init1(MemoryRegion *system_memory,
> DeviceState *icc_bridge;
> FWCfgState *fw_cfg = NULL;
>
> + if (xen_enabled() && xen_hvm_init() != 0) {
> + fprintf(stderr, "xen hardware virtual machine initialisation
> failed\n");
> + exit(1);
> + }
> +
> icc_bridge = qdev_create(NULL, TYPE_ICC_BRIDGE);
> object_property_add_child(qdev_get_machine(), "icc-bridge",
> OBJECT(icc_bridge), NULL);
> @@ -320,9 +325,6 @@ static void pc_init_isa(QEMUMachineInitArgs *args)
> #ifdef CONFIG_XEN
> static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
> {
> - if (xen_hvm_init() != 0) {
> - hw_error("xen hardware virtual machine initialisation failed");
> - }
> pc_init_pci(args);
> }
> #endif
> --
> 1.7.10.4
>
>
> _______________________________________________
> Xen-devel mailing list
> xen-de...@lists.xen.org
> http://lists.xen.org/xen-devel
>
