From: Anthony PERARD <anthony.perard@citrix.com>
Date: Wed, 29 May 2019 16:01:06 +0000 (+0100)
Subject: libxl_usb: Use proper domid value, from libxl__device
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~1531
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d37bf63be32399a598da909899f16e8c8a383acd;p=xen.git

libxl_usb: Use proper domid value, from libxl__device

ao->domid isn't a reliable way of getting a domid, it might not be set
(this isn't the case here). The right domid value can be found in the
libxl__device (which is the device we want to remove) attached to
libxl__ao_device.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl_usb.c b/tools/libxl/libxl_usb.c
index adb122ac85..3d389c0198 100644
--- a/tools/libxl/libxl_usb.c
+++ b/tools/libxl/libxl_usb.c
@@ -515,7 +515,7 @@ void libxl__initiate_device_usbctrl_remove(libxl__egc *egc,
     libxl_device_usbdev *usbdevs = NULL;
     int num_usbdev = 0;
     int i, rc;
-    uint32_t domid = ao->domid;
+    uint32_t domid = aodev->dev->domid;
     int usbctrl_devid = aodev->dev->devid;
     libxl_device_usbctrl usbctrl;
     libxl_usbctrlinfo usbctrlinfo;