NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Process the hostdev "rawio" setting

Browse Source 
Mimic the "Disk" processing for 'rawio', but for a scsi_host hostdev
lun device.
This commit is contained in:
John Ferlan 2014-09-09 18:51:02 -04:00
parent 58abf1bb36
commit 74eaa0918b
4 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu/qemu_domain.c
View File

@ -1926,6 +1926,10 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
for (i = 0; i < obj->def->ndisks; i++) for (i = 0; i < obj->def->ndisks; i++)
qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logFD); qemuDomainObjCheckDiskTaint(driver, obj, obj->def->disks[i], logFD);
for (i = 0; i < obj->def->nhostdevs; i++)
qemuDomainObjCheckHostdevTaint(driver, obj, obj->def->hostdevs[i],
logFD);
for (i = 0; i < obj->def->nnets; i++) for (i = 0; i < obj->def->nnets; i++)
qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD); qemuDomainObjCheckNetTaint(driver, obj, obj->def->nets[i], logFD);
@ -1953,6 +1957,20 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver,
} }
void qemuDomainObjCheckHostdevTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj,
virDomainHostdevDefPtr hostdev,
int logFD)
{
virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
if (hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
scsisrc->rawio == VIR_TRISTATE_BOOL_YES)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES,
logFD);
}
void qemuDomainObjCheckNetTaint(virQEMUDriverPtr driver, void qemuDomainObjCheckNetTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj, virDomainObjPtr obj,
virDomainNetDefPtr net, virDomainNetDefPtr net,

4
src/qemu/qemu_domain.h
View File

@ -301,6 +301,10 @@ void qemuDomainObjCheckDiskTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj, virDomainObjPtr obj,
virDomainDiskDefPtr disk, virDomainDiskDefPtr disk,
int logFD); int logFD);
void qemuDomainObjCheckHostdevTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj,
virDomainHostdevDefPtr disk,
int logFD);
void qemuDomainObjCheckNetTaint(virQEMUDriverPtr driver, void qemuDomainObjCheckNetTaint(virQEMUDriverPtr driver,
virDomainObjPtr obj, virDomainObjPtr obj,
virDomainNetDefPtr net, virDomainNetDefPtr net,

1
src/qemu/qemu_driver.c
View File

@ -6581,6 +6581,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm,
break; break;
case VIR_DOMAIN_DEVICE_HOSTDEV: case VIR_DOMAIN_DEVICE_HOSTDEV:
qemuDomainObjCheckHostdevTaint(driver, vm, dev->data.hostdev, -1);
ret = qemuDomainAttachHostDevice(dom->conn, driver, vm, ret = qemuDomainAttachHostDevice(dom->conn, driver, vm,
dev->data.hostdev); dev->data.hostdev);
if (!ret) if (!ret)

20
src/qemu/qemu_process.c
View File

@ -3983,6 +3983,7 @@ int qemuProcessStart(virConnectPtr conn,
struct qemuProcessHookData hookData; struct qemuProcessHookData hookData;
unsigned long cur_balloon; unsigned long cur_balloon;
size_t i; size_t i;
bool rawio_set = false;
char *nodeset = NULL; char *nodeset = NULL;
virBitmapPtr nodemask = NULL; virBitmapPtr nodemask = NULL;
unsigned int stop_flags; unsigned int stop_flags;
@ -4360,6 +4361,7 @@ int qemuProcessStart(virConnectPtr conn,
if (vm->def->disks[i]->rawio == VIR_TRISTATE_BOOL_YES) { if (vm->def->disks[i]->rawio == VIR_TRISTATE_BOOL_YES) {
#ifdef CAP_SYS_RAWIO #ifdef CAP_SYS_RAWIO
virCommandAllowCap(cmd, CAP_SYS_RAWIO); virCommandAllowCap(cmd, CAP_SYS_RAWIO);
rawio_set = true;
#else #else
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Raw I/O is not supported on this platform")); _("Raw I/O is not supported on this platform"));
@ -4376,6 +4378,24 @@ int qemuProcessStart(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
/* If rawio not already set, check hostdevs as well */
if (!rawio_set) {
for (i = 0; i < vm->def->nhostdevs; i++) {
virDomainHostdevSubsysSCSIPtr scsisrc =
&vm->def->hostdevs[i]->source.subsys.u.scsi;
if (scsisrc->rawio == VIR_TRISTATE_BOOL_YES) {
#ifdef CAP_SYS_RAWIO
virCommandAllowCap(cmd, CAP_SYS_RAWIO);
break;
#else
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Raw I/O is not supported on this platform"));
goto cleanup;
#endif
}
}
}
virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData); virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData);
virCommandSetMaxProcesses(cmd, cfg->maxProcesses); virCommandSetMaxProcesses(cmd, cfg->maxProcesses);
virCommandSetMaxFiles(cmd, cfg->maxFiles); virCommandSetMaxFiles(cmd, cfg->maxFiles);