forked from rpms/libvirt
68 lines
2.6 KiB
Diff
68 lines
2.6 KiB
Diff
|
From 27ae8a1488afd910dccd1f76d1fa31a3c8560d04 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <27ae8a1488afd910dccd1f76d1fa31a3c8560d04@dist-git>
|
||
|
|
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
||
|
|
Date: Wed, 4 Mar 2020 12:42:36 +0100
|
||
|
|
Subject: [PATCH] qemuExtDevicesStart: pass logManager
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit b164eac5e1d4ebe17e673f0427b70f862a670f94)
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
||
|
|
Message-Id: <44ec9897e79f7482dc22611526a154915bb02cdb.1583322090.git.jtomko@redhat.com>
|
||
|
|
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_extdevice.c | 1 +
|
||
|
|
src/qemu/qemu_extdevice.h | 1 +
|
||
|
|
src/qemu/qemu_process.c | 4 +++-
|
||
|
|
3 files changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
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 a7bbab9e56..0476f18517 100644
|
||
|
|
--- a/src/qemu/qemu_process.c
|
||
|
|
+++ b/src/qemu/qemu_process.c
|
||
|
|
@@ -6705,7 +6705,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");
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|