From nobody Sun Oct 5 00:06:52 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 From nobody Sun Oct 5 00:06:52 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=1757419777; cv=none; d=zohomail.com; s=zohoarc; b=UdHQBiCefMvcThHrfaNvzoHahgHyRv+PXqAuqqRM//jwEP7VV+T9CkMs0DsLiUy7fBjp9QMwsuxFFTrW/AX7QZiiZD8TCW0Uihyl+ozGO1RjloJXDH+hYcdDxiOlu+yi2c0FZvofjWdabf66KxJMn3Sboxbve0vIdqEdgpWz0Pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419777; 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=/b0a1jrTVFhJTNQvio/J0CSW2B3oaebXbA4TUIM3bVo=; b=UBhLxYVeeegiYscXMzN8npZ4vNStDYL7WAdWtItlpa+vdbHPKUvRX99QIuUQFIBtQFA5BF/qZVDvVYGUgSe5XXAzhNDSAXoTlNRJnjsc4u2CKMbMEuWEwVxSNRKlgmjO29tsghjaodK79I3D7x8me/ooah8Rq3G8aw5NTWKjPLU= 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 1757419777646849.6469330427431; Tue, 9 Sep 2025 05:09:37 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 00EA33F366; Tue, 9 Sep 2025 08:09:21 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 32E1241B14; Tue, 9 Sep 2025 08:07:22 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5B65741ADC; Tue, 9 Sep 2025 08:06:42 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 7122141ADB for ; Tue, 9 Sep 2025 08:06:40 -0400 (EDT) Received: from mx-prod-mc-03.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-275-VsF0ckpcPbe42VpLY8mTPw-1; Tue, 09 Sep 2025 08:06:38 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D34FA195419F for ; Tue, 9 Sep 2025 12:06:37 +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 2FB171956095 for ; Tue, 9 Sep 2025 12:06:36 +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=1757419600; 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=/b0a1jrTVFhJTNQvio/J0CSW2B3oaebXbA4TUIM3bVo=; b=PCMQ/otOBsC1nbLUtpRWqaq3ZpahtrqEV5IFKTxNq0Ea7xFBgeOpvcC92MEhuqS/TKCGlY w1wpIig1ORaSyUjecxKdx1oXt+woVGGupUMn977WYHUVNgN9ypYbKu3uDUKoIMpNRi2mtK u6YTFu7dapdngC/7/xOZXKJXCSDx39A= X-MC-Unique: VsF0ckpcPbe42VpLY8mTPw-1 X-Mimecast-MFC-AGG-ID: VsF0ckpcPbe42VpLY8mTPw_1757419598 To: devel@lists.libvirt.org Subject: [libvirt PATCH 2/8] tests: qemuxmlconftests: store suffix in testQemuInfo Date: Tue, 9 Sep 2025 14:05:43 +0200 Message-ID: <41c8205d449862ce27265ed1dc28e9010c730619.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: GfGSVZDK5_-FrpMm8cWp1Fg3_W9OC-jYbzIcGN9aTio_1757419598 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZBD3ATXMOT7GRMQDPZVJCO65I74RXOJP X-Message-ID-Hash: ZBD3ATXMOT7GRMQDPZVJCO65I74RXOJP 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: 1757419779848124100 From: J=C3=A1n Tomko Next patch will need this to construct the path to the output file in a deeper level of nesting. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuxmlconftest.c | 1 + tests/testutilsqemu.h | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 171a6f1c78..a7e32a5a99 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -999,6 +999,7 @@ testRun(const char *name, va_list ap; =20 info->name =3D name; + info->suffix =3D suffix; info->conf =3D testConf; =20 va_start(ap, testConf); diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 62943bb2d8..a8e0fefa84 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -98,6 +98,7 @@ struct testQemuArgs { =20 struct _testQemuInfo { const char *name; + const char *suffix; char *infile; char *outfile; char *out_xml_active; --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757419844; cv=none; d=zohomail.com; s=zohoarc; b=dQk22X7Sd9lUp7+dhRV7I46grDLomkZ4A+/wQXLuxibTCz9Om3njo/f7xub2prXJHMZxduXpzDdvFsBvMg5QbJlg7t8u9GyPwBknvipyNbFq8czQpXspY8IGff1cJQ4nQip4tgnHoewbIKEAeieeOX8z/W2VM1zyl18CFhRS/lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419844; 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=JRlDlEas05IcV6K85HQYang7eQ5Hl85hkA4vn80bMm4=; b=f6RTe09mr5Vcs001Z3HRtce9OuHMCOLvVy7ujxqTgyxZASr8H7+/Pj+kYD1KMptXUrHM7jr2Uq2JyUDM+ICcRzQZXUn0/dPfu665x4bY/C5ZucTMapVONe8TBzcovTvF/lNNd7rt82A4zX09YY6sVTI6PfrTkc3WKxsphBxvPNI= 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 1757419844112526.8926986619648; Tue, 9 Sep 2025 05:10:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0627941BA8; Tue, 9 Sep 2025 08:10:10 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id D5C0D41B24; Tue, 9 Sep 2025 08:07:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7F3D841AD9; Tue, 9 Sep 2025 08:06:42 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 5F53241ADD for ; Tue, 9 Sep 2025 08:06:41 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-593-XAqwkIA7MEGexyo_SQRRKg-1; Tue, 09 Sep 2025 08:06:39 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D6703180034C for ; Tue, 9 Sep 2025 12:06:38 +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 3D3BB1956095 for ; Tue, 9 Sep 2025 12:06:38 +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=1757419601; 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=JRlDlEas05IcV6K85HQYang7eQ5Hl85hkA4vn80bMm4=; b=BMVO4kd6X6Q3iQjhuhBPjj5dO52L6lpqBtwTYPL7eqvZciKEU/TQ+VssC0key4Anh1/RC9 EEKZP3DF7CqDo2NP4wZdvNfVa4YgPYrEet9QzNMz/DlMPvJNkFFnuH5Y8xiohSNPNW8dIP pqUgBujSq9eLs1mO1NLOmWm95ejN15A= X-MC-Unique: XAqwkIA7MEGexyo_SQRRKg-1 X-Mimecast-MFC-AGG-ID: XAqwkIA7MEGexyo_SQRRKg_1757419598 To: devel@lists.libvirt.org Subject: [libvirt PATCH 3/8] tests: qemuxmlconftest: Introduce testQemuConfMarkUsed Date: Tue, 9 Sep 2025 14:05:44 +0200 Message-ID: <5832eddc283e3088fe76826a68474da458eebfa8.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: dUvWDkT7gSuY2qqeZP_rMy5Eo6xvErVpNDC37U0prao_1757419598 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TEFMGOL6QSLM5GLQPEPVXAQDZSNPTUD3 X-Message-ID-Hash: TEFMGOL6QSLM5GLQPEPVXAQDZSNPTUD3 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: 1757419844752116600 From: J=C3=A1n Tomko Make the code readable enough to not need a comment. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuxmlconftest.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index a7e32a5a99..dea75d805f 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -598,6 +598,15 @@ testInfoCheckDuplicate(testQemuInfo *info) } =20 =20 +static void +testQemuConfMarkUsed(testQemuInfo *info, + const char *file) +{ + if (file) + ignore_value(g_hash_table_remove(info->conf->existingTestCases, fi= le)); +} + + /** * testQemuConfXMLCommon: Prepare common test data (e.g. parse input XML) * for a test case. @@ -630,14 +639,10 @@ testQemuConfXMLCommon(testQemuInfo *info, if (info->prepared) goto cleanup; =20 - /* mark test case as used */ - ignore_value(g_hash_table_remove(info->conf->existingTestCases, info->= infile)); - if (info->outfile) - ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->outfile)); - if (info->errfile) - ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->errfile)); - if (info->out_xml_inactive) - ignore_value(g_hash_table_remove(info->conf->existingTestCases, in= fo->out_xml_inactive)); + testQemuConfMarkUsed(info, info->infile); + testQemuConfMarkUsed(info, info->outfile); + testQemuConfMarkUsed(info, info->errfile); + testQemuConfMarkUsed(info, info->out_xml_inactive); =20 if (testQemuInfoInitArgs((testQemuInfo *) info) < 0) goto cleanup; --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757419881; cv=none; d=zohomail.com; s=zohoarc; b=R2Q09Fl0xgBMJeROhhFxOL1O7YNGHGVgdYJKPmK1ORKckvvhtyixxmPtGbzlRBmkPKUY3EjgUBEF8tQOZ1LIX9FtdretAFlC+lkS4SeYMCIXREwVMcF7usWq28FP5idW6aEYQgKRICOs9Kds5+9oyjXohcRgCpWpImhPm2QPe1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419881; 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=/r7P6TlrmNJqUxCJiNWh3b2Yrn60EDlHo20V313ESq4=; b=Bki+22j9MGxp5bzSPcBxbRcJ88C9mzC6zyPYlYxN2KugsSj1neOWi4hGwJwRpDzcimzwGHYqivPaA7Par1JcyDQpqE1CD3fPeSVMABQMMoScsbWFus4IEGyduBxq9MmsreByMcnjd/k9Wqlf32JUCm5MN7KdaEJ58WhAsMCI4dE= 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 1757419881819785.5583980913519; Tue, 9 Sep 2025 05:11:21 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3603541C8A; Tue, 9 Sep 2025 08:11:02 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id DA69541B01; Tue, 9 Sep 2025 08:07:35 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 8C0A441AD9; Tue, 9 Sep 2025 08:06:43 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 9DC4E41ADB for ; Tue, 9 Sep 2025 08:06:42 -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-411-OJRsXXEbOiuPar9cBuDxHQ-1; Tue, 09 Sep 2025 08:06:40 -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 EB5DC19560AE for ; Tue, 9 Sep 2025 12:06:39 +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 4888E1956095 for ; Tue, 9 Sep 2025 12:06:39 +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=1757419602; 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=/r7P6TlrmNJqUxCJiNWh3b2Yrn60EDlHo20V313ESq4=; b=Hnyszv5xACyvyss5++4g+/y+sDg0IPRC7WhISumzTEAjJdtEBhcXszcv1Q8835LfitXAXA X7QiJmkCDZu0dyQf+oLBB3bvrN5hBxkiFLWrdVF/PzlJbqStm49p7jFwl+bMTph3BZX24M Y4tCoVeooJR0JFPwTamFEXEgxVY9dSA= X-MC-Unique: OJRsXXEbOiuPar9cBuDxHQ-1 X-Mimecast-MFC-AGG-ID: OJRsXXEbOiuPar9cBuDxHQ_1757419600 To: devel@lists.libvirt.org Subject: [libvirt PATCH 4/8] export qemuVirtioFSBuildCommandLine Date: Tue, 9 Sep 2025 14:05:45 +0200 Message-ID: <09c234c7cdbe8a78feb8974a820bdb96ca3b8cce.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: ysggIM6_SLiDrO7DZxuU6DkUlhm_LYxFikUSHvAryp8_1757419600 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: B7HUXHN7A354JGAIMPAKZMGKT4T6S64U X-Message-ID-Hash: B7HUXHN7A354JGAIMPAKZMGKT4T6S64U 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: 1757419883228124100 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- src/qemu/qemu_virtiofs.c | 2 +- src/qemu/qemu_virtiofs.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c index aa282024a4..d192f5ec3c 100644 --- a/src/qemu/qemu_virtiofs.c +++ b/src/qemu/qemu_virtiofs.c @@ -111,7 +111,7 @@ qemuVirtioFSOpenChardev(virQEMUDriver *driver, } =20 =20 -static virCommand * +virCommand * qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg, virDomainFSDef *fs, int *fd) diff --git a/src/qemu/qemu_virtiofs.h b/src/qemu/qemu_virtiofs.h index 5463acef98..6867f89929 100644 --- a/src/qemu/qemu_virtiofs.h +++ b/src/qemu/qemu_virtiofs.h @@ -26,6 +26,11 @@ char * qemuVirtioFSCreateSocketFilename(virDomainObj *vm, const char *alias); =20 +virCommand * +qemuVirtioFSBuildCommandLine(virQEMUDriverConfig *cfg, + virDomainFSDef *fs, + int *fd); + int qemuVirtioFSStart(virQEMUDriver *driver, virDomainObj *vm, --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757419928; cv=none; d=zohomail.com; s=zohoarc; b=R1Q/fvJCO7NqxTteaS2uuRp8jADDfaFMJmpConQmW1JIGN0lYRQwNfHZpInegsZaoRMFbaxXsGBXCQHaAlNNo1npBSPQJrLBAfAcF2BgACARtZptHu4HkE8ApPXsKnCjYcLjDgDr/ne9fsnr9j78ar/Uu0m/TA0YSQ7pPlwBDPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419928; 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=eGKJNYdbWdZgQ5/eJnEzrpV7Ku2Vsxk+GTlfr1oRrMQ=; b=gI89zGwlMcDBZvdf8ZsMF2YNlNlSVyxupVbVjjFcMxYyu3bBiZ+6GD9RdIsjT9slDB6Shq08jn6rcj/JghoDcKE3712bgVl099JaWmOjnXIzhqod9IwyJ7b1H9o18W9bA9QDII5w465nzuQDiYoVSweV/44MXily2fuSufp/ECw= 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 175741992859739.73893985923473; Tue, 9 Sep 2025 05:12:08 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id B359F41B13; Tue, 9 Sep 2025 08:12:07 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 7909B43E1E; Tue, 9 Sep 2025 08:07:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 6CF3841ADE; Tue, 9 Sep 2025 08:06:45 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C773B41ADB for ; Tue, 9 Sep 2025 08:06:43 -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-547-rouFjkq-OByEzxI1reuDpA-1; Tue, 09 Sep 2025 08:06:41 -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 EFF111956096 for ; Tue, 9 Sep 2025 12:06:40 +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 55F981956095 for ; Tue, 9 Sep 2025 12:06:40 +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=1757419603; 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=eGKJNYdbWdZgQ5/eJnEzrpV7Ku2Vsxk+GTlfr1oRrMQ=; b=RIxcq+uhCdlnY5n3dIfXaPiNKdfgNGIZW2PDidtfQaq4W4eWyx7Dg/wq+kBbiJsHCOG2ZV PZFz2yY85vsFwmZsPyHnr/2eCus9wLMnLsXa0fUbAkM5B8hvwpewERInAE2fYOa7CGNMhO RbHpELYmKf5NhYAuvHFHTJr5n1WpOq0= X-MC-Unique: rouFjkq-OByEzxI1reuDpA-1 X-Mimecast-MFC-AGG-ID: rouFjkq-OByEzxI1reuDpA_1757419601 To: devel@lists.libvirt.org Subject: [libvirt PATCH 5/8] tests: qemuxmlconftest: test passt command line too Date: Tue, 9 Sep 2025 14:05:46 +0200 Message-ID: <0818b75a9ab78960f724201ac784d78d5d61155a.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: 6K-aMROkMiF2bweG0Nhq6YGsEm1wwl4dS_NSxTrhJw0_1757419601 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VP3SO4ZXYXHXIF4T37TGSIGKP2UVBQT4 X-Message-ID-Hash: VP3SO4ZXYXHXIF4T37TGSIGKP2UVBQT4 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: 1757419929666116600 From: J=C3=A1n Tomko Introduce testing of the generated command line arguments of helper binaries too, not just QEMU. Start with passt. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- .../net-user-passt.x86_64-7.2.0.passt0.args | 13 ++++ .../net-user-passt.x86_64-latest.passt0.args | 13 ++++ ...-vhostuser-passt.x86_64-latest.passt0.args | 14 ++++ ...-vhostuser-passt.x86_64-latest.passt1.args | 5 ++ ...-vhostuser-passt.x86_64-latest.passt2.args | 6 ++ ...main-subelements.x86_64-latest.passt0.args | 7 ++ tests/qemuxmlconftest.c | 70 +++++++++++++++++++ 7 files changed, 128 insertions(+) create mode 100644 tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.passt= 0.args create mode 100644 tests/qemuxmlconfdata/net-user-passt.x86_64-latest.pass= t0.args create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest= .passt0.args create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest= .passt1.args create mode 100644 tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest= .passt2.args create mode 100644 tests/qemuxmlconfdata/schema-reorder-domain-subelements= .x86_64-latest.passt0.args diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.passt0.args = b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.passt0.args new file mode 100644 index 0000000000..b244eb711d --- /dev/null +++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-7.2.0.passt0.args @@ -0,0 +1,13 @@ +passt \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket \ +--pid /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0-passt.pid \ +--interface eth42 \ +--log-file /var/log/loglaw.blog \ +--address 172.17.2.0 \ +--netmask 24 \ +--address 2001:db8:ac10:fd01::feed \ +--tcp-ports '2001:db8:ac10:fd01::1:10/22:2022,1000-1050,~1020,~1030-1040' \ +--udp-ports '1.2.3.4%eth0/5000-5020:6000-6020,~5010-5015' \ +--tcp-ports 80 \ +--tcp-ports 443:344 diff --git a/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.passt0.args= b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.passt0.args new file mode 100644 index 0000000000..b244eb711d --- /dev/null +++ b/tests/qemuxmlconfdata/net-user-passt.x86_64-latest.passt0.args @@ -0,0 +1,13 @@ +passt \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket \ +--pid /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0-passt.pid \ +--interface eth42 \ +--log-file /var/log/loglaw.blog \ +--address 172.17.2.0 \ +--netmask 24 \ +--address 2001:db8:ac10:fd01::feed \ +--tcp-ports '2001:db8:ac10:fd01::1:10/22:2022,1000-1050,~1020,~1030-1040' \ +--udp-ports '1.2.3.4%eth0/5000-5020:6000-6020,~5010-5015' \ +--tcp-ports 80 \ +--tcp-ports 443:344 diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt0= .args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt0.args new file mode 100644 index 0000000000..f75fc0749a --- /dev/null +++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt0.args @@ -0,0 +1,14 @@ +passt \ +--vhost-user \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0.socket \ +--pid /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net0-passt.pid \ +--interface eth42 \ +--log-file /var/log/loglaw.blog \ +--address 172.17.2.0 \ +--netmask 24 \ +--address 2001:db8:ac10:fd01::feed \ +--tcp-ports '2001:db8:ac10:fd01::1:10/22:2022,1000-1050,~1020,~1030-1040' \ +--udp-ports '1.2.3.4%eth0/5000-5020:6000-6020,~5010-5015' \ +--tcp-ports 80 \ +--tcp-ports 443:344 diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt1= .args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt1.args new file mode 100644 index 0000000000..4bebc2bcb1 --- /dev/null +++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt1.args @@ -0,0 +1,5 @@ +passt \ +--vhost-user \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net1.socket \ +--pid /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net1-passt.pid diff --git a/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt2= .args b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt2.args new file mode 100644 index 0000000000..35cd30a553 --- /dev/null +++ b/tests/qemuxmlconfdata/net-vhostuser-passt.x86_64-latest.passt2.args @@ -0,0 +1,6 @@ +passt \ +--vhost-user \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net2.socket \ +--pid /var/run/libvirt/qemu/passt/-1-QEMUGuest1-net2-passt.pid \ +--interface eth43 diff --git a/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64= -latest.passt0.args b/tests/qemuxmlconfdata/schema-reorder-domain-subelemen= ts.x86_64-latest.passt0.args new file mode 100644 index 0000000000..59574106e1 --- /dev/null +++ b/tests/qemuxmlconfdata/schema-reorder-domain-subelements.x86_64-latest= .passt0.args @@ -0,0 +1,7 @@ +passt \ +--vhost-user \ +--one-off \ +--socket /var/run/libvirt/qemu/passt/-1-passtvhostuu-net0.socket \ +--pid /var/run/libvirt/qemu/passt/-1-passtvhostuu-net0-passt.pid \ +--address 10.30.0.5 \ +--netmask 24 diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index dea75d805f..7280176de1 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -16,6 +16,7 @@ # include "qemu/qemu_capabilities.h" # include "qemu/qemu_domain.h" # include "qemu/qemu_migration.h" +# include "qemu/qemu_passt.h" # include "qemu/qemu_process.h" # include "qemu/qemu_slirp.h" # include "datatypes.h" @@ -803,6 +804,72 @@ testCompareOutXML2XML(const void *data) } =20 =20 +static int +testExtDeviceArgv(testQemuInfo *info, + virCommand *cmd, + const char *helper, + size_t idx) +{ + g_auto(virBuffer) actualBuf =3D VIR_BUFFER_INITIALIZER; + g_autofree char *actualargv =3D NULL; + g_autofree char *outfile =3D NULL; + virError *err =3D NULL; + + outfile =3D g_strdup_printf("%s/qemuxmlconfdata/%s%s%s.%s%zu.args", + abs_srcdir, info->name, info->suffix, + info->args.capsvariant, helper, idx); + testQemuConfMarkUsed(info, outfile); + + if (!cmd) { + err =3D virGetLastError(); + if (!err) { + VIR_TEST_DEBUG("no error was reported for expected failure"); + return -1; + } + return -1; + } + + if (virCommandToStringBuf(cmd, &actualBuf, true, false) < 0) + return -1; + + virBufferAddLit(&actualBuf, "\n"); + actualargv =3D virBufferContentAndReset(&actualBuf); + + if (virTestCompareToFileFull(actualargv, outfile, false) < 0) + return -1; + + return 0; +} + + +static int +testExtDevicesArgv(testQemuInfo *info, + virDomainObj *vm) +{ + size_t i =3D 42; + int ret =3D 0; + + for (i =3D 0; i < vm->def->nnets; i++) { + virDomainNetDef *net =3D vm->def->nets[i]; + + if (net->type !=3D VIR_DOMAIN_NET_TYPE_USER && + net->type !=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { + continue; + } + + if (net->backend.type =3D=3D VIR_DOMAIN_NET_BACKEND_PASST) { + g_autoptr(virCommand) cmd =3D NULL; + + cmd =3D qemuPasstBuildCommand(NULL, NULL, vm, net); + if (testExtDeviceArgv(info, cmd, "passt", i) < 0) + ret =3D -1; + } + } + + return ret; +} + + static int testCompareXMLToArgv(const void *data) { @@ -897,6 +964,9 @@ testCompareXMLToArgv(const void *data) if (virTestCompareToFileFull(actualargv, info->outfile, false) < 0) goto cleanup; =20 + if (testExtDevicesArgv(info, vm) < 0) + goto cleanup; + ret =3D 0; =20 ok: --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757419992; cv=none; d=zohomail.com; s=zohoarc; b=KAGJarjz4tGuBjXRCXw8+59dUOI9poT39ea2gY6K4g8jzoNa6eYvKz47z2cNqQE6x5pxBRTwNSCFJjS7k0wmBBmLj42QpHqNXAXRKch12Pfswpjs7ryHKfO0U1pSbfeGmDJ8Cho6ivKGalRLs0uNDpO4dvtAL1M0iDLB2w7hY9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757419992; 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=pIRQvvgPLc4FgC8LDJYRNcxAKhm54H2Xd6IzWz0Jehk=; b=YRqoFFtrXzCCGV7kt9F3YU/Z/fFbD74jNGhSHzBuQB1+bStL8+w+5tSW1twhmJX/No7WtPFGfMISlXeu6K9HJBz0/PnlLuIgQJwuMtgpQPI75s6laM2Gtb36itn6yp/WVTbdHnD687eMwB7kBIArxGKDXoHKaFhEl6qW17TAeOw= 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 1757419992210357.35091108498443; Tue, 9 Sep 2025 05:13:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5138241B72; Tue, 9 Sep 2025 08:13:11 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 14C6A41C8C; Tue, 9 Sep 2025 08:07:54 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A06AE41AE5; Tue, 9 Sep 2025 08:06:48 -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 AB6DF41AD9 for ; Tue, 9 Sep 2025 08:06:44 -0400 (EDT) Received: from mx-prod-mc-04.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-282-sErhCpreNhOjViZTGsB9hg-1; Tue, 09 Sep 2025 08:06:42 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 084A319560B3 for ; Tue, 9 Sep 2025 12:06:42 +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 59C801956095 for ; Tue, 9 Sep 2025 12:06:41 +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=1757419604; 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=pIRQvvgPLc4FgC8LDJYRNcxAKhm54H2Xd6IzWz0Jehk=; b=iKzsbULk1ekAWY0nhi4ve9U5uTFSs6Ui/1gHxRtP9oSF307LdRt8UrWBHP/mo2ymzdWT+1 PhtsWo053ySLMJN12h6dAIEpck9cZNBnIuQdvsv45Zuwu+b1QwgRUptMYKyjvP/HvFlLKB KXe0gnL9HWIVNU7HABeTiPsoIcM/hqg= X-MC-Unique: sErhCpreNhOjViZTGsB9hg-1 X-Mimecast-MFC-AGG-ID: sErhCpreNhOjViZTGsB9hg_1757419602 To: devel@lists.libvirt.org Subject: [libvirt PATCH 6/8] tests: qemuxmlconf: virtiofs: remove locking from the readonly test case Date: Tue, 9 Sep 2025 14:05:47 +0200 Message-ID: <95fa10972ddbe192d758c778a90f2ea511fe8600.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: EwZecXUNvb8m7HMRtqTpv-UiPJCQys_rgbLa6HoNSPg_1757419602 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 36NMWU2YJTU6IX5JEHLNFLED77WEU4O4 X-Message-ID-Hash: 36NMWU2YJTU6IX5JEHLNFLED77WEU4O4 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: 1757419993941116600 From: J=C3=A1n Tomko The combination of locking + readonly is bogus, because there has never been a virtiofsd release that supported both. Locking was a feature of the C-based virtiofsd that was living in the QEMU tree until v8.0.0 and the readonly feature was only introduced in the Rust version of virtiofsd. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- tests/qemuxmlconfdata/vhost-user-fs-readonly.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/qemuxmlconfdata/vhost-user-fs-readonly.xml b/tests/qemux= mlconfdata/vhost-user-fs-readonly.xml index c9c1e5c3d2..89a6616eec 100644 --- a/tests/qemuxmlconfdata/vhost-user-fs-readonly.xml +++ b/tests/qemuxmlconfdata/vhost-user-fs-readonly.xml @@ -30,7 +30,6 @@ - --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757420052; cv=none; d=zohomail.com; s=zohoarc; b=kUrd52MmCvykb7FE0HZAgF5pAwhfGNojrST1TleiQSbUcCwXh09m38I3bLh993OuRnAsyKVPTNOleU8nZyhvHN09LOFElUMpKoxI0TW7x0MSQy7q6M/5LK40wp3fgiOuQB02JLctstfP9rhvfJNnLp7yPZWabu9EWT9gBv1WK7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757420052; 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=5lOwMZyVu+KaDZ7F+jyQhNiOYHnX1UZZp5s5QucTrXU=; b=aO/5vtfy8zdZwdv/cSHPvrF32RAWIsacpjwVmtXdIhRqzCmN3CXlPPgppdgx5KtDQW/lbNf423Ifz/FJVs+ibb7xORdVDqbC2nNSaFSq1nMEOiTstpnFd51c519ZB11AL2QAFMSmJDw6iOUlJ2sd7RVw43yx3+QcPfJfQvsgdHA= 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 1757420052098257.9055047861814; Tue, 9 Sep 2025 05:14:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A51CC41897; Tue, 9 Sep 2025 08:14:10 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8AC7C43E75; Tue, 9 Sep 2025 08:08:04 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 0EBF041AE1; Tue, 9 Sep 2025 08:06:50 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 5FB6841AE7 for ; Tue, 9 Sep 2025 08:06:45 -0400 (EDT) Received: from mx-prod-mc-03.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-645-FP0JsPC3OC-8ORoppuakSQ-1; Tue, 09 Sep 2025 08:06:43 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0ACBB19541B2 for ; Tue, 9 Sep 2025 12:06:43 +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 663501956095 for ; Tue, 9 Sep 2025 12:06:42 +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=1757419605; 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=5lOwMZyVu+KaDZ7F+jyQhNiOYHnX1UZZp5s5QucTrXU=; b=S3PAKVOaoJd4gHZ7opt3tBZO0mRwhIbFq37etYXtHvPCIahLRNW13MXJ3jhtgh2mqHEkdU 5DacSOPB473/5tUprUWYncC8UaEgrhcg6malGsIuAwspvbayuUw5jo6g5KjlNfreRQ0ZOU uPEykf+lsUU4XV61nAQGngiKjOPQL9M= X-MC-Unique: FP0JsPC3OC-8ORoppuakSQ-1 X-Mimecast-MFC-AGG-ID: FP0JsPC3OC-8ORoppuakSQ_1757419603 To: devel@lists.libvirt.org Subject: [libvirt PATCH 7/8] tests: qemuxmlconftests: test virtiofsd command line too Date: Tue, 9 Sep 2025 14:05:48 +0200 Message-ID: <0d01200f3c3e5fdad0aa9651357e3fc4079255d1.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: TAbMERUH555GF2LriMpcsNdawPzPJIqrwIX0vxBkcxM_1757419603 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FYNQTS4EDMBPHNK7KOIJJZXKBZ46INLU X-Message-ID-Hash: FYNQTS4EDMBPHNK7KOIJJZXKBZ46INLU 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: 1757420054682124100 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- ...t-user-fs-ccw.s390x-latest.virtiofsd0.args | 3 ++ ...fs-fd-memory.x86_64-latest.virtiofsd0.args | 9 ++++++ ...fd-openfiles.x86_64-latest.virtiofsd0.args | 10 ++++++ ...fs-hugepages.x86_64-latest.virtiofsd0.args | 3 ++ ...fs-hugepages.x86_64-latest.virtiofsd1.args | 3 ++ ...-fs-readonly.x86_64-latest.virtiofsd0.args | 6 ++++ tests/qemuxmlconftest.c | 32 +++++++++++++++++++ 7 files changed, 66 insertions(+) create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.vi= rtiofsd0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-la= test.virtiofsd0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64= -latest.virtiofsd0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-la= test.virtiofsd0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-la= test.virtiofsd1.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-lat= est.virtiofsd0.args diff --git a/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.virtiofsd= 0.args b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.virtiofsd0.ar= gs new file mode 100644 index 0000000000..25567cc821 --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-ccw.s390x-latest.virtiofsd0.args @@ -0,0 +1,3 @@ +/usr/libexec/virtiofsd \ +--fd=3D1730 \ +--shared-dir /tmp diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.vi= rtiofsd0.args b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest= .virtiofsd0.args new file mode 100644 index 0000000000..e16a8aba8f --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-memory.x86_64-latest.virtiofsd= 0.args @@ -0,0 +1,9 @@ +/usr/libexec/qemu/vhost-user/test-virtiofsd \ +--fd=3D1730 \ +--shared-dir /path \ +--cache always \ +--sandbox chroot \ +--xattr \ +--thread-pool-size=3D16 \ +--uid-map=3D:0:100000:65535: \ +--gid-map=3D:0:100000:65535: diff --git a/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest= .virtiofsd0.args b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-= latest.virtiofsd0.args new file mode 100644 index 0000000000..fce94f454e --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-fd-openfiles.x86_64-latest.virtio= fsd0.args @@ -0,0 +1,10 @@ +/usr/libexec/qemu/vhost-user/test-virtiofsd \ +--fd=3D1730 \ +--shared-dir /path \ +--cache always \ +--sandbox chroot \ +--xattr \ +--thread-pool-size=3D16 \ +--rlimit-nofile=3D122333 \ +--uid-map=3D:0:100000:65535: \ +--gid-map=3D:0:100000:65535: diff --git a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.vi= rtiofsd0.args b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest= .virtiofsd0.args new file mode 100644 index 0000000000..591afe82ec --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.virtiofsd= 0.args @@ -0,0 +1,3 @@ +/usr/libexec/virtiofsd \ +--fd=3D1730 \ +--shared-dir /path diff --git a/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.vi= rtiofsd1.args b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest= .virtiofsd1.args new file mode 100644 index 0000000000..51cb30bf76 --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-hugepages.x86_64-latest.virtiofsd= 1.args @@ -0,0 +1,3 @@ +/usr/libexec/virtiofsd \ +--fd=3D1731 \ +--shared-dir /path diff --git a/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.vir= tiofsd0.args b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.v= irtiofsd0.args new file mode 100644 index 0000000000..53809e208e --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-readonly.x86_64-latest.virtiofsd0= .args @@ -0,0 +1,6 @@ +/usr/libexec/virtiofsd \ +--fd=3D1730 \ +--shared-dir /path \ +--cache always \ +--xattr \ +--readonly diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index 7280176de1..aaca9b6c05 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -19,6 +19,8 @@ # include "qemu/qemu_passt.h" # include "qemu/qemu_process.h" # include "qemu/qemu_slirp.h" +# include "qemu/qemu_virtiofs.h" +# include "qemu/qemu_vhost_user.h" # include "datatypes.h" # include "conf/storage_conf.h" # include "virfilewrapper.h" @@ -456,6 +458,21 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, vsockPriv->vhostfd =3D 6789; } =20 + for (i =3D 0; i < vm->def->nfss; i++) { + unsigned long long ver =3D 0; + virDomainFSDef *fs =3D vm->def->fss[i]; + + virStringParseVersion(&ver, info->args.capsver, false); + + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && !fs-= >sock) { + /* QEMU 8.0.0 was the first release without virtiofsd included= */ + if (ver !=3D 0 && ver < 8 * 1000 * 1000) + continue; + virBitmapSetBitExpand(fs->caps, QEMU_VHOST_USER_FS_FEATURE_SEP= ARATE_OPTIONS); + } + } + + for (i =3D 0; i < vm->def->ntpms; i++) { if (vm->def->tpms[i]->type !=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) continue; @@ -846,8 +863,10 @@ static int testExtDevicesArgv(testQemuInfo *info, virDomainObj *vm) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(QEMU_DOM= AIN_PRIVATE(vm)->driver); size_t i =3D 42; int ret =3D 0; + int fd; =20 for (i =3D 0; i < vm->def->nnets; i++) { virDomainNetDef *net =3D vm->def->nets[i]; @@ -866,6 +885,19 @@ testExtDevicesArgv(testQemuInfo *info, } } =20 + for (i =3D 0; i < vm->def->nfss; i++) { + virDomainFSDef *fs =3D vm->def->fss[i]; + + if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS && !fs-= >sock) { + g_autoptr(virCommand) cmd =3D NULL; + fd =3D 1730 + i; + + cmd =3D qemuVirtioFSBuildCommandLine(cfg, fs, &fd); + if (testExtDeviceArgv(info, cmd, "virtiofsd", i) < 0) + ret =3D -1; + } + } + return ret; } =20 --=20 2.50.1 From nobody Sun Oct 5 00:06:52 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=1757420119; cv=none; d=zohomail.com; s=zohoarc; b=IRuMPNI0PLcMM5/DBfrSZAB66tmH5fALwXraew1pZSz7XwqcGfhbb6q3EdmFkdSDuA0HxC1FYE/VSWw213EopKZiI84w34UMYa7DPTEns2PbKHHqrNaa+YEhpDaqA8OOWf86Wvd0FZpDzRa+hCz1j4UyB6BB/48FZ8KdFszPQvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757420119; 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=IrGJiGJ2KDxacZQHCxuT+58BfRQGWSwuTMWlHLxJ2gI=; b=TmPYS3O10eF0pP0sLYOG9dYgz4IGaqpbBEzXwehZgwxLEvjgDLpZ4bl0/OsMR8lc0Fonfs9uNnmBeuvI957ICP/zaTQkpMPlHZSgf+6FM99FtFayLsseQPIIWqEScVxZptvJqS8m7s6OxYgY3NrcatuKdwFloOK6OCtlGMsxX2c= 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 1757420119670854.24997063491; Tue, 9 Sep 2025 05:15:19 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id CC37E4187B; Tue, 9 Sep 2025 08:15:18 -0400 (EDT) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id A029541BC3; Tue, 9 Sep 2025 08:08:19 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3BAE541B08; Tue, 9 Sep 2025 08:06:54 -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 B0C2F41ADB for ; Tue, 9 Sep 2025 08:06:46 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-288-Fh0ueRVPPTWEgJSONxojPA-1; Tue, 09 Sep 2025 08:06:44 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DCF1180047F for ; Tue, 9 Sep 2025 12:06:44 +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 685B91956095 for ; Tue, 9 Sep 2025 12:06:43 +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=1757419606; 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=IrGJiGJ2KDxacZQHCxuT+58BfRQGWSwuTMWlHLxJ2gI=; b=NHz+u2gBQMl/2YphruM7scSluVQEYWZUApZ8XXytDedAEgfnJ3VlpY/8+aMQWiz22euNHL K6xwlqsh7eppClHYBP9fEPYd2VQOqe71UhjMbkFlTe43DQjz1F+L0PLnDQPrYBImkJgM2Y l3oBHcvYMao37tr/oB+/JKAhnyz+cHQ= X-MC-Unique: Fh0ueRVPPTWEgJSONxojPA-1 X-Mimecast-MFC-AGG-ID: Fh0ueRVPPTWEgJSONxojPA_1757419604 To: devel@lists.libvirt.org Subject: [libvirt PATCH 8/8] tests: qemuxmlconftest: test locking with older virtiofsd Date: Tue, 9 Sep 2025 14:05:49 +0200 Message-ID: <174d8f2e58adf7fe0cb07ef325100b4d32295e5a.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: ZCopzalrK3OkbNZX-PDOpixX9aEGnRRy8kam8-SIaSA_1757419604 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GFFBWKC4SHAJKJ5HXEAK3NZYANIQAFP6 X-Message-ID-Hash: GFFBWKC4SHAJKJ5HXEAK3NZYANIQAFP6 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: 1757420121534116600 From: J=C3=A1n Tomko Signed-off-by: J=C3=A1n Tomko Reviewed-by: Laine Stump --- .../vhost-user-fs-locking.x86_64-7.2.0.args | 35 ++++++++++++++ ...er-fs-locking.x86_64-7.2.0.virtiofsd0.args | 4 ++ .../vhost-user-fs-locking.x86_64-7.2.0.xml | 46 +++++++++++++++++++ .../qemuxmlconfdata/vhost-user-fs-locking.xml | 46 +++++++++++++++++++ tests/qemuxmlconftest.c | 1 + 5 files changed, 132 insertions(+) create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.= 0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.= 0.virtiofsd0.args create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.= 0.xml create mode 100644 tests/qemuxmlconfdata/vhost-user-fs-locking.xml diff --git a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args = b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args new file mode 100644 index 0000000000..ee8625dc0d --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.args @@ -0,0 +1,35 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/var/lib/libvirt/qemu/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dguest,debug-threads=3Don \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine pc-i440fx-7.2,usb=3Doff,dump-guest-core=3Doff \ +-accel kvm \ +-cpu qemu64 \ +-m size=3D14680064k \ +-overcommit mem-lock=3Doff \ +-smp 2,sockets=3D2,cores=3D1,threads=3D1 \ +-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/v= ar/lib/libvirt/qemu/ram/-1-guest/ram-node0","share":true,"size":15032385536= }' \ +-numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ +-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-chardev socket,id=3Dchr-vu-fs0,path=3D/var/lib/libvirt/qemu/domain--1-gue= st/fs0-fs.sock \ +-device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","= queue-size":1024,"tag":"mount_tag","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.virti= ofsd0.args b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.virti= ofsd0.args new file mode 100644 index 0000000000..c5db508e64 --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.virtiofsd0.a= rgs @@ -0,0 +1,4 @@ +/usr/libexec/virtiofsd \ +--fd=3D1730 \ +-o source=3D/path,cache=3Dalways,sandbox=3Dnamespace,xattr,flock,posix_loc= k \ +--thread-pool-size=3D16 diff --git a/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.xml b= /tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.xml new file mode 100644 index 0000000000..5909939ec3 --- /dev/null +++ b/tests/qemuxmlconfdata/vhost-user-fs-locking.x86_64-7.2.0.xml @@ -0,0 +1,46 @@ + + guest + 126f2720-6f8e-45ab-a886-ec9277079a67 + 14680064 + 14680064 + + + + + 2 + + hvm + + + + qemu64 + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + + + + + +
+ + + +