libxl: enabling upstream qemu as pure pv backend.
PATCH 1/1 libxl: enabling upstream qemu as pure pv backend.
This patch was dropped. Resending.
This version contains minor bug fix. Please don't use previous version.
-----------------------------------------------------------
commit a0f5de6a0cf3e033efbc2297817bcddcdce6f0fd
Author: Wei Liu <[email protected]> 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.
This patch also adds device_model_args_{pv,fv} options for pv and fv guest respectively.
Internally, original libxl__create_xenpv_qemu allocates a new empty dm_info (struct libxl_device_model_info) for every xenpv qemu created. Now the caller of libxl__create_xenpv_qemu is responsible for allocating this dm_info.
tools/libxl/libxl.idl +2 -0
@@ -240,6 +240,8 @@ The password never expires"""), ("vcpu_avail", integer, False, "vcpus actually available"), ("xen_platform_pci", bool, False, "enable/disable the xen platform pci device"), ("extra", libxl_string_list, False, "extra parameters pass directly to qemu, NULL terminated"), + ("extra_pv", libxl_string_list, False, "extra parameters pass directly to qemu for PV guest, NULL terminated"), + ("extra_fv", libxl_string_list, False, "extra parameters pass directly to qemu for FV guest, NULL terminated"), ], comment= """Device Model information.
tools/libxl/libxl_create.c +12 -1
@@ -495,6 +495,7 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, }else {int need_qemu =0 ;libxl_device_console console; +libxl_device_model_info xenpv_dm_info;for (i =0 ; i < d_config->num_vfbs; i++) {libxl_device_vfb_add (ctx, domid, &d_config->vfbs[i]);
@@ -515,8 +516,18 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config,libxl__device_console_add (gc, domid, &console, &state);libxl_device_console_destroy (&console); +/* only copy those useful configs */ +memset ((void *)&xenpv_dm_info,0x00 ,sizeof (libxl_device_model_info)); + xenpv_dm_info.device_model_version = + d_config->dm_info.device_model_version; + xenpv_dm_info.type = d_config->dm_info.type; + xenpv_dm_info.device_model = d_config->dm_info.device_model; + xenpv_dm_info.extra = d_config->dm_info.extra; + xenpv_dm_info.extra_pv = d_config->dm_info.extra_pv; + xenpv_dm_info.extra_fv = d_config->dm_info.extra_fv;if (need_qemu) -libxl__create_xenpv_qemu (gc, domid, d_config->vfbs, &dm_starting); +libxl__create_xenpv_qemu (gc, domid, &xenpv_dm_info, + d_config->vfbs, &dm_starting); }if (dm_starting) {
tools/libxl/libxl_dm.c +23 -10
@@ -206,9 +206,13 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc,switch (info->type) {case LIBXL_DOMAIN_TYPE_PV :flexarray_append (dm_args,"xenpv" ); +for (i =0 ; info->extra_pv && info->extra_pv[i] !=NULL ; i++) +flexarray_append (dm_args, info->extra_pv[i]);break ;case LIBXL_DOMAIN_TYPE_FV :flexarray_append (dm_args,"xenfv" ); +for (i =0 ; info->extra_fv && info->extra_fv[i] !=NULL ; i++) +flexarray_append (dm_args, info->extra_fv[i]);break ; }flexarray_append (dm_args,NULL );
@@ -403,9 +407,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,switch (info->type) {case LIBXL_DOMAIN_TYPE_PV :flexarray_append (dm_args,"xenpv" ); +for (i =0 ; info->extra_pv && info->extra_pv[i] !=NULL ; i++) +flexarray_append (dm_args, info->extra_pv[i]);break ;case LIBXL_DOMAIN_TYPE_FV :flexarray_append (dm_args,"xenfv" ); +for (i =0 ; info->extra_fv && info->extra_fv[i] !=NULL ; i++) +flexarray_append (dm_args, info->extra_fv[i]);break ; }
@@ -614,6 +622,7 @@ static int libxl__create_stubdom(libxl__gc *gc,struct xs_permissions perm[2 ];xs_transaction_t t;libxl__device_model_starting *dm_starting =0 ; +libxl_device_model_info xenpv_dm_info;if (info->device_model_version !=LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL ) { ret =ERROR_INVAL ;
@@ -647,6 +656,7 @@ static int libxl__create_stubdom(libxl__gc *gc,/* fixme: this function can leak the stubdom if it fails */ + domid =0 ; ret =libxl__domain_make (gc, &c_info, &domid);if (ret) goto out_free;
@@ -741,7 +751,14 @@ retry_transaction:if (ret) goto out_free; } -if (libxl__create_xenpv_qemu (gc, domid, vfb, &dm_starting) <0 ) { + +memset ((void *)&xenpv_dm_info,0x00 ,sizeof (libxl_device_model_info)); + xenpv_dm_info.device_model_version = info->device_model_version; + xenpv_dm_info.type =LIBXL_DOMAIN_TYPE_PV ; + xenpv_dm_info.device_model = info->device_model; +if (libxl__create_xenpv_qemu (gc, domid, + &xenpv_dm_info, + vfb, &dm_starting) <0 ) { ret =ERROR_FAIL ; goto out_free; }
@@ -950,7 +967,6 @@ 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));if (vfb !=NULL ) { info->vnc = vfb->vnc;
@@ -968,9 +984,6 @@ 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 ;return 0 ; }
@@ -1011,12 +1024,12 @@ out:return ret; } -int libxl__create_xenpv_qemu (libxl__gc *gc,uint32_t domid,libxl_device_vfb *vfb, +int libxl__create_xenpv_qemu (libxl__gc *gc,uint32_t domid, +libxl_device_model_info *info, +libxl_device_vfb *vfb,libxl__device_model_starting **starting_r) { -libxl_device_model_info info; - -libxl__build_xenpv_qemu_args (gc, domid, vfb, &info); -libxl__create_device_model (gc, &info,NULL ,0 ,NULL ,0 , starting_r); +libxl__build_xenpv_qemu_args (gc, domid, vfb, info); +libxl__create_device_model (gc, info,NULL ,0 ,NULL ,0 , starting_r);return 0 ; }
tools/libxl/libxl_internal.h +3 -1
@@ -264,7 +264,9 @@ _hidden int libxl__create_device_model(libxl__gc *gc, libxl_device_disk *disk, int num_disks, libxl_device_nic *vifs, int num_vifs, libxl__device_model_starting **starting_r); -_hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb, +_hidden int libxl__create_xenpv_qemu(libxl__gc *gc, uint32_t domid, +libxl_device_model_info *dm_info, +libxl_device_vfb *vfb,libxl__device_model_starting **starting_r); _hidden int libxl__need_xenpv_qemu(libxl__gc *gc, int nr_consoles, libxl_device_console *consoles,
tools/libxl/xl_cmdimpl.c +71 -41
134 lines not on this page · raw message