[PATCH] libxl: fix dm destruction when there is no pid

[PATCH] libxl: fix dm destruction when there is no pid

[Roger Pau Monne]

Fix qemu dm model destruction if the pid in xenstore is 0 (or is not
present).

Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
 tools/libxl/libxl_dm.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 11de03f..b2bae68 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -1081,6 +1081,11 @@ int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid)
 
     pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid));
     if (!pid) {
+        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't find device model's pid");
+        ret = ERROR_INVAL;
+        goto out;
+    }
+    if (!atoi(pid)) {
         int stubdomid = libxl_get_stubdom_id(ctx, domid);
         const char *savefile;
 
@@ -1122,10 +1127,10 @@ int libxl__destroy_device_model(libxl__gc *gc, uint32_t domid)
             goto out;
         }
     }
-    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid));
-    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid));
 
 out:
+    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid));
+    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid));
     return ret;
 }
 
-- 
1.7.7.5 (Apple Git-26)

Re: [PATCH] libxl: fix dm destruction when there is no pid

[Ian Jackson]

Roger Pau Monne writes ("[Xen-devel] [PATCH] libxl: fix dm destruction when there is no pid"):
> Fix qemu dm model destruction if the pid in xenstore is 0 (or is not
> present).

Firstly, this needs rewrapping.

Secondly,
>      pid = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/image/device-model-pid", domid));
>      if (!pid) {
> +        LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't find device model's pid");
> +        ret = ERROR_INVAL;
> +        goto out;
> +    }
> +    if (!atoi(pid)) {
>          int stubdomid = libxl_get_stubdom_id(ctx, domid);

This seems to change the logic regarding stubdoms.  Are you sure this
is correct ?  Previously if the entry didn't exist, we took the
stubdom path.

> -    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid));
> -    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid));
>  
>  out:
> +    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/0/device-model/%d", domid));
> +    xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid));

While moving this, you might as well rewrap it (or use GCSPRINTF).

Ian.