diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2012-01-31 15:21:52 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2012-01-31 15:21:52 +0000 |
| commit | e08baad6ae73b552bfbfc880cba58fed91da2568 (patch) | |
| tree | faa9a804d71f78cd07b596c19f46afe39698831e | |
| parent | 316024b431604f0d466e12d7ae5ebd24cb6aec54 (diff) | |
| download | xen-e08baad6ae73b552bfbfc880cba58fed91da2568.tar.gz xen-e08baad6ae73b552bfbfc880cba58fed91da2568.tar.bz2 xen-e08baad6ae73b552bfbfc880cba58fed91da2568.zip | |
libxl: remove uuid from device model info.
This should be managed by libxl and need not be exposed to the user.
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>
| -rw-r--r-- | tools/libxl/libxl_create.c | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_dm.c | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_types.idl | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 3737d99c08..01e882f6f5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -131,8 +131,6 @@ int libxl_init_dm_info(libxl_ctx *ctx, { memset(dm_info, '\0', sizeof(*dm_info)); - libxl_uuid_generate(&dm_info->uuid); - 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 a84d15c541..116cd10222 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -697,7 +697,7 @@ static int libxl__create_stubdom(libxl__gc *gc, dm_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; dm_config.c_info.name = libxl__sprintf(gc, "%s-dm", libxl__domid_to_name(gc, info->domid)); - libxl_uuid_copy(&dm_config.c_info.uuid, &info->uuid); + libxl_uuid_generate(&dm_config.c_info.uuid); memset(&dm_config.b_info, 0x00, sizeof(libxl_domain_build_info)); dm_config.b_info.type = dm_config.c_info.type; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index b43d3b8d52..09ca35c155 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -253,9 +253,6 @@ libxl_domain_build_info = Struct("domain_build_info",[ libxl_device_model_info = Struct("device_model_info",[ ("domid", libxl_domid), - # uuid is used only with stubdom, and must be different from the - # domain uuid - ("uuid", libxl_uuid), ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", bool), # you set device_model you must set device_model_version too |