When destroying domains remove xapi and vss paths
from xenstore.
Signed-off-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
# HG changeset patch
# User Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
# Date 1259256167 18000
# Node ID d3ee9d231f8c7eca6da0bfd443fb3e2e6c871168
# Parent 61ad75e6a95c2ee8c6cb2f18c7eaec51ea6de785
When destroying domains remove xapi and vss paths
from xenstore.
Signed-off-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
diff -r 61ad75e6a95c -r d3ee9d231f8c libxl.c
--- a/libxl.c
+++ b/libxl.c
@@ -441,7 +441,8 @@ static int libxl_destroy_device_model(st
int libxl_domain_destroy(struct libxl_ctx *ctx, uint32_t domid, int force)
{
- char *dom_path, vm_path[UUID_LEN_STR + 5];
+ char *dom_path, *uuid_str;
+ char vm_path[UUID_LEN_STR + 5], vss_path[UUID_LEN_STR + 6], xapi_path[20];
xen_uuid_t *uuid;
int rc, hvm;
@@ -474,9 +475,17 @@ int libxl_domain_destroy(struct libxl_ct
XL_LOG(ctx, XL_LOG_ERROR, "libxl_destroy_devices failed for %d",
domid);
if (!xs_rm(ctx->xsh, XBT_NULL, dom_path))
XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "xs_rm failed for %s", dom_path);
- snprintf(vm_path, sizeof(vm_path), "/vm/%s", libxl_uuid_to_string(ctx,
uuid));
+ uuid_str = libxl_uuid_to_string(ctx, uuid);
+ snprintf(vm_path, sizeof(vm_path), "/vm/%s", uuid_str);
if (!xs_rm(ctx->xsh, XBT_NULL, vm_path))
XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "xs_rm failed for %s", vm_path);
+ snprintf(vss_path, sizeof(vss_path), "/vss/%s", uuid_str);
+ if (!xs_rm(ctx->xsh, XBT_NULL, vss_path))
+ XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "xs_rm failed for %s", vss_path);
+ libxl_free(ctx, uuid_str);
+ snprintf(xapi_path, sizeof(xapi_path), "/xapi/%u", domid);
+ if (!xs_rm(ctx->xsh, XBT_NULL, xapi_path))
+ XL_LOG_ERRNO(ctx, XL_LOG_ERROR, "xs_rm failed for %s", xapi_path);
rc = xc_domain_destroy(ctx->xch, domid);
if (rc < 0) {
XL_LOG_ERRNOVAL(ctx, XL_LOG_ERROR, rc, "xc_domain_destroy failed for
%d", domid);
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home