From nobody Sun Feb 8 17:41:55 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=1633504602; cv=none; d=zohomail.com; s=zohoarc; b=BfX5reGoTY9etbdethb+0b381fKu1Rft66eRMnalitayK684FepyE+4nfmjBBqdhhmysV5TiS7R/9etm+5x6JM1tl1XhWhVs2JQt+xB7G7e2hxaDn6LOcKaa0dmiaWxwJ1Mayq7ehxUQWZr8oeB8rAbvR64kx+6iyEcaKAGxvs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633504602; 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=i/mIQNsgakWMabVgqyrLXEQonAPtHhHkjbaXmdLw75U=; b=ftuE4b+9EI7kwk+RVLx+zChxaPD3fztR2l8MrxPZxOdDFjUarcur0FW8NHrczLutn8o6BOAoXHJ5xMMMpFrznUZTaiJZyrSdx0yT9bYiIM2yO8JTz0OYesn3x247xp/ucVJXZwFsvQW8B/yFD/yzFXwXfv1EIBtZUhHaUJdiAsY= 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 163350460207439.72623165247376; Wed, 6 Oct 2021 00:16:42 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-378-SudgbUO-Pz6e9nTARzRo2g-1; Wed, 06 Oct 2021 03:16:37 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9FC510151E1; Wed, 6 Oct 2021 07:16:32 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8075E1972E; Wed, 6 Oct 2021 07:16:32 +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 4EC3318199EE; Wed, 6 Oct 2021 07:16:32 +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 1967Fhki007455 for ; Wed, 6 Oct 2021 03:15:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC80760622; Wed, 6 Oct 2021 07:15:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3924460853 for ; Wed, 6 Oct 2021 07:15:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633504601; 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=i/mIQNsgakWMabVgqyrLXEQonAPtHhHkjbaXmdLw75U=; b=hOIyeXs7Gp9Vp8UDIYANRCusgnIsD+XGnMwvgTfZhN+NJLl1M9yw2k6z4KrnFMQOCYOYCp ernfP4Nx6DVuWdCcOro3e6rYGCCPb79cuJvK0Q/kY6D6KXi/H8/z9mbGoWKMMnSmjTm2Rh UCpY++Tljw5sMnIMECnjUt7FmrUn+SI= X-MC-Unique: SudgbUO-Pz6e9nTARzRo2g-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 05/16] tests: qemuxml2argvtest: fix path to virtiofs socket Date: Wed, 6 Oct 2021 09:15:11 +0200 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.84 on 10.5.11.23 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633504602722100002 The mocked path in the test suite is not in sync with what libvirtd generates. Signed-off-by: J=C3=A1n Tomko --- .../qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- .../qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args | 2 +- tests/qemuxml2argvtest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index 7586a8edbf..8adab6da81 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0.vhost-= fs.sock \ +-chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ -device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,queue-size=3D1024,= tag=3Dmount_tag,bus=3Dpci.0,addr=3D0x2 \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index 290d0b9e2f..4158456744 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ -device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ --chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0.vhost-= fs.sock \ +-chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ -device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,tag=3Dmount_tag,bo= otindex=3D2,bus=3Dpci.1,addr=3D0x0 \ -audiodev id=3Daudio1,driver=3Dnone \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 94aaa2f53e..e35380293c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -444,7 +444,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriver *drv, QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock) continue; =20 - s =3D g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu.vhost-fs.soc= k", i); + s =3D g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu-fs.sock", i); QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock =3D s; } =20 --=20 2.31.1