External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

rename qemuDomainDetachSCSIDiskDevice to qemuDomainDetachDiskDevice

Browse Source 
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>
This commit is contained in:
Wen Congyang 2011-03-07 11:31:48 +08:00 committed by Eric Blake
parent 56a4d8127f
commit 8f338032b9
3 changed files with 12 additions and 12 deletions

3
src/qemu/qemu_driver.c

@ -4277,8 +4277,7 @@ static int qemudDomainDetachDevice(virDomainPtr dom,
ret = qemuDomainDetachPciDiskDevice(driver, vm, dev, qemuCaps); ret = qemuDomainDetachPciDiskDevice(driver, vm, dev, qemuCaps);
} }
else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) { else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
ret = qemuDomainDetachSCSIDiskDevice(driver, vm, dev, ret = qemuDomainDetachDiskDevice(driver, vm, dev, qemuCaps);
qemuCaps);
} }
else { else {
qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",

13
src/qemu/qemu_hotplug.c

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

8
src/qemu/qemu_hotplug.h

@ -77,10 +77,10 @@ int qemuDomainDetachPciDiskDevice(struct qemud_driver *driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virBitmapPtr qemuCaps); virBitmapPtr qemuCaps);
int qemuDomainDetachSCSIDiskDevice(struct qemud_driver *driver, int qemuDomainDetachDiskDevice(struct qemud_driver *driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,
virBitmapPtr qemuCaps); virBitmapPtr qemuCaps);
int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver, int qemuDomainDetachPciControllerDevice(struct qemud_driver *driver,
virDomainObjPtr vm, virDomainObjPtr vm,
virDomainDeviceDefPtr dev, virDomainDeviceDefPtr dev,