[PATCH 08/10] lxcProcessAutoDestroy: Use 'driver' from VM private data

Peter Krempa pkrempa at redhat.com
Tue May 17 13:16:43 UTC 2022


Access the 'driver' struct from the private data rather than the passed
opaque pointer in preparation to remove the opaque pointer.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_process.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 0222e8a9b3..368adaea7e 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -63,15 +63,14 @@ VIR_LOG_INIT("lxc.lxc_process");
 static void
 lxcProcessAutoDestroy(virDomainObj *dom,
                       virConnectPtr conn,
-                      void *opaque)
+                      void *opaque G_GNUC_UNUSED)
 {
-    virLXCDriver *driver = opaque;
     virObjectEvent *event = NULL;
-    virLXCDomainObjPrivate *priv;
+    virLXCDomainObjPrivate *priv = dom->privateData;
+    virLXCDriver *driver = priv->driver;

     VIR_DEBUG("driver=%p dom=%s conn=%p", driver, dom->def->name, conn);

-    priv = dom->privateData;
     VIR_DEBUG("Killing domain");
     virLXCProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED);
     virDomainAuditStop(dom, "destroyed");
-- 
2.35.3



More information about the libvir-list mailing list