# HG changeset patch
# User Anthony PERARD <anthony.perard@xxxxxxxxxx>
# Date 1320410303 0
# Node ID 7b22d2f9830269b941c51f1367340fd6c485953b
# Parent cf8924724b61cc3a22f19e338926795121438349
libxl: libxl: Introduce dm-version xenstore key.
The all key is /libxl/$domid/dm-version.
The /libxl/$domid dir is created with the domain and should be only accessible
by the toolstack domain. The function libxl__xs_libxl_path() give this path.
This come with libxl__device_model_version_running() helper function.
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
---
diff -r cf8924724b61 -r 7b22d2f98302 tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Fri Nov 04 12:38:22 2011 +0000
+++ b/tools/libxl/libxl.c Fri Nov 04 12:38:23 2011 +0000
@@ -778,6 +778,8 @@
if (!xs_rm(ctx->xsh, XBT_NULL, dom_path))
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "xs_rm failed for %s",
dom_path);
+ xs_rm(ctx->xsh, XBT_NULL, libxl__xs_libxl_path(&gc, domid));
+
libxl__userdata_destroyall(&gc, domid);
rc = xc_domain_destroy(ctx->xch, domid);
diff -r cf8924724b61 -r 7b22d2f98302 tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Fri Nov 04 12:38:22 2011 +0000
+++ b/tools/libxl/libxl_create.c Fri Nov 04 12:38:23 2011 +0000
@@ -316,12 +316,14 @@
char *rw_paths[] = { "control/shutdown", "device",
"device/suspend/event-channel" , "data"};
char *ro_paths[] = { "cpu", "memory", "device", "error", "drivers",
"control", "attr", "messages" };
- char *dom_path, *vm_path;
+ char *dom_path, *vm_path, *libxl_path;
struct xs_permissions roperm[2];
struct xs_permissions rwperm[1];
+ struct xs_permissions noperm[1];
xs_transaction_t t = 0;
xen_domain_handle_t handle;
+
assert(!libxl_domid_valid_guest(*domid));
uuid_string = libxl__uuid2string(gc, info->uuid);
@@ -368,6 +370,14 @@
goto out;
}
+ libxl_path = libxl__xs_libxl_path(gc, *domid);
+ if (!libxl_path) {
+ rc = ERROR_FAIL;
+ goto out;
+ }
+ noperm[0].id = 0;
+ noperm[0].perms = XS_PERM_NONE;
+
roperm[0].id = 0;
roperm[0].perms = XS_PERM_NONE;
roperm[1].id = *domid;
@@ -386,6 +396,10 @@
xs_mkdir(ctx->xsh, t, vm_path);
xs_set_permissions(ctx->xsh, t, vm_path, roperm, ARRAY_SIZE(roperm));
+ xs_rm(ctx->xsh, t, libxl_path);
+ xs_mkdir(ctx->xsh, t, libxl_path);
+ xs_set_permissions(ctx->xsh, t, libxl_path, noperm, ARRAY_SIZE(noperm));
+
xs_write(ctx->xsh, t, libxl__sprintf(gc, "%s/vm", dom_path), vm_path,
strlen(vm_path));
rc = libxl__domain_rename(gc, *domid, 0, info->name, t);
if (rc)
@@ -429,6 +443,17 @@
return rc;
}
+static int store_libxl_entry(libxl__gc *gc, uint32_t domid,
+ libxl_device_model_info *dm_info)
+{
+ char *path = NULL;
+
+ path = libxl__xs_libxl_path(gc, domid);
+ path = libxl__sprintf(gc, "%s/dm-version", path);
+ return libxl__xs_write(gc, XBT_NULL, path, libxl__strdup(gc,
+ libxl_device_model_version_to_string(dm_info->device_model_version)));
+}
+
static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config,
libxl_console_ready cb, void *priv,
uint32_t *domid_out, int restore_fd)
@@ -485,6 +510,8 @@
goto error_out;
}
+ store_libxl_entry(gc, domid, dm_info);
+
for (i = 0; i < d_config->num_disks; i++) {
ret = libxl_device_disk_add(ctx, domid, &d_config->disks[i]);
if (ret) {
diff -r cf8924724b61 -r 7b22d2f98302 tools/libxl/libxl_internal.c
--- a/tools/libxl/libxl_internal.c Fri Nov 04 12:38:22 2011 +0000
+++ b/tools/libxl/libxl_internal.c Fri Nov 04 12:38:23 2011 +0000
@@ -319,6 +319,29 @@
return fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
}
+libxl_device_model_version libxl__device_model_version_running(libxl__gc *gc,
+ uint32_t domid)
+{
+ char *path = NULL;
+ char *dm_version = NULL;
+ libxl_device_model_version value;
+
+ path = libxl__xs_libxl_path(gc, domid);
+ path = libxl__sprintf(gc, "%s/dm-version", path);
+ dm_version = libxl__xs_read(gc, XBT_NULL, path);
+ if (!dm_version) {
+ return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
+ }
+
+ if (libxl_device_model_version_from_string(dm_version, &value) < 0) {
+ libxl_ctx *ctx = libxl__gc_owner(gc);
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR,
+ "fatal: %s contain a wrong value (%s)", path, dm_version);
+ return -1;
+ }
+ return value;
+}
+
/*
* Local variables:
* mode: C
diff -r cf8924724b61 -r 7b22d2f98302 tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Fri Nov 04 12:38:22 2011 +0000
+++ b/tools/libxl/libxl_internal.h Fri Nov 04 12:38:23 2011 +0000
@@ -183,6 +183,8 @@
char *path, unsigned int *nb);
/* On error: returns NULL, sets errno (no logging) */
+_hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid);
+
/* from xl_dom */
_hidden libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid);
_hidden int libxl__domain_shutdown_reason(libxl__gc *gc, uint32_t domid);
@@ -630,6 +632,11 @@
_hidden libxl__json_object *libxl__json_parse(libxl__gc *gc, const char *s);
+ /* Based on /local/domain/$domid/dm-version xenstore key
+ * default is qemu xen traditional */
+_hidden libxl_device_model_version
+libxl__device_model_version_running(libxl__gc *gc, uint32_t domid);
+
#endif
/*
diff -r cf8924724b61 -r 7b22d2f98302 tools/libxl/libxl_xshelp.c
--- a/tools/libxl/libxl_xshelp.c Fri Nov 04 12:38:22 2011 +0000
+++ b/tools/libxl/libxl_xshelp.c Fri Nov 04 12:38:23 2011 +0000
@@ -122,6 +122,15 @@
return ret;
}
+char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid)
+{
+ libxl_ctx *ctx = libxl__gc_owner(gc);
+ char *s = libxl__sprintf(gc, "/libxl/%i", domid);
+ if (!s)
+ LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "cannot allocate create paths");
+ return s;
+}
+
/*
* Local variables:
* mode: C
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home