From: Ján Tomko <jtomko@redhat.com>
Date: Sat, 25 Jan 2020 17:35:13 +0000 (+0100)
Subject: qemuExtDevicesStart: pass logManager
X-Git-Tag: v6.2.0-rc1~307
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b164eac5e1d4ebe17e673f0427b70f862a670f94;p=thirdparty%2Flibvirt.git

qemuExtDevicesStart: pass logManager

Pass logManager to qemuExtDevicesStart for future usage.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Andrea Bolognani <abologna@redhat.com>
---

diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
index 9c0c0fd573..7f3bb104d9 100644
--- a/src/qemu/qemu_extdevice.c
+++ b/src/qemu/qemu_extdevice.c
@@ -153,6 +153,7 @@ qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
 int
 qemuExtDevicesStart(virQEMUDriverPtr driver,
                     virDomainObjPtr vm,
+                    virLogManagerPtr logManager G_GNUC_UNUSED,
                     bool incomingMigration)
 {
     virDomainDefPtr def = vm->def;
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
index 5cf777ab4b..df29968e16 100644
--- a/src/qemu/qemu_extdevice.h
+++ b/src/qemu/qemu_extdevice.h
@@ -46,6 +46,7 @@ void qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
 
 int qemuExtDevicesStart(virQEMUDriverPtr driver,
                         virDomainObjPtr vm,
+                        virLogManagerPtr logManager,
                         bool incomingMigration)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
     G_GNUC_WARN_UNUSED_RESULT;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d9035055e8..36fbffd7b8 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6735,7 +6735,9 @@ qemuProcessLaunch(virConnectPtr conn,
     if (qemuProcessGenID(vm, flags) < 0)
         goto cleanup;
 
-    if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0)
+    if (qemuExtDevicesStart(driver, vm,
+                            qemuDomainLogContextGetManager(logCtxt),
+                            incoming != NULL) < 0)
         goto cleanup;
 
     VIR_DEBUG("Building emulator command line");