From nobody Sun Oct 5 01:46:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1757419717; cv=none; d=zohomail.com; s=zohoarc; b=CfqMZJcrBGIcMBltZ7yfmtpV5FkiCyWiBAWwxUJxq9lONH/8IUa2/IeO7EXWawostYu/u1nab+24IJTrkYYSdQP9Wrx8CySd5OSNcSXcCXoHw/yh24rGDnYblgiCHReGW0QJSrtUXeD6E99sPvu59JfyZsMVHbS35B3Un5pJda4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419717; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=y9zcM1dUfmcz3FcVavLEm2fpFPzsb/5FsfqcraxpfKc=; b=ZDhLMV9L5RzZAsoclLOHMd5p6j6w/9qAP5KkxGUUdFbgkqOAKWJoo6jZwgqC28ngYuiJRD8vG4gwoTUddY2/LVMTtSZdYYl2hOuJWPXQtpxk3RD3Ic55+f3YalpA7f4+AyQCDcEyR+fAavvFQNv9iv/LbFA9HTGZg6xv43/b8Iw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1757419717372405.8875440752297; Tue, 9 Sep 2025 05:08:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id CBE5543E50; Tue, 9 Sep 2025 08:08:32 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 498FE41C75; Tue, 9 Sep 2025 08:07:12 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6264941ADE; Tue, 9 Sep 2025 08:06:41 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8ABDB41AD9 for ; Tue, 9 Sep 2025 08:06:39 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-304-qTEPR360Mde6q37uSxFdWg-1; Tue, 09 Sep 2025 08:06:37 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BCE7B195609F for ; Tue, 9 Sep 2025 12:06:36 +0000 (UTC) Received: from hjs (unknown [10.43.3.187]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 222701955F24 for ; Tue, 9 Sep 2025 12:06:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757419599; h=from:from: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; bh=y9zcM1dUfmcz3FcVavLEm2fpFPzsb/5FsfqcraxpfKc=; b=al9RF1+G9HH4ZC2r7c3U6AJ/uJI1+yhRpYxTwbQgBUNGnzLrQDjEMBHtLUZPOCtXfl80pB dGnLoI5JywZBjfBmFc7wkNAJgw7SFM+2xKF+m8foHqHo9PkpYzcM37/QlykA6sG01QaiHz HWuE73ySqZThNiCn2nRSsj1VoFVgZpI= X-MC-Unique: qTEPR360Mde6q37uSxFdWg-1 X-Mimecast-MFC-AGG-ID: qTEPR360Mde6q37uSxFdWg_1757419596 To: devel@lists.libvirt.org Subject: [libvirt PATCH 1/8] qemu: passt: split out qemuPasstBuildCommand Date: Tue, 9 Sep 2025 14:05:42 +0200 Message-ID: <1b34627510dd984984b21a02dacff069de6eceba.1757419549.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3vP9ppDwzJkpMKXp4WBw1j0fwbxVyETVSjK_EmCYjVY_1757419596 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GAVH2LIJYEPFHSARGNWGRF67ETDWSAWR X-Message-ID-Hash: GAVH2LIJYEPFHSARGNWGRF67ETDWSAWR X-MailFrom: jtomko@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: =?utf-8?q?J=C3=A1n_Tomko_via_Devel?= Reply-To: =?UTF-8?q?J=C3=A1n=20Tomko?= X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1757419719316116600 From: J=C3=A1n Tomko Separate the command line building to make it testable. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/qemu/qemu_passt.c | 38 +++++++++++++++++++++++++++++--------- src/qemu/qemu_passt.h | 5 +++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_passt.c b/src/qemu/qemu_passt.c index fcc34de384..d8e281b7a1 100644 --- a/src/qemu/qemu_passt.c +++ b/src/qemu/qemu_passt.c @@ -194,15 +194,15 @@ qemuPasstPrepareVhostUser(virDomainObj *vm, net->data.vhostuser->data.nix.reconnect.timeout =3D QEMU_PASST_RECONNE= CT_TIMEOUT; } =20 -int -qemuPasstStart(virDomainObj *vm, - virDomainNetDef *net) +virCommand * +qemuPasstBuildCommand(char **socketName, + char **pidfileRet, + virDomainObj *vm, + virDomainNetDef *net) { - qemuDomainObjPrivate *priv =3D vm->privateData; - virQEMUDriver *driver =3D priv->driver; g_autofree char *passtSocketName =3D qemuPasstCreateSocketPath(vm, net= ); - g_autoptr(virCommand) cmd =3D NULL; g_autofree char *pidfile =3D qemuPasstCreatePidFilename(vm, net); + g_autoptr(virCommand) cmd =3D NULL; size_t i; =20 cmd =3D virCommandNew(PASST); @@ -238,7 +238,7 @@ qemuPasstStart(virDomainObj *vm, * a single IPv4 and single IPv6 address */ if (!(addr =3D virSocketAddrFormat(&ip->address))) - return -1; + return NULL; =20 virCommandAddArgList(cmd, "--address", addr, NULL); =20 @@ -266,14 +266,14 @@ qemuPasstStart(virDomainObj *vm, /* validation guarantees this will never happen */ virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid portForward proto value %1$u"), pf->= proto); - return -1; + return NULL; } =20 if (VIR_SOCKET_ADDR_VALID(&pf->address)) { g_autofree char *addr =3D NULL; =20 if (!(addr =3D virSocketAddrFormat(&pf->address))) - return -1; + return NULL; =20 virBufferAddStr(&buf, addr); emitsep =3D true; @@ -317,6 +317,26 @@ qemuPasstStart(virDomainObj *vm, virCommandAddArg(cmd, virBufferCurrentContent(&buf)); } =20 + if (socketName) + *socketName =3D g_steal_pointer(&passtSocketName); + if (pidfileRet) + *pidfileRet =3D g_steal_pointer(&pidfile); + + return g_steal_pointer(&cmd); +} + +int +qemuPasstStart(virDomainObj *vm, + virDomainNetDef *net) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autofree char *passtSocketName =3D NULL; + g_autofree char *pidfile =3D NULL; + virQEMUDriver *driver =3D priv->driver; + g_autoptr(virCommand) cmd =3D NULL; + + if (!(cmd =3D qemuPasstBuildCommand(&passtSocketName, &pidfile, vm, ne= t))) + return -1; =20 if (qemuExtDeviceLogCommand(driver, vm, cmd, "passt") < 0) return -1; diff --git a/src/qemu/qemu_passt.h b/src/qemu/qemu_passt.h index ea545ccf38..e16d4c1119 100644 --- a/src/qemu/qemu_passt.h +++ b/src/qemu/qemu_passt.h @@ -27,6 +27,11 @@ qemuPasstAddNetProps(virDomainObj *vm, virDomainNetDef *net, virJSONValue **netprops); =20 +virCommand *qemuPasstBuildCommand(char **socketName, + char **pidfileRet, + virDomainObj *vm, + virDomainNetDef *net); + int qemuPasstStart(virDomainObj *vm, virDomainNetDef *net); =20 --=20 2.50.1