From adeec11ba7453bf483a9a934c72a001cb081860b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 13 Dec 2021 12:17:14 +0100 Subject: [PATCH] qemuProcessPrepareHost: Create domain private dirs as early as possible MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As of ff024b60cc3 we are opening chardevs before starting QEMU. However, we are also doing that before domain private directories are created. This leaves us unable to create guest agent socket which lives under priv->channelTargetDir. While creating the dirs can be moved just before qemuProcessPrepareHostBackendChardev() it's better to do it as the very first step so that this kind of error is prevented in future. Fixes: ff024b60cc39d5d41b1e68728a00a47e103ec4dd Signed-off-by: Michal Privoznik Reviewed-by: Ján Tomko Reviewed-by: Martin Kletzander --- src/qemu/qemu_process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4963ce383f..82d0af5549 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7024,6 +7024,14 @@ qemuProcessPrepareHost(virQEMUDriver *driver, qemuDomainObjPrivate *priv = vm->privateData; g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver); + /* + * Create all per-domain directories in order to make sure domain + * with any possible seclabels can access it. + */ + if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || + qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) + return -1; + if (qemuPrepareNVRAM(driver, vm) < 0) return -1; @@ -7085,14 +7093,6 @@ qemuProcessPrepareHost(virQEMUDriver *driver, return -1; } - /* - * Create all per-domain directories in order to make sure domain - * with any possible seclabels can access it. - */ - if (qemuProcessMakeDir(driver, vm, priv->libDir) < 0 || - qemuProcessMakeDir(driver, vm, priv->channelTargetDir) < 0) - return -1; - VIR_DEBUG("Write domain masterKey"); if (qemuDomainWriteMasterKeyFile(driver, vm) < 0) return -1; -- 2.39.5