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

qemu_cgroup: Kill qemuSetupHostSCSIVHostDeviceCgroup

Browse Source 
There's no need for this function. Currently it is passed as a
callback to virSCSIVHostDeviceFileIterate(). However, SCSI host
devices have just one file path. Therefore we can mimic approach
used in qemuDomainGetHostdevPath() to get path and call
virCgroupAllowDevicePath() directly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Michal Privoznik 2017-02-09 10:30:23 +01:00
parent 7bb01ed3cd
commit 60ddceff8f
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/qemu/qemu_cgroup.c
View File

@ -260,25 +260,6 @@ qemuSetupInputCgroup(virDomainObjPtr vm,
} }
static int
qemuSetupHostSCSIVHostDeviceCgroup(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED,
const char *path,
void *opaque)
{
virDomainObjPtr vm = opaque;
qemuDomainObjPrivatePtr priv = vm->privateData;
int ret;
VIR_DEBUG("Process path '%s' for scsi_host device", path);
ret = virCgroupAllowDevicePath(priv->cgroup, path,
VIR_CGROUP_DEVICE_RW, false);
virDomainAuditCgroupPath(vm, priv->cgroup, "allow", path, "rw", ret == 0);
return ret;
}
int int
qemuSetupHostdevCgroup(virDomainObjPtr vm, qemuSetupHostdevCgroup(virDomainObjPtr vm,
virDomainHostdevDefPtr dev) virDomainHostdevDefPtr dev)
@ -397,9 +378,17 @@ qemuSetupHostdevCgroup(virDomainObjPtr vm,
if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn))) if (!(host = virSCSIVHostDeviceNew(hostsrc->wwpn)))
goto cleanup; goto cleanup;
if (virSCSIVHostDeviceFileIterate(host, if (VIR_STRDUP(path, virSCSIVHostDeviceGetPath(host)) < 0)
qemuSetupHostSCSIVHostDeviceCgroup, goto cleanup;
vm) < 0)
VIR_DEBUG("Process path '%s' for scsi_host device", path);
rv = virCgroupAllowDevicePath(priv->cgroup, path,
VIR_CGROUP_DEVICE_RW, false);
virDomainAuditCgroupPath(vm, priv->cgroup,
"allow", path, "rw", rv == 0);
if (rv < 0)
goto cleanup; goto cleanup;
} }
break; break;