forked from rpms/libvirt
65 lines
2.1 KiB
Diff
65 lines
2.1 KiB
Diff
|
From 99f69000a1ecacc2f064043993ece8ddba366976 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <99f69000a1ecacc2f064043993ece8ddba366976@dist-git>
|
||
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Date: Tue, 7 Feb 2023 10:34:40 +0100
|
||
|
|
Subject: [PATCH] qemu_process: Produce better debug message wrt domain
|
||
|
|
namespaces
|
||
|
|
|
||
|
|
When going through debug log of a domain startup process, one can
|
||
|
|
meet the following line:
|
||
|
|
|
||
|
|
debug : qemuProcessLaunch:7668 : Building mount namespace
|
||
|
|
|
||
|
|
But this is in fact wrong. Firstly, domain namespaces are just
|
||
|
|
enabled in domain's privateData. Secondly, the debug message says
|
||
|
|
nothing about actual state of namespace - whether it was enabled
|
||
|
|
or not.
|
||
|
|
|
||
|
|
Therefore, move the debug printing into
|
||
|
|
qemuProcessEnableDomainNamespaces() and tweak it so that the
|
||
|
|
actual value is reflected.
|
||
|
|
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
|
||
|
|
(cherry picked from commit 697c16e39ae9a9e18ce7cad0729bf2293b12a307)
|
||
|
|
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2167302
|
||
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_process.c | 8 ++++++--
|
||
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
||
|
|
index 1217fb1856..32083de563 100644
|
||
|
|
--- a/src/qemu/qemu_process.c
|
||
|
|
+++ b/src/qemu/qemu_process.c
|
||
|
|
@@ -7377,11 +7377,17 @@ qemuProcessEnableDomainNamespaces(virQEMUDriver *driver,
|
||
|
|
virDomainObj *vm)
|
||
|
|
{
|
||
|
|
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
|
||
|
|
+ const char *state = "disabled";
|
||
|
|
|
||
|
|
if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT) &&
|
||
|
|
qemuDomainEnableNamespace(vm, QEMU_DOMAIN_NS_MOUNT) < 0)
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
+ if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
|
||
|
|
+ state = "enabled";
|
||
|
|
+
|
||
|
|
+ VIR_DEBUG("Mount namespace for domain name=%s is %s",
|
||
|
|
+ vm->def->name, state);
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -7705,8 +7711,6 @@ qemuProcessLaunch(virConnectPtr conn,
|
||
|
|
|
||
|
|
qemuDomainLogContextMarkPosition(logCtxt);
|
||
|
|
|
||
|
|
- VIR_DEBUG("Building mount namespace");
|
||
|
|
-
|
||
|
|
if (qemuProcessEnableDomainNamespaces(driver, vm) < 0)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.1
|
||
|
|
|