From nobody Mon Feb 9 09:17:02 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=1639053137; cv=none; d=zohomail.com; s=zohoarc; b=MstNcAKCZ/+N96ljNuKNel0/ys/IYmuqr60J6nH6Mn4h7rb0RnzckLEikQ1B8BfNzc5n+A+rz7JqrnKKUtQ2AZhTGkg6E3LRzPhrmdf5EJJV23IPaz22rjpicHm4OPpUGwZc3MzWAh2FLm1I1mXHcLxSthK3GoPMV0+YYnS1His= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639053137; 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=yeJD7fffpS3wdeLSRphMtyJXUbktjPKptsB5Uxm9uwc=; b=NwkiUV1AeD2WV41zXtA0AFo8QXZXSHiCSMKJxg99ixGCyK7lASoLbUWsbMDxEtN0HGm18KnUz0PhEFRM1OEhKCAawCk93OKWa5w31ZcgDH4Q2cHQ6R46mZ+0xaD/99I53m6W0iUwUeSn/TOP1V0vrmS8hJ1JQUuYsimKCPsgcbI= 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 163905313769486.16069522260045; Thu, 9 Dec 2021 04:32:17 -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-454-Lp4Zx2Z2P1S4TDbiQX4VLg-1; Thu, 09 Dec 2021 07:32:15 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B86E100D683; Thu, 9 Dec 2021 12:32:10 +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 2ADD16B8EA; Thu, 9 Dec 2021 12:32:10 +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 016344BB7C; Thu, 9 Dec 2021 12:32:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 1B9CVAGv017664 for ; Thu, 9 Dec 2021 07:31:10 -0500 Received: by smtp.corp.redhat.com (Postfix) id 026091B472; Thu, 9 Dec 2021 12:31:10 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 60CE160C25 for ; Thu, 9 Dec 2021 12:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639053136; 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=yeJD7fffpS3wdeLSRphMtyJXUbktjPKptsB5Uxm9uwc=; b=HXMNxPwfqVmGt0d0eusUvWas9Uy297cRXqFmXplNy4DD8P2MBfbB9cODTPnyYKw+c6j8Ji PCTMLFuOrWNq8cXfHPg6HJOkDM2RrO6eiApKDtYPApGwgmSkTIbIeXGYLDa9urOBTkrzn+ 7E1Ulqyy0PraShQ46VkGDxoS8rPq40w= X-MC-Unique: Lp4Zx2Z2P1S4TDbiQX4VLg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 08/24] qemuBuildChrChardevStr: Remove 'cdevflags' argument Date: Thu, 9 Dec 2021 13:30:43 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.16 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: 1639053139041100001 Content-Type: text/plain; charset="utf-8" The argument and corresponding enum are not used any more. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 45 ++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0baf3acde6..918361d55c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5036,10 +5036,6 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourc= eDef *dev) } -enum { - QEMU_BUILD_CHARDEV_TCP_NOWAIT =3D (1 << 0), -}; - /* This function outputs a -chardev command line option which describes on= ly the * host side of the character device */ static char * @@ -5050,8 +5046,7 @@ qemuBuildChrChardevStr(virLogManager *logManager G_GN= UC_UNUSED, const virDomainDef *def G_GNUC_UNUSED, const virDomainChrSourceDef *dev, const char *alias, - virQEMUCaps *qemuCaps, - unsigned int cdevflags G_GNUC_UNUSED) + virQEMUCaps *qemuCaps) { qemuDomainChrSourcePrivate *chrSourcePriv =3D QEMU_DOMAIN_CHR_SOURCE_P= RIVATE(dev); g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -5525,7 +5520,6 @@ qemuBuildMonitorCommandLine(virLogManager *logManager, qemuDomainObjPrivate *priv) { g_autofree char *chrdev =3D NULL; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; if (!priv->monConfig) return 0; @@ -5533,7 +5527,7 @@ qemuBuildMonitorCommandLine(virLogManager *logManager, if (!(chrdev =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, priv->monConfig, "monitor", - priv->qemuCaps, cdevflags))) + priv->qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, chrdev); @@ -5661,8 +5655,6 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManage= r, virQEMUCaps *qemuCaps, char **chr) { - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; - *chr =3D NULL; switch ((virDomainRNGBackend) rng->backend) { @@ -5676,8 +5668,8 @@ qemuBuildRNGBackendChrdevStr(virLogManager *logManage= r, if (!(*chr =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, rng->source.chardev, - rng->info.alias, qemuCaps, - cdevflags))) + rng->info.alias, + qemuCaps))) return -1; break; } @@ -8629,7 +8621,7 @@ qemuInterfaceVhostuserConnect(virQEMUDriver *driver, if (!(*chardev =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, net->data.vhostuser, - net->info.alias, qemuCaps,= 0))) + net->info.alias, qemuCaps)= )) return -1; break; @@ -9073,7 +9065,6 @@ qemuBuildSmartcardCommandLine(virLogManager *logManag= er, break; case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH: { - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; g_autofree char *chardevstr =3D NULL; g_autofree char *chardevalias =3D g_strdup_printf("char%s", smartc= ard->info.alias); @@ -9081,7 +9072,7 @@ qemuBuildSmartcardCommandLine(virLogManager *logManag= er, cmd, cfg, def, smartcard->data.passthru, smartcard->info.alias, - qemuCaps, cdevflags))) { + qemuCaps))) { return -1; } @@ -9237,7 +9228,6 @@ qemuBuildShmemCommandLine(virLogManager *logManager, g_autoptr(virJSONValue) memProps =3D NULL; g_autoptr(virJSONValue) devProps =3D NULL; g_autofree char *chardev =3D NULL; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; if (shmem->size) { /* @@ -9299,8 +9289,8 @@ qemuBuildShmemCommandLine(virLogManager *logManager, chardev =3D qemuBuildChrChardevStr(logManager, secManager, cmd, cfg, def, shmem->server.chr, - shmem->info.alias, qemuCaps, - cdevflags); + shmem->info.alias, + qemuCaps); if (!chardev) return -1; @@ -9405,7 +9395,6 @@ qemuBuildSerialCommandLine(virLogManager *logManager, { size_t i; bool havespice =3D false; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; if (def->nserials) { for (i =3D 0; i < def->ngraphics && !havespice; i++) { @@ -9425,7 +9414,7 @@ qemuBuildSerialCommandLine(virLogManager *logManager, cmd, cfg, def, serial->source, serial->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); @@ -9464,7 +9453,6 @@ qemuBuildParallelsCommandLine(virLogManager *logManag= er, virQEMUCaps *qemuCaps) { size_t i; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; for (i =3D 0; i < def->nparallels; i++) { virDomainChrDef *parallel =3D def->parallels[i]; @@ -9474,7 +9462,7 @@ qemuBuildParallelsCommandLine(virLogManager *logManag= er, cmd, cfg, def, parallel->source, parallel->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); @@ -9497,7 +9485,6 @@ qemuBuildChannelsCommandLine(virLogManager *logManage= r, virQEMUCaps *qemuCaps) { size_t i; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; for (i =3D 0; i < def->nchannels; i++) { virDomainChrDef *channel =3D def->channels[i]; @@ -9508,7 +9495,7 @@ qemuBuildChannelsCommandLine(virLogManager *logManage= r, cmd, cfg, def, channel->source, channel->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); @@ -9548,7 +9535,6 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, virQEMUCaps *qemuCaps) { size_t i; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; /* Explicit console devices */ for (i =3D 0; i < def->nconsoles; i++) { @@ -9561,7 +9547,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, cmd, cfg, def, console->source, console->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); @@ -9576,7 +9562,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, cmd, cfg, def, console->source, console->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); @@ -9591,7 +9577,7 @@ qemuBuildConsoleCommandLine(virLogManager *logManager, cmd, cfg, def, console->source, console->info.alias, - qemuCaps, cdevflags))) + qemuCaps))) return -1; virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); @@ -9680,7 +9666,6 @@ qemuBuildRedirdevCommandLine(virLogManager *logManage= r, virQEMUCaps *qemuCaps) { size_t i; - unsigned int cdevflags =3D QEMU_BUILD_CHARDEV_TCP_NOWAIT; for (i =3D 0; i < def->nredirdevs; i++) { virDomainRedirdevDef *redirdev =3D def->redirdevs[i]; @@ -9691,7 +9676,7 @@ qemuBuildRedirdevCommandLine(virLogManager *logManage= r, cmd, cfg, def, redirdev->source, redirdev->info.alias, - qemuCaps, cdevflags))) { + qemuCaps))) { return -1; } --=20 2.31.1