Pushed under the build breaker rule
John Ferlan (2):
libxl: Fix broken build from libxlDomainCleanup
libxl: Fix broken build attach/detach controller device
src/libxl/libxl_domain.c | 2 +-
src/libxl/libxl_driver.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
--
2.7.4
Show replies by date
Commit id '7d3b2eb5' missed a closing parenthesis on the ignore_value
macro, causing the failure
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/libxl/libxl_domain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index d99f903..57ef235 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -807,7 +807,7 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver,
/* we can't stop the operation even if the script raised an error */
ignore_value(virHookCall(VIR_HOOK_DRIVER_LIBXL, vm->def->name,
VIR_HOOK_LIBXL_OP_RELEASE, VIR_HOOK_SUBOP_END,
- NULL, xml, NULL);
+ NULL, xml, NULL));
VIR_FREE(xml);
}
--
2.7.4
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.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
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 bd7ce6b..4957072 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,
--
2.7.4