From: Ian Campbell Date: Tue, 31 Jan 2012 15:21:52 +0000 (+0000) Subject: libxl: Remove libxl_device_model_info.type. X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=316024b431604f0d466e12d7ae5ebd24cb6aec54;p=xen.git libxl: Remove libxl_device_model_info.type. This is the type of the target guest which is part of the guest config. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8bc7407356..3737d99c08 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -605,7 +605,6 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, memset((void*)&xenpv_dm_info, 0, 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; diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index bf01806a18..a84d15c541 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -77,7 +77,7 @@ static const libxl_vnc_info *dm_vnc(const libxl_domain_config *guest_config, const libxl_device_model_info *info) { const libxl_vnc_info *vnc = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { vnc = &guest_config->b_info.u.hvm.vnc; } else if (guest_config->num_vfbs > 0) { vnc = &guest_config->vfbs[0].vnc; @@ -89,7 +89,7 @@ static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, const libxl_device_model_info *info) { const libxl_sdl_info *sdl = NULL; - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { sdl = &guest_config->b_info.u.hvm.sdl; } else if (guest_config->num_vfbs > 0) { sdl = &guest_config->vfbs[0].sdl; @@ -100,7 +100,7 @@ static const libxl_sdl_info *dm_sdl(const libxl_domain_config *guest_config, static const char *dm_keymap(const libxl_domain_config *guest_config, const libxl_device_model_info *info) { - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (guest_config->b_info.type == LIBXL_DOMAIN_TYPE_HVM) { return guest_config->b_info.u.hvm.keymap; } else if (guest_config->num_vfbs > 0) { return guest_config->vfbs[0].keymap; @@ -171,7 +171,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, if (keymap) { flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -254,7 +254,7 @@ static char ** libxl__build_device_model_args_old(libxl__gc *gc, for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -353,7 +353,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-mon"); flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); - if (info->type == LIBXL_DOMAIN_TYPE_PV) { + if (b_info->type == LIBXL_DOMAIN_TYPE_PV) { flexarray_append(dm_args, "-xen-attach"); } @@ -400,7 +400,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, flexarray_vappend(dm_args, "-k", keymap, NULL); } - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_vifs = 0; if (b_info->u.hvm.serial) { @@ -498,7 +498,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, for (i = 0; info->extra && info->extra[i] != NULL; i++) flexarray_append(dm_args, info->extra[i]); flexarray_append(dm_args, "-M"); - switch (info->type) { + switch (b_info->type) { case LIBXL_DOMAIN_TYPE_PV: flexarray_append(dm_args, "xenpv"); for (i = 0; info->extra_pv && info->extra_pv[i] != NULL; i++) @@ -517,7 +517,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__sprintf(gc, "%d", libxl__sizekb_to_mb(b_info->target_memkb))); - if (info->type == LIBXL_DOMAIN_TYPE_HVM) { + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { for (i = 0; i < num_disks; i++) { int disk, part; int dev_number = @@ -700,6 +700,7 @@ static int libxl__create_stubdom(libxl__gc *gc, libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); + dm_config.b_info.type = dm_config.c_info.type; dm_config.b_info.max_vcpus = 1; dm_config.b_info.max_memkb = 32 * 1024; dm_config.b_info.target_memkb = dm_config.b_info.max_memkb; @@ -828,7 +829,6 @@ retry_transaction: memset((void*)&xenpv_dm_info, 0, 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; xenpv_dm_info.extra = info->extra; xenpv_dm_info.extra_pv = info->extra_pv; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 0947dbd140..b43d3b8d52 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -261,7 +261,6 @@ libxl_device_model_info = Struct("device_model_info",[ # you set device_model you must set device_model_version too ("device_model", string), ("saved_state", string), - ("type", libxl_domain_type), # extra parameters pass directly to qemu, NULL terminated ("extra", libxl_string_list), # extra parameters pass directly to qemu for PV guest, NULL terminated diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3e98f68965..9eff71208b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1300,8 +1300,6 @@ skip_vfb: b_info->u.hvm.xen_platform_pci = l; } - dm_info->type = c_info->type; - xlu_cfg_destroy(config); }