| Message ID | 20190516091153.31502-1-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | libxl: fix regression introduced in 5c883cf036cf | expand |
On 16/05/2019 11:11, Wei Liu wrote: > Two lines were erroneously deleted during rebase which caused domain > destruction to fail. > > Signed-off-by: Wei Liu <wei.liu2@citrix.com> Tested-by: Juergen Gross <jgross@suse.com> Reviewed-by: Juergen Gross <jgross@suse.com> Juergen
Wei Liu writes ("[PATCH] libxl: fix regression introduced in 5c883cf036cf"):
> Two lines were erroneously deleted during rebase which caused domain
> destruction to fail.
I have taken this as a sign that I should have properly reviewed what
became 5c883cf036cf.
Having done so I have also spotted that:
The newly introduced ERROR_FAIL returns in libxl should be ERROR_NI
("not implemented").
But I didn't see anything else, other than the rebase error that you
are fixing now. So for this patch:
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Ian.
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index f8340ba815..db6c0203b7 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -734,6 +734,11 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) uint32_t domid; int libxl_only = dev->backend_kind == LIBXL__DEVICE_KIND_NONE; + if (!libxl_only) { + be_path = libxl__device_backend_path(gc, dev); + fe_path = libxl__device_frontend_path(gc, dev); + } + rc = libxl__get_domid(gc, &domid); if (rc) goto out;
Two lines were erroneously deleted during rebase which caused domain destruction to fail. Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Sorry my usual test script failed to catch this. --- tools/libxl/libxl_device.c | 5 +++++ 1 file changed, 5 insertions(+)