External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-11 14:11:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Call qemuSetupHostdevCGroup later during hotplug

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1025108

So far qemuSetupHostdevCGroup was called very early during hotplug, even
before we knew the device we were about to hotplug was actually
available. By calling the function later, we make sure QEMU won't be
allowed to access devices used by other domains.

Another important effect of this change is that hopluging USB devices
specified by vendor and product (but not by their USB address) works
again. This was broken since v1.0.5-171-g7d763ac, when the call to
qemuFindHostdevUSBDevice was moved after the call to
qemuSetupHostdevCGroup, which then used an uninitialized USB address.

(cherry picked from commit 05e149f94cbd34e4c3d4e9c7f6871e13cfe03d8c)
This commit is contained in:
Jiri Denemark 2013-11-14 12:02:40 +01:00 committed by Cole Robinson
parent 93ce06b707
commit e7e2720b37
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/qemu/qemu_hotplug.c
View File

@ -1134,6 +1134,7 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
int configfd = -1;
char *configfd_name = NULL;
bool releaseaddr = false;
bool teardowncgroup = false;
int backend = hostdev->source.subsys.u.pci.backend;
if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0)
@ -1170,6 +1171,10 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
break;
}
if (qemuSetupHostdevCGroup(vm, hostdev) < 0)
goto error;
teardowncgroup = true;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0)
goto error;
@ -1225,6 +1230,9 @@ int qemuDomainAttachHostPciDevice(virQEMUDriverPtr driver,
return 0;
error:
if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0)
VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail");
if (releaseaddr)
qemuDomainReleaseDeviceAddress(vm, hostdev->info, NULL);
@ -1417,6 +1425,7 @@ int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver,
virUSBDevicePtr usb = NULL;
char *devstr = NULL;
bool added = false;
bool teardowncgroup = false;
int ret = -1;
if (qemuFindHostdevUSBDevice(hostdev, true, &usb) < 0)
@ -1434,6 +1443,10 @@ int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver,
added = true;
virUSBDeviceListSteal(list, usb);
if (qemuSetupHostdevCGroup(vm, hostdev) < 0)
goto cleanup;
teardowncgroup = true;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) {
if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0)
goto cleanup;
@ -1460,6 +1473,10 @@ int qemuDomainAttachHostUsbDevice(virQEMUDriverPtr driver,
ret = 0;
cleanup:
if (ret < 0 &&
teardowncgroup &&
qemuTeardownHostdevCgroup(vm, hostdev) < 0)
VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail");
if (added)
virUSBDeviceListSteal(driver->activeUsbHostdevs, usb);
virUSBDeviceFree(usb);
@ -1477,6 +1494,7 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver,
qemuDomainObjPrivatePtr priv = vm->privateData;
char *devstr = NULL;
char *drvstr = NULL;
bool teardowncgroup = false;
if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DRIVE) ||
!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) ||
@ -1497,6 +1515,10 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver,
return -1;
}
if (qemuSetupHostdevCGroup(vm, hostdev) < 0)
goto cleanup;
teardowncgroup = true;
if (qemuAssignDeviceHostdevAlias(vm->def, hostdev, -1) < 0)
goto cleanup;
@ -1534,8 +1556,11 @@ qemuDomainAttachHostScsiDevice(virQEMUDriverPtr driver,
ret = 0;
cleanup:
if (ret < 0)
if (ret < 0) {
qemuDomainReAttachHostScsiDevices(driver, vm->def->name, &hostdev, 1);
if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0)
VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail");
}
VIR_FREE(drvstr);
VIR_FREE(devstr);
return ret;
@ -1552,12 +1577,9 @@ int qemuDomainAttachHostDevice(virQEMUDriverPtr driver,
return -1;
}
if (qemuSetupHostdevCGroup(vm, hostdev) < 0)
return -1;
if (virSecurityManagerSetHostdevLabel(driver->securityManager,
vm->def, hostdev, NULL) < 0)
goto cleanup;
return -1;
switch (hostdev->source.subsys.type) {
case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
@ -1591,10 +1613,6 @@ error:
if (virSecurityManagerRestoreHostdevLabel(driver->securityManager,
vm->def, hostdev, NULL) < 0)
VIR_WARN("Unable to restore host device labelling on hotplug fail");
cleanup:
if (qemuTeardownHostdevCgroup(vm, hostdev) < 0)
VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail");
return -1;
}