From nobody Sun Feb 8 07:15:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1585671897; cv=none; d=zohomail.com; s=zohoarc; b=CzoXlFN9ApoyZBeLRcAAu+ElThGi5SbL288mBnghTGfnxwDKFhQjGz1yRGJGeBWyUVM+2ZH+kJy80s6wCxNv5ro+ML/0C7OFKMdI8B83tz3PwXEx6Ie5KWiVrj36fCJQPqbHWBWnvSiq9NioKvQDnHbP0p9roG3dZy86QdRT/jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585671897; 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; bh=JemBQcetzOvfmeW8jtmuj32SdcvWNb7pr9ycknNIKTU=; b=e0NyVKLDmxv7qnPOz6R5/j7ozv1nYtYT426nD+cmSR8efzyjX/vggaYR0OLfxab69SUU/RJOxARbhlwCNd5l6RsjHGFYuShQcVgq/z1QYGEAQYNyZeHFEBzG77YFGAV10AxDln3uuc5tQsQi1Y6sqnmTmpVAz9Tcr5F01PYa0DQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 158567189788292.49842839230257; Tue, 31 Mar 2020 09:24:57 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-352-8mxLnizfMICQhcSvQpCQ3Q-1; Tue, 31 Mar 2020 12:24:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87A48801E77; Tue, 31 Mar 2020 16:24:48 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5DFAB60C05; Tue, 31 Mar 2020 16:24:48 +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 1996818089CF; Tue, 31 Mar 2020 16:24:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02VGOaIC023039 for ; Tue, 31 Mar 2020 12:24:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0455A5D9E2; Tue, 31 Mar 2020 16:24:36 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.195.155]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C3A65D9C5 for ; Tue, 31 Mar 2020 16:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585671896; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=JemBQcetzOvfmeW8jtmuj32SdcvWNb7pr9ycknNIKTU=; b=VJPaKhLa5gcAxWaA4McEc43tV43xc8h+IiF5+v58v8fEcJB36NUJdkXUK/zJovXOM64rfz tnZqwVqSqy6S50tAftX0RtZKSP5rEo0eLv1QpRoaVKit2R7WUDzatz8kXViPDDdbFOgKfO ihjGnLjEjVRgQI7DdZButuJzwxdl71s= X-MC-Unique: 8mxLnizfMICQhcSvQpCQ3Q-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH v3 02/10] qemu: Drop virQEMUDriverIsPrivileged() Date: Tue, 31 Mar 2020 18:24:14 +0200 Message-Id: <83bf2292fa463596c6efa089611efa7c7c8de160.1585671623.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Introduced in v1.2.17-rc1~121, the assumption was that the driver->privileged is immutable at the time but it might change in the future. Well, it did not ever since. It is still immutable variable. Drop the needless accessor then. Signed-off-by: Michal Privoznik --- src/qemu/qemu_cgroup.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_conf.c | 6 ------ src/qemu/qemu_conf.h | 1 - src/qemu/qemu_domain.c | 12 ++++++------ src/qemu/qemu_driver.c | 22 +++++++++++----------- src/qemu/qemu_interface.c | 6 +++--- 7 files changed, 24 insertions(+), 31 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index c0e30f6152..f1564141b6 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -926,7 +926,7 @@ qemuInitCgroup(virDomainObjPtr vm, qemuDomainObjPrivatePtr priv =3D vm->privateData; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); =20 - if (!virQEMUDriverIsPrivileged(priv->driver)) + if (!priv->driver->privileged) goto done; =20 if (!virCgroupAvailable()) @@ -1061,7 +1061,7 @@ qemuConnectCgroup(virDomainObjPtr vm) virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); int ret =3D -1; =20 - if (!virQEMUDriverIsPrivileged(priv->driver)) + if (!priv->driver->privileged) goto done; =20 if (!virCgroupAvailable()) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d1b689dfd3..9a0a96bdea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8102,7 +8102,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, /* network and bridge use a tap device, and direct uses a * macvtap device */ - if (virQEMUDriverIsPrivileged(driver) && nicindexes && nnicindexes= && + if (driver->privileged && nicindexes && nnicindexes && net->ifname) { if (virNetDevGetIndex(net->ifname, &nicindex) < 0 || VIR_APPEND_ELEMENT(*nicindexes, *nnicindexes, nicindex) < = 0) @@ -9642,7 +9642,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, int spice =3D 0; int egl_headless =3D 0; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { /* If we have no cgroups then we can have no tunings that * require them */ =20 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 15837cece4..5ac316ec77 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1224,12 +1224,6 @@ virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEM= UDriverPtr driver) return conf; } =20 -bool -virQEMUDriverIsPrivileged(virQEMUDriverPtr driver) -{ - return driver->privileged; -} - virDomainXMLOptionPtr virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver, const char *defsecmodel) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 14f9b9e81e..10bc7e4a52 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -333,7 +333,6 @@ int virQEMUDriverConfigSetDefaults(virQEMUDriverConfigPtr cfg); =20 virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver); -bool virQEMUDriverIsPrivileged(virQEMUDriverPtr driver); =20 virCapsHostNUMAPtr virQEMUDriverGetHostNUMACaps(virQEMUDriverPtr driver); virCPUDefPtr virQEMUDriverGetHostCPU(virQEMUDriverPtr driver); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dd48b6fff3..e54eeae58f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8600,7 +8600,7 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs, return -1; =20 case VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS: - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("virtiofs is not yet supported in session mod= e")); return -1; @@ -10718,7 +10718,7 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr drive= r, qemuDomainObjPrivatePtr priv =3D obj->privateData; bool custom_hypervisor_feat =3D false; =20 - if (virQEMUDriverIsPrivileged(driver) && + if (driver->privileged && (cfg->user =3D=3D 0 || cfg->group =3D=3D 0)) qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HIGH_PRIVILEGES, = logCtxt); @@ -10817,7 +10817,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, ctxt->path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name= ); =20 if (cfg->stdioLogD) { - ctxt->manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)); + ctxt->manager =3D virLogManagerNew(driver->privileged); if (!ctxt->manager) goto error; =20 @@ -10847,7 +10847,7 @@ qemuDomainLogContextPtr qemuDomainLogContextNew(vir= QEMUDriverPtr driver, * we can't rely on logrotate. We don't use O_TRUNC since * it is better for SELinux policy if we truncate afterwards */ if (mode =3D=3D QEMU_DOMAIN_LOG_CONTEXT_MODE_START && - !virQEMUDriverIsPrivileged(driver) && + !driver->privileged && ftruncate(ctxt->writefd, 0) < 0) { virReportSystemError(errno, _("failed to truncate %s"), ctxt->path); @@ -10991,7 +10991,7 @@ qemuDomainLogAppendMessage(virQEMUDriverPtr driver, path =3D g_strdup_printf("%s/%s.log", cfg->logDir, vm->def->name); =20 if (cfg->stdioLogD) { - if (!(manager =3D virLogManagerNew(virQEMUDriverIsPrivileged(drive= r)))) + if (!(manager =3D virLogManagerNew(driver->privileged))) goto cleanup; =20 if (virLogManagerDomainAppendMessage(manager, "qemu", vm->def->uui= d, @@ -16546,7 +16546,7 @@ qemuDomainGetMachineName(virDomainObjPtr vm) if (!ret) ret =3D virDomainGenerateMachineName("qemu", cfg->root, vm->def->id, vm->def->name, - virQEMUDriverIsPrivileged(drive= r)); + driver->privileged); =20 return ret; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 78024614cf..49dcd0e82d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -307,7 +307,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) flags |=3D VIR_SECURITY_MANAGER_DEFAULT_CONFINED; if (cfg->securityRequireConfined) flags |=3D VIR_SECURITY_MANAGER_REQUIRE_CONFINED; - if (virQEMUDriverIsPrivileged(driver)) + if (driver->privileged) flags |=3D VIR_SECURITY_MANAGER_PRIVILEGED; =20 if (cfg->securityDriverNames && @@ -338,7 +338,7 @@ qemuSecurityInit(virQEMUDriverPtr driver) mgr =3D NULL; } =20 - if (virQEMUDriverIsPrivileged(driver)) { + if (driver->privileged) { if (cfg->dynamicOwnership) flags |=3D VIR_SECURITY_MANAGER_DYNAMIC_OWNERSHIP; if (virBitmapIsBitSet(cfg->namespaces, QEMU_DOMAIN_NS_MOUNT)) @@ -1204,7 +1204,7 @@ static virDrvOpenStatus qemuConnectOpen(virConnectPtr= conn, } else { if (!virConnectValidateURIPath(conn->uri->path, "qemu", - virQEMUDriverIsPrivileged(qemu_driv= er))) + qemu_driver->privileged)) return VIR_DRV_OPEN_ERROR; } =20 @@ -9279,7 +9279,7 @@ static char *qemuDomainGetSchedulerType(virDomainPtr = dom, if (virDomainGetSchedulerTypeEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("CPU tuning is not available in session mode")); goto cleanup; @@ -9355,7 +9355,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, if (virDomainSetBlkioParametersEnsureACL(dom->conn, vm->def, flags) < = 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Block I/O tuning is not available in session mod= e")); goto cleanup; @@ -9435,7 +9435,7 @@ qemuDomainGetBlkioParameters(virDomainPtr dom, if (virDomainGetBlkioParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Block I/O tuning is not available in session mod= e")); goto cleanup; @@ -9531,7 +9531,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, if (virDomainSetMemoryParametersEnsureACL(dom->conn, vm->def, flags) <= 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")= ); goto cleanup; @@ -9607,7 +9607,7 @@ qemuDomainGetMemoryParameters(virDomainPtr dom, if (virDomainGetMemoryParametersEnsureACL(dom->conn, vm->def) < 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("Memory tuning is not available in session mode")= ); goto cleanup; @@ -9794,7 +9794,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, goto endjob; =20 if (def) { - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("NUMA tuning is not available in session mode= ")); goto endjob; @@ -10268,7 +10268,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr = dom, if (virDomainSetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def, = flags) < 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available in session mode")); goto cleanup; @@ -10675,7 +10675,7 @@ qemuDomainGetSchedulerParametersFlags(virDomainPtr = dom, if (virDomainGetSchedulerParametersFlagsEnsureACL(dom->conn, vm->def) = < 0) goto cleanup; =20 - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("CPU tuning is not available in session mode")); goto cleanup; diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 2b24c73d65..ffec992596 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -410,7 +410,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def, =20 if (net->backend.tap) { tunpath =3D net->backend.tap; - if (!virQEMUDriverIsPrivileged(driver)) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("cannot use custom tap device in session mode= ")); goto cleanup; @@ -538,7 +538,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, =20 if (net->backend.tap) { tunpath =3D net->backend.tap; - if (!(virQEMUDriverIsPrivileged(driver))) { + if (!driver->privileged) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("cannot use custom tap device in session mode= ")); goto cleanup; @@ -562,7 +562,7 @@ qemuInterfaceBridgeConnect(virDomainDefPtr def, if (virDomainNetIsVirtioModel(net)) tap_create_flags |=3D VIR_NETDEV_TAP_CREATE_VNET_HDR; =20 - if (virQEMUDriverIsPrivileged(driver)) { + if (driver->privileged) { if (virNetDevTapCreateInBridgePort(brname, &net->ifname, &net->mac, def->uuid, tunpath, tapfd, *tap= fdSize, virDomainNetGetActualVirtPortPr= ofile(net), --=20 2.24.1