[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Xen-devel] [PATCH 1/2] Allow use of pc machine type (a
From: |
Paul Durrant |
Subject: |
Re: [Qemu-devel] [Xen-devel] [PATCH 1/2] Allow use of pc machine type (accel=xen) for Xen HVM domains. |
Date: |
Tue, 25 Jun 2013 12:58:35 +0000 |
> -----Original Message-----
> From: Stefano Stabellini [mailto:address@hidden
> Sent: 25 June 2013 13:02
> To: Paul Durrant
> Cc: address@hidden; address@hidden
> Subject: Re: [Xen-devel] [PATCH 1/2] Allow use of pc machine type
> (accel=xen) for Xen HVM domains.
>
> 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 <address@hidden>
> > ---
> > 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);
>
> I was about to submit a pull request with this patch, but unfortunately
> it breaks non-xen compilations:
>
> hw/i386/pc_piix.o: In function `pc_init1':
> /local/scratch/sstabellini/qemu/hw/i386/pc_piix.c:94: undefined reference
> to `xen_hvm_init'
>
> you need to add the function to xen-stub.c:
>
> diff --git a/xen-stub.c b/xen-stub.c
> index 6f0516a..47c8e73 100644
> --- a/xen-stub.c
> +++ b/xen-stub.c
> @@ -63,3 +63,8 @@ void qmp_xen_set_global_dirty_log(bool enable, Error
> **errp)
> void xen_modified_memory(ram_addr_t start, ram_addr_t length)
> {
> }
> +
> +int xen_hvm_init(void)
> +{
> + return 0;
> +}
>
> I'll include this change in the pull request
Ok. Thanks for the fix-up.
Paul
- [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paul Durrant, 2013/06/18
- [Qemu-devel] [PATCH 2/2] Move hardcoded initialization of xen-platform device., Paul Durrant, 2013/06/18
- [Qemu-devel] [PATCH 1/2] Allow use of pc machine type (accel=xen) for Xen HVM domains., Paul Durrant, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paolo Bonzini, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Laszlo Ersek, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Michael S. Tsirkin, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paul Durrant, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Michael S. Tsirkin, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paul Durrant, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Laszlo Ersek, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paul Durrant, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Michael S. Tsirkin, 2013/06/18
- Re: [Qemu-devel] [PATCH 0/2] Remove hardcoded xen-platform device initialization (v4), Paolo Bonzini, 2013/06/20