From 90200667b975e5dafadcc854dcd222535a74cedb Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 17 Sep 2019 10:39:00 +0200 Subject: [PATCH] qemu_cgroup: Teardown Cgroup for more host device types Since its introduction in v1.0.5-rc1-19-g6e13860cb4 the qemuTeardownHostdevCgroup() does nothing unless the passed hostdev is a PCI device with VFIO backend. This seems unnecessary. Signed-off-by: Michal Privoznik Reviewed-by: Cole Robinson --- src/qemu/qemu_cgroup.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b0e1bcab76..f8bb270117 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -405,16 +405,10 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm, size_t i, npaths = 0; int rv, ret = -1; - /* currently this only does something for PCI devices using vfio - * for device assignment, but it is called for *all* hostdev - * devices. - */ - if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES)) return 0; - if (virHostdevIsVFIODevice(dev) && - qemuDomainGetHostdevPath(vm->def, dev, true, + if (qemuDomainGetHostdevPath(vm->def, dev, true, &npaths, &path, NULL) < 0) goto cleanup;