From nobody Mon Feb 9 04:45:44 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 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=1644422588; cv=none; d=zohomail.com; s=zohoarc; b=j4qoDnz4/TRDkwMpGSt2MifHMsG22iXAHnKU0+ytQZVshVH03nurloZAgnN50ZmcZmdc6t8gCkyF+w5zMS4Ay83K7z9gzO7r+p2GSmdttg0dOSpv7Sn/OjEJdqwTsctpFeU4GypOw3DbtO4sfi/mV1KLec+EfazdCcGlO6z/mgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1644422588; 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=/AXxql+hmV63situG60Ltcj/mhqLniN5Q4f1Rk8gYGs=; b=j7W2B9CQAKcQWvmndQv+0hadR5znxiDxlMxM0kV4lb/89kcFwdS8PnKLFI+1kQN7L51XYjzoYJJhq/vlKu4aQdReT+vlion8tioLBdmcJgjLywsqMWJPnH1w8UD+Bizi6N34bwsdytaQsvMOmSoTfQNPsIp8m2ZXtixy8zORg6M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1644422588850678.5219081337667; Wed, 9 Feb 2022 08:03:08 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-156-PGnNIBioNzCFm0m8d25hBg-1; Wed, 09 Feb 2022 11:03:07 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8BDF184B9AF; Wed, 9 Feb 2022 16:02:57 +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 3284E84A29; Wed, 9 Feb 2022 16:02:57 +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 EA6581802E34; Wed, 9 Feb 2022 16:02:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 219G2ar1012232 for ; Wed, 9 Feb 2022 11:02:36 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9820F7DE40; Wed, 9 Feb 2022 16:02:36 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.41]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECA607DE4B for ; Wed, 9 Feb 2022 16:02:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644422588; 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=/AXxql+hmV63situG60Ltcj/mhqLniN5Q4f1Rk8gYGs=; b=WvFjD3ufvrhcpAWArkvsK+u502OotqB7fa0ukDJ23yBCdQh4/+R44bsn0BpATn/XvcVY7B SQUpXUFcvclG9PgWpNbacpvpZqg0XS1J9Mgo8pQ8j8wZJZs2jUpbZmx0M/9CPBpGnp2sFH rMrQ8qbEjJfexO6eH7EH2mZ4X1dGfHg= X-MC-Unique: PGnNIBioNzCFm0m8d25hBg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 03/27] qemuProcessPrepareHostBackendChardev: Drop unneeded arguments Date: Wed, 9 Feb 2022 17:01:55 +0100 Message-Id: <790789743bebee7d365ff45018c5b4591be57966.1644422239.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1644422591957100011 Content-Type: text/plain; charset="utf-8" Caller passes 'driver->securityManager', and 'priv->qemuCaps' as arguments along with 'vm', but both aforementioned objects are accessible directly from 'vm'. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 169d9d1755..0e17e1bf94 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6805,9 +6805,8 @@ qemuProcessPrepareHostBackendChardevFileHelper(const = char *path, struct qemuProcessPrepareHostBackendChardevData { - virQEMUCaps *qemuCaps; + qemuDomainObjPrivate *priv; virLogManager *logManager; - virSecurityManager *secManager; virQEMUDriverConfig *cfg; virDomainDef *def; }; @@ -6857,7 +6856,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDevi= ceDef *dev, chardev->data.f= ile.append, &charpriv->fd, data->logManage= r, - data->secManage= r, + data->priv->dri= ver->securityManager, data->cfg, data->def) < 0) return -1; @@ -6866,14 +6865,14 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDe= viceDef *dev, case VIR_DOMAIN_CHR_TYPE_UNIX: if (chardev->data.nix.listen && - virQEMUCapsGet(data->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS_COMMA= NDLINE)) { + virQEMUCapsGet(data->priv->qemuCaps, QEMU_CAPS_CHARDEV_FD_PASS= _COMMANDLINE)) { - if (qemuSecuritySetSocketLabel(data->secManager, data->def) < = 0) + if (qemuSecuritySetSocketLabel(data->priv->driver->securityMan= ager, data->def) < 0) return -1; charpriv->fd =3D qemuOpenChrChardevUNIXSocket(chardev); - if (qemuSecurityClearSocketLabel(data->secManager, data->def) = < 0) { + if (qemuSecurityClearSocketLabel(data->priv->driver->securityM= anager, data->def) < 0) { VIR_FORCE_CLOSE(charpriv->fd); return -1; } @@ -6897,7 +6896,7 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDevi= ceDef *dev, chardev->logapp= end, &charpriv->logf= d, data->logManage= r, - data->secManage= r, + data->priv->dri= ver->securityManager, data->cfg, data->def) < 0) return -1; @@ -6911,16 +6910,13 @@ qemuProcessPrepareHostBackendChardevOne(virDomainDe= viceDef *dev, * serial/parallel/channel chardevs, vhost-user disks, vhost-user network * interfaces, smartcards, shared memory, and redirdevs */ static int -qemuProcessPrepareHostBackendChardev(virDomainObj *vm, - virQEMUCaps *qemuCaps, - virSecurityManager *secManager) +qemuProcessPrepareHostBackendChardev(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); struct qemuProcessPrepareHostBackendChardevData data =3D { - .qemuCaps =3D qemuCaps, + .priv =3D priv, .logManager =3D NULL, - .secManager =3D secManager, .cfg =3D cfg, .def =3D vm->def, }; @@ -6998,9 +6994,7 @@ qemuProcessPrepareHost(virQEMUDriver *driver, return -1; VIR_DEBUG("Preparing chr device backends"); - if (qemuProcessPrepareHostBackendChardev(vm, - priv->qemuCaps, - driver->securityManager) < 0) + if (qemuProcessPrepareHostBackendChardev(vm) < 0) return -1; if (qemuProcessBuildDestroyMemoryPaths(driver, vm, NULL, true) < 0) --=20 2.34.1