From nobody Sat Oct 24 20:22:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; 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 38.145.34.151 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=1792134224; cv=none; d=zohomail.com; s=zohoarc; b=fY9/juMRJHFMVurC++R8p+c+DIuPq35oHOxdMvFKkU/3/IUl5Mtn/sLNt3l+miQHBmHyT6Ct10YLGvMfA9nrdjxVbQAfjMC+vKqEbek/8BwMysdWIaacNHgCOm6pJV9JwfNMQuYOQX9WMZ5bml9rPHGe91XiSGPApg+nwgxjy5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1792134224; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=amhLzjypAILdzf2YD/0SSjkNe+/8qU81OOVi2N+1GeM=; b=mkO2GTHk6KpPAaGYXbXtkVIHysE9MQGnJ8+7z26Bv9P8mJyaeKtFeQHbx8dF0DpX0yePfcO1uNJ+uZ4gAeMqukTjgOh0aEGpmbKXhbJzA8hpTned7sxmggLPZRVGsiFZwU0dVgpLP0/7p6/lARBs47hkMw4P98N0eZpdqJ88khU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 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 [38.145.34.151]) by mx.zohomail.com with SMTPS id 1792134224950853.1087134078587; Fri, 16 Oct 2026 00:03:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 3FAD6419DB; Fri, 16 Oct 2026 03:03:43 -0400 (EDT) Received: from [172.19.199.16] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id AA8ED41B7B; Fri, 16 Oct 2026 03:01:00 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id CBF2D41966; Fri, 16 Oct 2026 03:00:51 -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 A99F93F336 for ; Fri, 16 Oct 2026 03:00:49 -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-84-donyNJ25PM-CD8J9zhCpuA-1; Fri, 16 Oct 2026 07:00:46 +0000 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 E652F1956074 for ; Fri, 16 Oct 2026 07:00:45 +0000 (UTC) Received: from mprivozn-thinkpadt14gen4.tpbc.csb (unknown [10.43.3.180]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 53B7F3000B4E for ; Fri, 16 Oct 2026 07:00:45 +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=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1792134048; 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; bh=amhLzjypAILdzf2YD/0SSjkNe+/8qU81OOVi2N+1GeM=; b=IEdEO679inGo8SovmSCYM3/kL1pSLv4Alt9lQTpXAOx/roBDzUOfsuAeSbH7FQzI1AaV/n 8k3HWpwVOSgwAMF1odCrO7dBY+p7ipIt3Xuj0DGkh2QCHblHOvjaSaZD6dBPSWBnUpHIKm dVmpDLlq8i+WvlczE2bx9DAinKALQcE= X-MC-Unique: donyNJ25PM-CD8J9zhCpuA-1 X-Mimecast-MFC-AGG-ID: donyNJ25PM-CD8J9zhCpuA_1792134046 To: devel@lists.libvirt.org Subject: [PATCH] tests: Model qemuInterfaceOpenVhostNet() mock more closely to its source Date: Fri, 16 Oct 2026 09:00:42 +0200 Message-ID: <581ec59aab73a452fe1331dc78d5502430845332.1792134042.git.mprivozn@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -KwosS_RPv0fS3gJD2CJdJ0qQnKqFEsuD8eyS3KdiGI_1792134046 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3IS55ORI5JHLHKC6EQEL5GRCYW6SAAN6 X-Message-ID-Hash: 3IS55ORI5JHLHKC6EQEL5GRCYW6SAAN6 X-MailFrom: mprivozn@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: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1792134229543158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik Inside of qemuxml2argvmock.c there's an alternative implementation of qemuInterfaceOpenVhostNet(). Fair enough. But the original function (living in qemu_interface.c) has a check which exits early from the function. This check is lacking in the mock which then leads qemuxmlconftest generate a different cmd line than the production code. The is particularly important, when the check is changed and we want to verify through tests that it doesn't break anything. Signed-off-by: Michal Privoznik Reviewed-by: Martin Kletzander --- tests/qemuxml2argvmock.c | 7 ++++++- tests/qemuxmlconfdata/downscript.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args | 6 +++--- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-midonet.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-mtu.x86_64-latest.args | 4 ++-- .../net-virtio-network-portgroup.x86_64-latest.args | 2 +- .../net-virtio-teaming-network.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args | 6 +++--- .../qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args | 2 +- tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args | 2 +- 12 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index 4f47b2598e..7b211a191d 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -222,13 +222,18 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *pa= th G_GNUC_UNUSED, } =20 int -qemuInterfaceOpenVhostNet(virDomainObj *vm G_GNUC_UNUSED, +qemuInterfaceOpenVhostNet(virDomainObj *vm, virDomainNetDef *net) { qemuDomainNetworkPrivate *netpriv =3D QEMU_DOMAIN_NETWORK_PRIVATE(net); size_t vhostfdSize =3D net->driver.virtio.queues; size_t i; =20 + if (vm->def->virtType !=3D VIR_DOMAIN_VIRT_KVM || + net->driver.virtio.name =3D=3D VIR_DOMAIN_NET_DRIVER_TYPE_QEMU) { + return 0; + } + if (!vhostfdSize) vhostfdSize =3D 1; =20 diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index 6ee1d402b5..177b700f0f 100644 --- a/tests/qemuxmlconfdata/downscript.x86_64-latest.args +++ b/tests/qemuxmlconfdata/downscript.x86_64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs1,path=3D/export/fs2 \ -device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ --netdev '{"type":"tap","fd":"@tap-vnet0-fd@","vhost":true,"vhostfd":"@vhos= tfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:f6:66:88","bus":"pci.0","addr":"0xb"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index 688a19f91a..30a6cfcc87 100644 --- a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args @@ -33,11 +33,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"@iface-net2-fd@","vhost":true,"vhostfd":"@vho= stfd-net2-fd@","id":"hostnet2"}' \ +-netdev '{"type":"tap","fd":"@iface-net2-fd@","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "52:54:00:e5:48:60","bus":"pci.0","addr":"0x5"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args= b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args index 902b70d17f..2cc2e53dc4 100644 --- a/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-unmanaged-tap.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@tap-mytap0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@tap-mytap0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "fe:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args b/t= ests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args index fcb202cd23..4f2833ca69 100644 --- a/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-isolated-port.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-q35-tes= t/.config \ -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","drive":"libvirt-1-storage","id"= :"sata0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d6:c0:0b","bus":"pci.1","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":33554432,"vram64_size_mb":0,"vgamem_mb":8,"bus":"pcie.0","= addr":"0x1"}' \ diff --git a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args b/tests/q= emuxmlconfdata/net-midonet.x86_64-latest.args index 13bc83b4cb..f87a2df60c 100644 --- a/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-midonet.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args b/tests/qemux= mlconfdata/net-mtu.x86_64-latest.args index 922552cd8b..51f5d8383c 100644 --- a/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-mtu.x86_64-latest.args @@ -33,9 +33,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","host_mtu":1500,"netdev":"hostnet0","i= d":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","sndbuf":1600,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","sndbuf":1600,"id":"hostnet1= "}' \ -device '{"driver":"virtio-net-pci","host_mtu":9000,"netdev":"hostnet1","i= d":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index e45b7b330e..5d9182c324 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-net0-fd@","vhost":true,"vhostfd":"@vho= stfd-net0-fd@","id":"hostnet0"}' \ +-netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \ -netdev '{"type":"tap","fd":"@iface-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest= .args b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args index ffaf2aa911..a798c184b1 100644 --- a/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-teaming-network.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","read-only":false}' \ -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-0-0","bootindex":1}' \ --netdev '{"type":"tap","fd":"@iface-ua-backup0-fd@","vhost":true,"vhostfd"= :"@vhostfd-ua-backup0-fd@","id":"hostua-backup0"}' \ +-netdev '{"type":"tap","fd":"@iface-ua-backup0-fd@","id":"hostua-backup0"}= ' \ -device '{"driver":"virtio-net-pci","failover":true,"netdev":"hostua-backu= p0","id":"ua-backup0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"vfio-pci","host":"0000:06:12.2","id":"hostdev0","failo= ver_pair_id":"ua-backup0","bus":"pci.0","addr":"0x3"}' \ diff --git a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args b/te= sts/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args index da1c3a3d76..3b9dc09aec 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/= .config \ -boot menu=3Don,strict=3Don \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ --netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"@tap-vnet0-fd@","vhost":true,"vhostfd":"@vhos= tfd-net1-fd@","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@tap-vnet0-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"netdev":"hostnet1","= id":"net1","mac":"52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet2"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","id":"hostnet2"}' \ -device '{"driver":"virtio-net-pci","ioeventfd":true,"mq":true,"vectors":1= 2,"netdev":"hostnet2","id":"net2","mac":"52:54:00:e5:48:5a","bus":"pci.0","= addr":"0x4"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index 2a9229f3f6..326528eea4 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ -netdev '{"type":"tap","fd":"@iface-net0-fd@","id":"hostnet0"}' \ -device '{"driver":"e1000","netdev":"hostnet0","id":"net0","mac":"52:54:00= :e5:48:58","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"@iface-net1-fd@","vhost":true,"vhostfd":"@vho= stfd-net1-fd@","id":"hostnet1"}' \ +-netdev '{"type":"tap","fd":"@iface-net1-fd@","id":"hostnet1"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:e5:48:59","bus":"pci.0","addr":"0x3"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args b/tests/qem= uxmlconfdata/tap-vhost.x86_64-latest.args index 3b36e2f6ce..91ce5e170f 100644 --- a/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost.x86_64-latest.args @@ -33,7 +33,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","read-only":true}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-stor= age","id":"ide0-1-0","bootindex":1}' \ --netdev '{"type":"tap","fds":"XXXXXXX","vhost":true,"vhostfds":"XXXXXXX","= id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"XXXXXXX","id":"hostnet0"}' \ -device '{"driver":"virtio-net-pci","mq":true,"vectors":12,"netdev":"hostn= et0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ --=20 2.56.0