From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 16 May 2019 09:11:53 +0000 (+0100)
Subject: libxl: fix regression introduced in 5c883cf036cf
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2238
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e5b7afda94088f30c6be2adf68007631e58da288;p=xen.git

libxl: fix regression introduced in 5c883cf036cf

A few 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>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

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;