On Wed, Jun 08, 2011 at 09:55:18AM +0100, Ian Campbell wrote:
> On Wed, 2011-06-08 at 04:19 +0100, Wei Liu wrote:
> > commit 02cf9f9cfdf720c636c6ba08f795e49b5eb1f03e
> > Author: Wei Liu <liuw@xxxxxxxxx>
> > Date: Wed Jun 8 11:13:25 2011 +0800
> >
> > libxl: enabling upstream qemu as pure pv backend.
> >
> > This patch makes device_model_{version,override} work for pure pv
> > guest, so that users can specify upstream qemu as pure pv backend
> > other than traditional qemu-xen.
> >
> > Signed-off-by: Wei Liu <liuw@xxxxxxxxx>
> >
> > @@ -909,8 +909,8 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc,
> > libxl_device_model_info *info)
> > {
> > libxl_ctx *ctx = libxl__gc_owner(gc);
> > - memset(info, 0x00, sizeof(libxl_device_model_info));
>
> Why do you remove this memset?
>
> > + info->vnc = 0;
> > if (vfb != NULL) {
> > info->vnc = vfb->vnc;
> > if (vfb->vnclisten)
> > @@ -927,9 +927,12 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc,
> > info->nographic = 1;
> > info->domid = domid;
> > info->dom_name = libxl_domid_to_name(ctx, domid);
> > - info->device_model_version =
> > LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
> > - info->device_model = NULL;
> > - info->type = LIBXL_DOMAIN_TYPE_PV;
> > + info->target_ram = 0;
> > + info->videoram = 0;
> > + info->acpi = 0;
> > + info->vcpus = 0;
> > + info->vcpu_avail = 0;
> > + info->xen_platform_pci = 0;
> > return 0;
> > }
> > diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> > index 5415bc5..74a77a7 100644
> > --- a/tools/libxl/xl_cmdimpl.c
> > +++ b/tools/libxl/xl_cmdimpl.c
> > @@ -626,6 +626,8 @@ static void parse_config_data(const char
> > *configfile_filename_report,
> > int pci_power_mgmt = 0;
> > int pci_msitranslate = 1;
> > int e;
> > + XLU_ConfigList *dmargs;
> > + int nr_dmargs = 0;
> >
> > libxl_domain_create_info *c_info = &d_config->c_info;
> > libxl_domain_build_info *b_info = &d_config->b_info;
> > @@ -1075,14 +1077,10 @@ skip_vfb:
> > break;
> > }
> >
> > - if (c_info->hvm == 1) {
> > - XLU_ConfigList *dmargs;
> > - int nr_dmargs = 0;
> > -
> > - /* init dm from c and b */
> > - libxl_init_dm_info(dm_info, c_info, b_info);
> > + /* init dm from c and b */
> > + libxl_init_dm_info(dm_info, c_info, b_info);
Looks like a space issue. You might want to make sure that you
have a uniform amount of spaces in the patches.
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home