From nobody Mon Feb 9 09:22:22 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=1652778463; cv=none; d=zohomail.com; s=zohoarc; b=RxjBLifnm83zmRqi+omN0WaEijUng23hRg00e2y2VpOh7Rgwr/8Fq1LC6Y+bpVIqmPBUmJukpTusjal5qFCG7QdTzryeaK50WpsRUkXx7OsEghSHN7Rk4yeF6xjvXKM044HBCetfF4uQYivFjfIwkOl0ufOYXLkoJy+3zsRfDm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652778463; 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=P79VnF9Jyuz+YWDemFeQ7bpc5qgsWvX9xC10ze+qGMI=; b=f6JrQRCOU4917xMXShIId7VS/sBl8I+v4eXipLUo68aJL1QnWTiDYsyoT0uwWWGcdP80YHTYjefk0UEVYelX3t6FJzqTk92ezkOpzN/zzyYF14Q3YLuRCwA7ay67Q6KIdcfm+ZHfTOvvAE0YukHj8w8/AaBiYkNWaOUySKobdnc= 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 16527784637431018.9601662248294; Tue, 17 May 2022 02:07:43 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-442-SBuAzBsfPWuE1qfmssuczQ-1; Tue, 17 May 2022 05:07:40 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3EE6086B8B5; Tue, 17 May 2022 09:07:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 29A7240CF8F0; Tue, 17 May 2022 09:07:37 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DA0891947070; Tue, 17 May 2022 09:07:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 29A571947070 for ; Tue, 17 May 2022 09:07:35 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 1A9A4156D12B; Tue, 17 May 2022 09:07:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97829156D120 for ; Tue, 17 May 2022 09:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652778462; 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=P79VnF9Jyuz+YWDemFeQ7bpc5qgsWvX9xC10ze+qGMI=; b=iwP6Wg+sf/WRdLuHpyMiWs2phXQZRe7oWab++kDhZyiLUYGj3EklHwsjmI4PD5835l6pkE FrJ+zNMMugTp/96oxZdInylp3vNLzYSTsYWbPDOR0wJXNiFbuRZdWHM+RcU5SojHlNQPLW 5G4ZUTVNTW1Rs5mRz8S0itgNVwNkdmM= X-MC-Unique: SBuAzBsfPWuE1qfmssuczQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 8/9] qemuFDPassTransferCommand: Remove return value Date: Tue, 17 May 2022 11:07:25 +0200 Message-Id: <4d33e7713e686c6a1d1bab9f3711b1281cc50acd.1652778351.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 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: 1652778464238100005 Content-Type: text/plain; charset="utf-8" Now that the 'direct' mode was separated and thus we don't have any possible error case we can stop returning any values and simplify callers. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 18 +++++------------- src/qemu/qemu_fd.c | 6 ++---- src/qemu/qemu_fd.h | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 828c7c38f5..114c737b3d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1513,9 +1513,7 @@ qemuBuildChardevCommand(virCommand *cmd, break; case VIR_DOMAIN_CHR_TYPE_FILE: - if (qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd) < 0) - return -1; - + qemuFDPassTransferCommand(chrSourcePriv->sourcefd, cmd); break; case VIR_DOMAIN_CHR_TYPE_UNIX: @@ -1543,8 +1541,7 @@ qemuBuildChardevCommand(virCommand *cmd, return -1; } - if (qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd) < 0) - return -1; + qemuFDPassTransferCommand(chrSourcePriv->logfd, cmd); if (!(charstr =3D qemuBuildChardevStr(dev, charAlias))) return -1; @@ -8918,9 +8915,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriver *driver, qemuFDPassDirectTransferCommand(n->data, cmd); qemuFDPassDirectTransferCommand(netpriv->slirpfd, cmd); - - if (qemuFDPassTransferCommand(netpriv->vdpafd, cmd) < 0) - return -1; + qemuFDPassTransferCommand(netpriv->vdpafd, cmd); if (!(hostnetprops =3D qemuBuildHostNetProps(net))) goto cleanup; @@ -9810,11 +9805,8 @@ qemuBuildTPMCommandLine(virCommand *cmd, return -1; } - if (qemuFDPassTransferCommand(passtpm, cmd) < 0) - return -1; - - if (qemuFDPassTransferCommand(passcancel, cmd) < 0) - return -1; + qemuFDPassTransferCommand(passtpm, cmd); + qemuFDPassTransferCommand(passcancel, cmd); if (!(tpmdevstr =3D qemuBuildTPMBackendStr(tpm, passtpm, passcancel))) return -1; diff --git a/src/qemu/qemu_fd.c b/src/qemu/qemu_fd.c index cff2428727..b7dd66bdc7 100644 --- a/src/qemu/qemu_fd.c +++ b/src/qemu/qemu_fd.c @@ -133,14 +133,14 @@ qemuFDPassAddFD(qemuFDPass *fdpass, * Pass the fds in @fdpass to a commandline object @cmd. @fdpass may be NU= LL * in which case this is a no-op. */ -int +void qemuFDPassTransferCommand(qemuFDPass *fdpass, virCommand *cmd) { size_t i; if (!fdpass) - return 0; + return; for (i =3D 0; i < fdpass->nfds; i++) { g_autofree char *arg =3D g_strdup_printf("set=3D%u,fd=3D%d,opaque= =3D%s", @@ -152,8 +152,6 @@ qemuFDPassTransferCommand(qemuFDPass *fdpass, fdpass->fds[i].fd =3D -1; virCommandAddArgList(cmd, "-add-fd", arg, NULL); } - - return 0; } diff --git a/src/qemu/qemu_fd.h b/src/qemu/qemu_fd.h index dbb4ab0aa5..6f165b6be9 100644 --- a/src/qemu/qemu_fd.h +++ b/src/qemu/qemu_fd.h @@ -39,7 +39,7 @@ qemuFDPassAddFD(qemuFDPass *fdpass, int *fd, const char *suffix); -int +void qemuFDPassTransferCommand(qemuFDPass *fdpass, virCommand *cmd); --=20 2.35.3