ch: implement disk device detach in public API

On-behalf-of: SAP stefan.kober@sap.com
Signed-off-by: Stefan Kober <stefan.kober@cyberus-technology.de>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c
index 4f4783efb164ec45a89f097ba22c48ed96399bc5..760fccba829985650473a68e5efa86fdb91c4f0c 100644 (file)
--- a/src/ch/ch_driver.c
+++ b/src/ch/ch_driver.c
@@ -2387,6 +2387,46 @@ chDomainAttachDevice(virDomainPtr dom,
     return chDomainAttachDeviceFlags(dom, xml, VIR_DOMAIN_AFFECT_LIVE);
 }
 
+static int
+chDomainDetachDeviceFlags(virDomainPtr dom,
+                          const char *xml,
+                          unsigned int flags)
+{
+    virCHDriver *driver = dom->conn->privateData;
+    virDomainObj *vm = NULL;
+    int ret = -1;
+
+    if (!(vm = virCHDomainObjFromDomain(dom)))
+        goto cleanup;
+
+    if (virDomainDetachDeviceFlagsEnsureACL(dom->conn, vm->def, flags) < 0)
+        goto cleanup;
+
+    if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0)
+        goto cleanup;
+
+    if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
+        goto endjob;
+
+    if (chDomainDetachDeviceLiveAndUpdateConfig(driver, vm, xml, flags) < 0)
+        goto endjob;
+
+    ret = 0;
+
+ endjob:
+    virDomainObjEndJob(vm);
+
+ cleanup:
+    virDomainObjEndAPI(&vm);
+    return ret;
+}
+
+static int chDomainDetachDevice(virDomainPtr dom, const char *xml)
+{
+    return chDomainDetachDeviceFlags(dom, xml,
+                                     VIR_DOMAIN_AFFECT_LIVE);
+}
+
 /* Function Tables */
 static virHypervisorDriver chHypervisorDriver = {
     .name = "CH",
@@ -2450,6 +2490,8 @@ static virHypervisorDriver chHypervisorDriver = {
     .domainInterfaceAddresses = chDomainInterfaceAddresses, /* 11.0.0 */
     .domainAttachDevice = chDomainAttachDevice, /* 11.8.0 */
     .domainAttachDeviceFlags = chDomainAttachDeviceFlags, /* 11.8.0 */
+    .domainDetachDevice = chDomainDetachDevice, /* 11.8.0 */
+    .domainDetachDeviceFlags = chDomainDetachDeviceFlags, /* 11.8.0 */
 };
 
 static virConnectDriver chConnectDriver = {