From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 26 Feb 2020 11:45:02 +0000 (+0100)
Subject: qemu: pass virDomainObjPtr to qemuExtDevicesSetupCgroup
X-Git-Tag: v6.2.0-rc1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6baf97ef2c7416f3d81bdc6cf20f121b62c8fd4f;p=thirdparty%2Flibvirt.git

qemu: pass virDomainObjPtr to qemuExtDevicesSetupCgroup

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Tested-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index d550d4f58a..c0e30f6152 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -1165,7 +1165,7 @@ qemuSetupCgroupForExtDevices(virDomainObjPtr vm,
                            false, &cgroup_temp) < 0)
         goto cleanup;
 
-    ret = qemuExtDevicesSetupCgroup(driver, vm->def, cgroup_temp);
+    ret = qemuExtDevicesSetupCgroup(driver, vm, cgroup_temp);
 
  cleanup:
     virCgroupFree(&cgroup_temp);
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 7f3bb104d9..bb73787b8d 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -236,9 +236,10 @@ qemuExtDevicesHasDevice(virDomainDefPtr def)
 
 int
 qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
-                          virDomainDefPtr def,
+                          virDomainObjPtr vm,
                           virCgroupPtr cgroup)
 {
+    virDomainDefPtr def = vm->def;
     size_t i;
 
     for (i = 0; i < def->nvideos; i++) {
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index df29968e16..49373a15a1 100644
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -58,5 +58,5 @@ void qemuExtDevicesStop(virQEMUDriverPtr driver,
 bool qemuExtDevicesHasDevice(virDomainDefPtr def);
 
 int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver,
-                              virDomainDefPtr def,
+                              virDomainObjPtr vm,
                               virCgroupPtr cgroup);