rename qemuDomainDetachSCSIDiskDevice to qemuDomainDetachDiskDevice

The way to detach a USB disk is the same as that to detach a SCSI
disk. Rename this function and we can use it to detach a USB disk.

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c9095bb05c22e7a8b6203838679dcee5706d9329..170c9c8ca2c008bc0ace79476de7059bf9ac7b91 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4277,8 +4277,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom,
             ret = qemuDomainDetachPciDiskDevice(driver, vm, dev, qemuCaps);
         }
         else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
-            ret = qemuDomainDetachSCSIDiskDevice(driver, vm, dev,
-                                                 qemuCaps);
+            ret = qemuDomainDetachDiskDevice(driver, vm, dev, qemuCaps);
         }
         else {
             qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 25d2dd9d3e11e1c929fc8cf83e7ff01372add950..9991031b548e10ea0f69b81252640d57d9479d73 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1221,10 +1221,10 @@ cleanup:
     return ret;
 }
 
-int qemuDomainDetachSCSIDiskDevice(struct qemud_driver *driver,
-                                   virDomainObjPtr vm,
-                                   virDomainDeviceDefPtr dev,
-                                   virBitmapPtr qemuCaps)
+int qemuDomainDetachDiskDevice(struct qemud_driver *driver,
+                               virDomainObjPtr vm,
+                               virDomainDeviceDefPtr dev,
+                               virBitmapPtr qemuCaps)
 {
     int i, ret = -1;
     virDomainDiskDefPtr detach = NULL;
@@ -1241,8 +1241,9 @@ int qemuDomainDetachSCSIDiskDevice(struct qemud_driver *driver,
     }
 
     if (!qemuCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) {
-        qemuReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                        _("Underlying qemu does not support SCSI disk removal"));
+        qemuReportError(VIR_ERR_OPERATION_FAILED,
+                        _("Underlying qemu does not support %s disk removal"),
+                        virDomainDiskBusTypeToString(dev->data.disk->bus));
         goto cleanup;
     }
 

diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index c84d4966dc982aef0d7943473ec17b5bb39209f3..db3970c1398761eda144cf739fdb1b0ee2c076aa 100644 (file)
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -77,10 +77,10 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver,
                                   virDomainObjPtr vm,
                                   virDomainDeviceDefPtr dev,
                                   virBitmapPtr qemuCaps);
-int qemuDomainDetachSCSIDiskDevice(struct qemud_driver *driver,
-                                   virDomainObjPtr vm,
-                                   virDomainDeviceDefPtr dev,
-                                   virBitmapPtr qemuCaps);
+int qemuDomainDetachDiskDevice(struct qemud_driver *driver,
+                               virDomainObjPtr vm,
+                               virDomainDeviceDefPtr dev,
+                               virBitmapPtr qemuCaps);
 int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver,
                                         virDomainObjPtr vm,
                                         virDomainDeviceDefPtr dev,