External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu-dbus: register DBus bus to the VM cgroup

Browse Source 
External devices are started before cgroup is created. Add the DBus
daemon to the VM cgroup with the rest of the external devices.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Marc-André Lureau 2020-04-08 19:23:50 +02:00 committed by Michal Privoznik
parent 5f56cb8bc8
commit 8e1ac0d384
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/qemu/qemu_dbus.c
View File

@ -156,6 +156,30 @@ qemuDBusStop(virQEMUDriverPtr driver,
}
int
qemuDBusSetupCgroup(virQEMUDriverPtr driver,
virDomainObjPtr vm)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
qemuDomainObjPrivatePtr priv = vm->privateData;
g_autofree char *shortName = NULL;
g_autofree char *pidfile = NULL;
pid_t cpid = -1;
if (!priv->dbusDaemonRunning)
return 0;
if (!(shortName = virDomainDefGetShortName(vm->def)))
return -1;
pidfile = qemuDBusCreatePidFilename(cfg, shortName);
if (virPidFileReadPath(pidfile, &cpid) < 0) {
VIR_WARN("Unable to get DBus PID");
return -1;
}
return virCgroupAddProcess(priv->cgroup, cpid);
}
int
qemuDBusStart(virQEMUDriverPtr driver,
virDomainObjPtr vm)

3
src/qemu/qemu_dbus.h
View File

@ -35,3 +35,6 @@ void qemuDBusStop(virQEMUDriverPtr driver,
int qemuDBusVMStateAdd(virDomainObjPtr vm, const char *id);
void qemuDBusVMStateRemove(virDomainObjPtr vm, const char *id);
int qemuDBusSetupCgroup(virQEMUDriverPtr driver,
virDomainObjPtr vm);

4
src/qemu/qemu_extdevice.c
View File

@ -23,6 +23,7 @@
#include "qemu_command.h"
#include "qemu_extdevice.h"
#include "qemu_vhost_user_gpu.h"
#include "qemu_dbus.h"
#include "qemu_domain.h"
#include "qemu_tpm.h"
#include "qemu_slirp.h"
@ -276,6 +277,9 @@ qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
virDomainDefPtr def = vm->def;
size_t i;
if (qemuDBusSetupCgroup(driver, vm) < 0)
return -1;
for (i = 0; i < def->nvideos; i++) {
virDomainVideoDefPtr video = def->videos[i];