diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2012-01-31 15:21:51 +0000 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2012-01-31 15:21:51 +0000 |
commit | e054abab88dc06af8bc02f210509b485d063f723 (patch) | |
tree | a2bfffebd300ae3e8c9bc93b5819d6c71f57be48 /tools/libxl | |
parent | 629a2840b68232cfd7313d64dd6ef600e87be591 (diff) | |
download | xen-e054abab88dc06af8bc02f210509b485d063f723.tar.gz xen-e054abab88dc06af8bc02f210509b485d063f723.tar.bz2 xen-e054abab88dc06af8bc02f210509b485d063f723.zip |
libxl: drop dm_info.dom_name
This is always the same as the c_info name which we now have available.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxl')
-rw-r--r-- | tools/libxl/libxl_create.c | 1 | ||||
-rw-r--r-- | tools/libxl/libxl_dm.c | 18 | ||||
-rw-r--r-- | tools/libxl/libxl_types.idl | 1 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 66cdddf128..f287733fc7 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -118,7 +118,6 @@ int libxl_init_dm_info(libxl_ctx *ctx, libxl_uuid_generate(&dm_info->uuid); - dm_info->dom_name = strdup(c_info->name); dm_info->device_model_version = LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL; dm_info->device_model_stubdomain = false; dm_info->device_model = NULL; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 74b7942e82..8d368f9d95 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -78,6 +78,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, const libxl_domain_config *guest_config, const libxl_device_model_info *info) { + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_nic *vifs = guest_config->vifs; const int num_vifs = guest_config->num_vifs; @@ -91,8 +92,8 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, flexarray_vappend(dm_args, dm, "-d", libxl__sprintf(gc, "%d", info->domid), NULL); - if (info->dom_name) - flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); + if (c_info->name) + flexarray_vappend(dm_args, "-domain-name", c_info->name, NULL); if (info->vnc.enable) { char *vncarg; @@ -239,6 +240,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, const libxl_device_model_info *info) { libxl_ctx *ctx = libxl__gc_owner(gc); + const libxl_domain_create_info *c_info = &guest_config->c_info; const libxl_domain_build_info *b_info = &guest_config->b_info; const libxl_device_disk *disks = guest_config->disks; const libxl_device_nic *vifs = guest_config->vifs; @@ -268,8 +270,8 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-xen-attach"); } - if (info->dom_name) { - flexarray_vappend(dm_args, "-name", info->dom_name, NULL); + if (c_info->name) { + flexarray_vappend(dm_args, "-name", c_info->name, NULL); } if (info->vnc.enable) { int display = 0; @@ -793,6 +795,7 @@ int libxl__create_device_model(libxl__gc *gc, libxl_device_model_info *info, libxl__spawner_starting **starting_r) { + const libxl_domain_create_info *c_info = &guest_config->c_info; libxl_ctx *ctx = libxl__gc_owner(gc); char *path, *logfile; int logfile_w, null; @@ -835,7 +838,9 @@ int libxl__create_device_model(libxl__gc *gc, xs_mkdir(ctx->xsh, XBT_NULL, path); libxl__xs_write(gc, XBT_NULL, libxl__sprintf(gc, "%s/disable_pf", path), "%d", !info->xen_platform_pci); - libxl_create_logfile(ctx, libxl__sprintf(gc, "qemu-dm-%s", info->dom_name), &logfile); + libxl_create_logfile(ctx, + libxl__sprintf(gc, "qemu-dm-%s", c_info->name), + &logfile); logfile_w = open(logfile, O_WRONLY|O_CREAT|O_APPEND, 0644); free(logfile); null = open("/dev/null", O_RDONLY); @@ -981,8 +986,6 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc, libxl_device_vfb *vfb, libxl_device_model_info *info) { - libxl_ctx *ctx = libxl__gc_owner(gc); - if (vfb != NULL) { info->vnc.enable = vfb->vnc.enable; if (vfb->vnc.listen) @@ -997,7 +1000,6 @@ static int libxl__build_xenpv_qemu_args(libxl__gc *gc, } else info->nographic = 1; info->domid = domid; - info->dom_name = libxl_domid_to_name(ctx, domid); return 0; } diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index a9ad906f2c..b579a14726 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -237,7 +237,6 @@ libxl_device_model_info = Struct("device_model_info",[ # uuid is used only with stubdom, and must be different from the # domain uuid ("uuid", libxl_uuid), - ("dom_name", string), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too |