From nobody Sun Feb 8 07:08:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1558095918; cv=none; d=zoho.com; s=zohoarc; b=PFXufvAOO4FxOto8aQr7+xRAT2XR02fVkNbBv8xeYdF0nLesBkQmY83+JlC4kPT9TnwoAx5oaS97RFJ/jFRMrZm94fqOeq1kibCQ6NwuwOPGzdPppQWKaemvI8NuB5W6kPMi6WOAbmTBUNh8QlJmNuMpWnkMC41iFgmErR9bd7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558095918; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NATyxu3FKN40+EPlGOBpmD0dyJbtUT5rk1p/oSwAq20=; b=BxMm1yGa8HX6W0dRtq7hbTN8PNmknwaJgCJFInJtbDtrufVlU0ECHWewh/G9ZT2JymsuCwU0QexqZrUUZuinxZwAoXIt/9MiqcMiGs5Q0TGmivcjfqGrSO+/OgTm2eif79KllQHc3RwdudKJQ0AlkvEljIRoCkrVnTev0CLEzAM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 155809591896110.387060683427762; Fri, 17 May 2019 05:25:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A49F81F18; Fri, 17 May 2019 12:25:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 044BF6C349; Fri, 17 May 2019 12:25:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id ADB7D206D9; Fri, 17 May 2019 12:25:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x4HCPAp7014262 for ; Fri, 17 May 2019 08:25:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F2B25D784; Fri, 17 May 2019 12:25:10 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-54.ams2.redhat.com [10.36.112.54]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0D6585D6A9; Fri, 17 May 2019 12:25:08 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 17 May 2019 13:24:55 +0100 Message-Id: <20190517122457.26291-4-berrange@redhat.com> In-Reply-To: <20190517122457.26291-1-berrange@redhat.com> References: <20190517122457.26291-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 3/5] qemu: honour the root parameter during driver initialization X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 17 May 2019 12:25:17 +0000 (UTC) Signed-off-by: Daniel P. Berrang=C3=A9 --- src/qemu/qemu_conf.c | 41 ++++++++++++++++++++++++++--------------- src/qemu/qemu_conf.h | 3 ++- src/qemu/qemu_driver.c | 2 +- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index daea11dacb..35ecb19b29 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -123,7 +123,8 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr d= ef) #endif =20 =20 -virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) +virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, + const char *root) { virQEMUDriverConfigPtr cfg; =20 @@ -150,30 +151,31 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) =20 if (privileged) { if (virAsprintf(&cfg->logDir, - "%s/log/libvirt/qemu", LOCALSTATEDIR) < 0) + "%s%s/log/libvirt/qemu", root, LOCALSTATEDIR) < 0) goto error; =20 if (virAsprintf(&cfg->swtpmLogDir, - "%s/log/swtpm/libvirt/qemu", LOCALSTATEDIR) < 0) + "%s%s/log/swtpm/libvirt/qemu", root, LOCALSTATEDIR= ) < 0) goto error; =20 - if (VIR_STRDUP(cfg->configBaseDir, SYSCONFDIR "/libvirt") < 0) + if (virAsprintf(&cfg->configBaseDir, + "%s%s/libvirt", root, SYSCONFDIR) < 0) goto error; =20 if (virAsprintf(&cfg->stateDir, - "%s/run/libvirt/qemu", LOCALSTATEDIR) < 0) + "%s%s/run/libvirt/qemu", root, LOCALSTATEDIR) < 0) goto error; =20 if (virAsprintf(&cfg->swtpmStateDir, - "%s/run/libvirt/qemu/swtpm", LOCALSTATEDIR) < 0) + "%s%s/run/libvirt/qemu/swtpm", root, LOCALSTATEDIR= ) < 0) goto error; =20 if (virAsprintf(&cfg->cacheDir, - "%s/cache/libvirt/qemu", LOCALSTATEDIR) < 0) + "%s%s/cache/libvirt/qemu", root, LOCALSTATEDIR) < = 0) goto error; =20 if (virAsprintf(&cfg->libDir, - "%s/lib/libvirt/qemu", LOCALSTATEDIR) < 0) + "%s%s/lib/libvirt/qemu", root, LOCALSTATEDIR) < 0) goto error; if (virAsprintf(&cfg->saveDir, "%s/save", cfg->libDir) < 0) goto error; @@ -188,8 +190,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool priv= ileged) goto error; if (virAsprintf(&cfg->memoryBackingDir, "%s/ram", cfg->libDir) < 0) goto error; - if (virAsprintf(&cfg->swtpmStorageDir, "%s/lib/libvirt/swtpm", - LOCALSTATEDIR) < 0) + if (virAsprintf(&cfg->swtpmStorageDir, "%s%s/lib/libvirt/swtpm", + root, LOCALSTATEDIR) < 0) goto error; if (!virDoesUserExist("tss") || virGetUserID("tss", &cfg->swtpm_user) < 0) @@ -200,22 +202,23 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pr= ivileged) } else { char *rundir; char *cachedir; + char *cfgdir; =20 cachedir =3D virGetUserCacheDirectory(); if (!cachedir) goto error; =20 if (virAsprintf(&cfg->logDir, - "%s/qemu/log", cachedir) < 0) { + "%s%s/qemu/log", root, cachedir) < 0) { VIR_FREE(cachedir); goto error; } if (virAsprintf(&cfg->swtpmLogDir, - "%s/qemu/log", cachedir) < 0) { + "%s%s/qemu/log", root, cachedir) < 0) { VIR_FREE(cachedir); goto error; } - if (virAsprintf(&cfg->cacheDir, "%s/qemu/cache", cachedir) < 0) { + if (virAsprintf(&cfg->cacheDir, "%s%s/qemu/cache", root, cachedir)= < 0) { VIR_FREE(cachedir); goto error; } @@ -224,7 +227,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool priv= ileged) rundir =3D virGetUserRuntimeDirectory(); if (!rundir) goto error; - if (virAsprintf(&cfg->stateDir, "%s/qemu/run", rundir) < 0) { + if (virAsprintf(&cfg->stateDir, "%s%s/qemu/run", root, rundir) < 0= ) { VIR_FREE(rundir); goto error; } @@ -233,9 +236,16 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool pri= vileged) if (virAsprintf(&cfg->swtpmStateDir, "%s/swtpm", cfg->stateDir) < = 0) goto error; =20 - if (!(cfg->configBaseDir =3D virGetUserConfigDirectory())) + cfgdir =3D virGetUserConfigDirectory(); + if (!cfgdir) goto error; =20 + if (virAsprintf(&cfg->configBaseDir, "%s%s", root, cfgdir) < 0) { + VIR_FREE(cfgdir); + goto error; + } + VIR_FREE(cfgdir); + if (virAsprintf(&cfg->libDir, "%s/qemu/lib", cfg->configBaseDir) <= 0) goto error; if (virAsprintf(&cfg->saveDir, "%s/qemu/save", cfg->configBaseDir)= < 0) @@ -267,6 +277,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool priv= ileged) * This will then be used as a fallback if the service specific * directory doesn't exist (although we don't check if this exists). */ + // XXX root ? if (VIR_STRDUP(cfg->defaultTLSx509certdir, SYSCONFDIR "/pki/qemu") < 0) goto error; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 983e74a3cf..f93b09c4fe 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -312,7 +312,8 @@ struct _qemuDomainCmdlineDef { =20 void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); =20 -virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged); +virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged, + const char *root); =20 int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, const char *filename, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 659d7b89e1..019f6b2bf3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -613,7 +613,7 @@ qemuStateInitialize(bool privileged, if (privileged) qemu_driver->hostsysinfo =3D virSysinfoRead(); =20 - if (!(qemu_driver->config =3D cfg =3D virQEMUDriverConfigNew(privilege= d))) + if (!(qemu_driver->config =3D cfg =3D virQEMUDriverConfigNew(privilege= d, root))) goto error; =20 if (virAsprintf(&driverConf, "%s/qemu.conf", cfg->configBaseDir) < 0) --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list