|
 |
fbe740 |
From 27ae8a1488afd910dccd1f76d1fa31a3c8560d04 Mon Sep 17 00:00:00 2001
|
|
|
fbe740 |
Message-Id: <27ae8a1488afd910dccd1f76d1fa31a3c8560d04@dist-git>
|
|
|
fbe740 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
fbe740 |
Date: Wed, 4 Mar 2020 12:42:36 +0100
|
|
|
fbe740 |
Subject: [PATCH] qemuExtDevicesStart: pass logManager
|
|
|
fbe740 |
MIME-Version: 1.0
|
|
|
fbe740 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fbe740 |
Content-Transfer-Encoding: 8bit
|
|
|
fbe740 |
|
|
|
fbe740 |
Pass logManager to qemuExtDevicesStart for future usage.
|
|
|
fbe740 |
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
fbe740 |
Tested-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
fbe740 |
(cherry picked from commit b164eac5e1d4ebe17e673f0427b70f862a670f94)
|
|
|
fbe740 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
fbe740 |
https://bugzilla.redhat.com/show_bug.cgi?id=1694166
|
|
|
fbe740 |
Message-Id: <44ec9897e79f7482dc22611526a154915bb02cdb.1583322090.git.jtomko@redhat.com>
|
|
|
fbe740 |
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
fbe740 |
---
|
|
|
fbe740 |
src/qemu/qemu_extdevice.c | 1 +
|
|
|
fbe740 |
src/qemu/qemu_extdevice.h | 1 +
|
|
|
fbe740 |
src/qemu/qemu_process.c | 4 +++-
|
|
|
fbe740 |
3 files changed, 5 insertions(+), 1 deletion(-)
|
|
|
fbe740 |
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
index 9c0c0fd573..7f3bb104d9 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_extdevice.c
|
|
|
fbe740 |
@@ -153,6 +153,7 @@ qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
|
|
|
fbe740 |
int
|
|
|
fbe740 |
qemuExtDevicesStart(virQEMUDriverPtr driver,
|
|
|
fbe740 |
virDomainObjPtr vm,
|
|
|
fbe740 |
+ virLogManagerPtr logManager G_GNUC_UNUSED,
|
|
|
fbe740 |
bool incomingMigration)
|
|
|
fbe740 |
{
|
|
|
fbe740 |
virDomainDefPtr def = vm->def;
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h
|
|
|
fbe740 |
index 5cf777ab4b..df29968e16 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_extdevice.h
|
|
|
fbe740 |
+++ b/src/qemu/qemu_extdevice.h
|
|
|
fbe740 |
@@ -46,6 +46,7 @@ void qemuExtDevicesCleanupHost(virQEMUDriverPtr driver,
|
|
|
fbe740 |
|
|
|
fbe740 |
int qemuExtDevicesStart(virQEMUDriverPtr driver,
|
|
|
fbe740 |
virDomainObjPtr vm,
|
|
|
fbe740 |
+ virLogManagerPtr logManager,
|
|
|
fbe740 |
bool incomingMigration)
|
|
|
fbe740 |
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
|
|
|
fbe740 |
G_GNUC_WARN_UNUSED_RESULT;
|
|
|
fbe740 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
fbe740 |
index a7bbab9e56..0476f18517 100644
|
|
|
fbe740 |
--- a/src/qemu/qemu_process.c
|
|
|
fbe740 |
+++ b/src/qemu/qemu_process.c
|
|
|
fbe740 |
@@ -6705,7 +6705,9 @@ qemuProcessLaunch(virConnectPtr conn,
|
|
|
fbe740 |
if (qemuProcessGenID(vm, flags) < 0)
|
|
|
fbe740 |
goto cleanup;
|
|
|
fbe740 |
|
|
|
fbe740 |
- if (qemuExtDevicesStart(driver, vm, incoming != NULL) < 0)
|
|
|
fbe740 |
+ if (qemuExtDevicesStart(driver, vm,
|
|
|
fbe740 |
+ qemuDomainLogContextGetManager(logCtxt),
|
|
|
fbe740 |
+ incoming != NULL) < 0)
|
|
|
fbe740 |
goto cleanup;
|
|
|
fbe740 |
|
|
|
fbe740 |
VIR_DEBUG("Building emulator command line");
|
|
|
fbe740 |
--
|
|
|
fbe740 |
2.25.1
|
|
|
fbe740 |
|