External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 19:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_hotplug: rename dev to match in qemuDomainDetachDeviceLive

Browse Source 
I'm about to add a second virDomainDeviceDef to this function that
will point to the actual device in the domain object. while this is
just a partially filled-in example of what to look for. Naming it
match will make the code easier to follow.

Signed-off-by: Laine Stump <laine@laine.org>
ACKed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Laine Stump 2019-03-19 17:15:00 -04:00
parent 637d72f985
commit c4d6a121a8
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_hotplug.c
View File

@ -6182,52 +6182,52 @@ qemuDomainDetachLease(virQEMUDriverPtr driver,
int
qemuDomainDetachDeviceLive(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
virDomainDeviceDefPtr match,
virQEMUDriverPtr driver,
bool async)
{
int ret = -1;
switch ((virDomainDeviceType)dev->type) {
switch ((virDomainDeviceType)match->type) {
case VIR_DOMAIN_DEVICE_DISK:
ret = qemuDomainDetachDeviceDiskLive(driver, vm, dev, async);
ret = qemuDomainDetachDeviceDiskLive(driver, vm, match, async);
break;
case VIR_DOMAIN_DEVICE_CONTROLLER:
ret = qemuDomainDetachControllerDevice(driver, vm, dev, async);
ret = qemuDomainDetachControllerDevice(driver, vm, match, async);
break;
case VIR_DOMAIN_DEVICE_LEASE:
ret = qemuDomainDetachLease(driver, vm, dev->data.lease);
ret = qemuDomainDetachLease(driver, vm, match->data.lease);
break;
case VIR_DOMAIN_DEVICE_NET:
ret = qemuDomainDetachNetDevice(driver, vm, dev, async);
ret = qemuDomainDetachNetDevice(driver, vm, match, async);
break;
case VIR_DOMAIN_DEVICE_HOSTDEV:
ret = qemuDomainDetachHostDevice(driver, vm, dev, async);
ret = qemuDomainDetachHostDevice(driver, vm, match, async);
break;
case VIR_DOMAIN_DEVICE_CHR:
ret = qemuDomainDetachChrDevice(driver, vm, dev->data.chr, async);
ret = qemuDomainDetachChrDevice(driver, vm, match->data.chr, async);
break;
case VIR_DOMAIN_DEVICE_RNG:
ret = qemuDomainDetachRNGDevice(driver, vm, dev->data.rng, async);
ret = qemuDomainDetachRNGDevice(driver, vm, match->data.rng, async);
break;
case VIR_DOMAIN_DEVICE_MEMORY:
ret = qemuDomainDetachMemoryDevice(driver, vm, dev->data.memory, async);
ret = qemuDomainDetachMemoryDevice(driver, vm, match->data.memory, async);
break;
case VIR_DOMAIN_DEVICE_SHMEM:
ret = qemuDomainDetachShmemDevice(driver, vm, dev->data.shmem, async);
ret = qemuDomainDetachShmemDevice(driver, vm, match->data.shmem, async);
break;
case VIR_DOMAIN_DEVICE_WATCHDOG:
ret = qemuDomainDetachWatchdog(driver, vm, dev->data.watchdog, async);
ret = qemuDomainDetachWatchdog(driver, vm, match->data.watchdog, async);
break;
case VIR_DOMAIN_DEVICE_INPUT:
ret = qemuDomainDetachInputDevice(vm, dev->data.input, async);
ret = qemuDomainDetachInputDevice(vm, match->data.input, async);
break;
case VIR_DOMAIN_DEVICE_REDIRDEV:
ret = qemuDomainDetachRedirdevDevice(driver, vm, dev->data.redirdev, async);
ret = qemuDomainDetachRedirdevDevice(driver, vm, match->data.redirdev, async);
break;
case VIR_DOMAIN_DEVICE_VSOCK:
ret = qemuDomainDetachVsockDevice(vm, dev->data.vsock, async);
ret = qemuDomainDetachVsockDevice(vm, match->data.vsock, async);
break;
case VIR_DOMAIN_DEVICE_FS:
@ -6245,7 +6245,7 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm,
case VIR_DOMAIN_DEVICE_LAST:
virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("live detach of device '%s' is not supported"),
virDomainDeviceTypeToString(dev->type));
virDomainDeviceTypeToString(match->type));
break;
}

2
src/qemu/qemu_hotplug.h
View File

@ -115,7 +115,7 @@ int qemuDomainAttachRNGDevice(virQEMUDriverPtr driver,
virDomainRNGDefPtr rng);
int qemuDomainDetachDeviceLive(virDomainObjPtr vm,
virDomainDeviceDefPtr dev,
virDomainDeviceDefPtr match,
virQEMUDriverPtr driver,
bool async);