From 172218a01eea0f9e0b45852e4a646cbf96acf7cd Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Tue, 2 Aug 2016 09:20:32 -0400 Subject: [PATCH] libxl: Fix broken build attach/detach controller device Commit id '44304c6eb' added the API libxlDomainAttachControllerDevice inside a conditional LIBXL_HAVE_PVUSB, but called that function outside the conditional in libxlDomainAttachDeviceLive. Similarly, the API libxlDomainDetachControllerDevice was added inside a conditional LIBXL_HAVE_PVUSB, but called outside the conditional in libxlDomainDetachDeviceLive. This patch adds the conditional LIBXL_HAVE_PVUSB around those two calls from within the switch. --- src/libxl/libxl_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index bd7ce6b4c9..4957072304 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3405,11 +3405,13 @@ libxlDomainAttachDeviceLive(libxlDriverPrivatePtr driver, dev->data.disk = NULL; break; +#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_DEVICE_CONTROLLER: ret = libxlDomainAttachControllerDevice(driver, vm, dev->data.controller); if (!ret) dev->data.controller = NULL; break; +#endif case VIR_DOMAIN_DEVICE_NET: ret = libxlDomainAttachNetDevice(driver, vm, @@ -3826,9 +3828,11 @@ libxlDomainDetachDeviceLive(libxlDriverPrivatePtr driver, ret = libxlDomainDetachDeviceDiskLive(vm, dev); break; +#ifdef LIBXL_HAVE_PVUSB case VIR_DOMAIN_DEVICE_CONTROLLER: ret = libxlDomainDetachControllerDevice(driver, vm, dev); break; +#endif case VIR_DOMAIN_DEVICE_NET: ret = libxlDomainDetachNetDevice(driver, vm, -- GitLab