# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259743480 0
# Node ID 7183cd08d71b828737f5dcb6769ea7e5a62c4242
# Parent 10790a28295816148e7992da047a26a8093c5e43
libxenlight: two small fixes
- set the domid of the guest and not the one of the stubdom in the
libxl_device_model_starting returned to the user;
- check that the length of the two strings matches in
libxl_name_to_domid, otherwise we can get a match for two different
domains that have the same initial part of the name.
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
tools/libxl/libxl.c | 2 +-
tools/libxl/libxl_utils.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -r 10790a282958 -r 7183cd08d71b tools/libxl/libxl.c
--- a/tools/libxl/libxl.c Wed Dec 02 08:44:10 2009 +0000
+++ b/tools/libxl/libxl.c Wed Dec 02 08:44:40 2009 +0000
@@ -842,7 +842,7 @@ retry_transaction:
if (starting_r) {
*starting_r = libxl_calloc(ctx, sizeof(libxl_device_model_starting),
1);
- (*starting_r)->domid = domid;
+ (*starting_r)->domid = info->domid;
(*starting_r)->dom_path = libxl_xs_get_dompath(ctx, info->domid);
(*starting_r)->for_spawn = NULL;
}
diff -r 10790a282958 -r 7183cd08d71b tools/libxl/libxl_utils.c
--- a/tools/libxl/libxl_utils.c Wed Dec 02 08:44:10 2009 +0000
+++ b/tools/libxl/libxl_utils.c Wed Dec 02 08:44:40 2009 +0000
@@ -68,7 +68,7 @@ int libxl_name_to_domid(struct libxl_ctx
for (i = 0; i < num; i++) {
snprintf(path, sizeof(path), "/local/domain/%s/name", l[i]);
domname = xs_read(ctx->xsh, XBT_NULL, path, &len);
- if (domname != NULL && !strncmp(domname, name, len)) {
+ if (domname != NULL && len == strlen(name) && !strncmp(domname, name,
len)) {
int domid_i = atoi(l[i]);
for (j = 0; j < nb_domains; j++) {
if (dominfo[j].domid == domid_i) {
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home