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

[Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>]

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.

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel