From nobody Mon Feb 9 01:48:28 2026 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=1770402619; cv=none; d=zohomail.com; s=zohoarc; b=PImb8bPVAcdK14owHMA73iDPt5YpYoKXKzIz4c0+6/CCx40YjasBjdjOtazBmQmfTrzhEc9Wgu4dCtfrQGm52xof3ueuV3c8fB1XJsV+FW3e6CZ96of5B5bzUU9qVL/JaqKbqMyY78MY/4IlPDhQzUYNd0Ad4yVeaAyTa5eAX3g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770402619; 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=+GgJS8CNV3Jj/yh+ZUFSCCqTNAOLxzpJSwfssEz4V3c=; b=QL15Gt1zUTems5msA0Mu5+XzUE/jdzYDUARGOld03hK4xLZJLoyC7/1XpcPuGyz9M6GXNDXoNGQddqiD3azltKLKZppD8tQ7YVGP61aQzX83nBFF46VwuCFjaRsLjK8PZl5PRRXrtz55U6zjjPjMCuFUxamOiBOXOGu3jLg/oVw= 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 1770402619168375.3192076413286; Fri, 6 Feb 2026 10:30:19 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 01D0341AED; Fri, 6 Feb 2026 13:30:18 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 11DAA41BCE; Fri, 6 Feb 2026 13:27:47 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id CCC0A3F350; Fri, 6 Feb 2026 13:27:41 -0500 (EST) 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 BE6FF417D0 for ; Fri, 6 Feb 2026 13:27:40 -0500 (EST) 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-483-7ckZacZHMBKGfEzy3TXSgw-1; Fri, 06 Feb 2026 13:27:38 -0500 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 1C39218004BB for ; Fri, 6 Feb 2026 18:27:38 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.3]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0B1D019560B8 for ; Fri, 6 Feb 2026 18:27: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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, 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=1770402460; 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=+GgJS8CNV3Jj/yh+ZUFSCCqTNAOLxzpJSwfssEz4V3c=; b=bvcVm9HysqORG3ZTdEAUEvZalMxJrNK3CsXN1V3lsf+IrmV9n5AkfKofSMhTgc2Hln7DcM 3EGm5+p68QsfiIantxR5QJXEAlXfVXluMHCPWqFIr5KmtCsuEDtWUqBAvgUclAqK7tLDVr z/EvrqiKGSiAm514z9vm0DZ0TmW8zNw= X-MC-Unique: 7ckZacZHMBKGfEzy3TXSgw-1 X-Mimecast-MFC-AGG-ID: 7ckZacZHMBKGfEzy3TXSgw_1770402458 To: devel@lists.libvirt.org Subject: [PATCH 1/2] qemuBuildHostNetProps: Use only plural form of 'fds' and 'vhostfds' properties Date: Fri, 6 Feb 2026 19:27:33 +0100 Message-ID: <51e9908ee03133642ed5750f7c36bb89ec40141f.1770402355.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: PhHWrC6ksIyFgG7K8TluXk9tYfId_Mf5p62TeimwhIg_1770402458 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QMIVQIGXQERVKXTHEPKZCJ4NEANVKST7 X-Message-ID-Hash: QMIVQIGXQERVKXTHEPKZCJ4NEANVKST7 X-MailFrom: pkrempa@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: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1770402624485154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa QEMU historically supported 'fd' and 'vhostfd' for one FD and plural form for multiple FDs. As of qemu commit TBD-XXXXXXXXX the singular forms are deprecated. Based on the guidance from the qemu team, it's okay to use 'fds' and 'vhostfds' even on older qemu versions provided that they are always used together. XXX: ^^^^ verify claim --- src/qemu/qemu_command.c | 24 ++++--------------- .../downscript.x86_64-latest.args | 2 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- .../net-bandwidth.x86_64-latest.args | 2 +- .../net-bandwidth2.x86_64-latest.args | 2 +- .../net-coalesce.x86_64-latest.args | 6 ++--- .../net-eth-hostip.x86_64-latest.args | 2 +- .../net-eth-ifname.x86_64-latest.args | 2 +- .../net-eth-names.x86_64-latest.args | 4 ++-- .../net-eth-unmanaged-tap.x86_64-latest.args | 2 +- .../net-eth.x86_64-latest.args | 2 +- .../net-isolated-port.x86_64-latest.args | 2 +- .../net-midonet.x86_64-latest.args | 2 +- .../net-mtu.x86_64-latest.args | 4 ++-- .../net-openvswitch.x86_64-latest.args | 2 +- ...irtio-network-portgroup.x86_64-latest.args | 6 ++--- ...-virtio-teaming-network.x86_64-latest.args | 2 +- .../net-virtio-vhost.x86_64-latest.args | 2 +- .../tap-vhost-incorrect.x86_64-latest.args | 4 ++-- .../user-aliases.x86_64-latest.args | 2 +- 20 files changed, 30 insertions(+), 46 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ca6779a6ea..c1d27e4edb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3951,24 +3951,14 @@ qemuBuildHostNetProps(virDomainObj *vm, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_ETHERNET: { g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - /* for one tapfd/vhostfd 'fd=3D' shall be used, for more use 'fds= =3D' */ - const char *tapfd_field =3D "s:fd"; g_autofree char *tapfd_arg =3D NULL; - const char *vhostfd_field =3D "S:vhostfd"; g_autofree char *vhostfd_arg =3D NULL; bool vhost =3D false; - size_t nfds; GSList *n; if (netpriv->tapfds) { - nfds =3D 0; - for (n =3D netpriv->tapfds; n; n =3D n->next) { + for (n =3D netpriv->tapfds; n; n =3D n->next) virBufferAsprintf(&buf, "%s:", qemuFDPassDirectGetPath(n->= data)); - nfds++; - } - - if (nfds > 1) - tapfd_field =3D "s:fds"; } virBufferTrim(&buf, ":"); @@ -3977,14 +3967,8 @@ qemuBuildHostNetProps(virDomainObj *vm, if (netpriv->vhostfds) { vhost =3D true; - nfds =3D 0; - for (n =3D netpriv->vhostfds; n; n =3D n->next) { + for (n =3D netpriv->vhostfds; n; n =3D n->next) virBufferAsprintf(&buf, "%s:", qemuFDPassDirectGetPath(n->= data)); - nfds++; - } - - if (nfds > 1) - vhostfd_field =3D "s:vhostfds"; } virBufferTrim(&buf, ":"); @@ -3992,9 +3976,9 @@ qemuBuildHostNetProps(virDomainObj *vm, if (virJSONValueObjectAdd(&netprops, "s:type", "tap", - tapfd_field, tapfd_arg, + "s:fds", tapfd_arg, "B:vhost", vhost, - vhostfd_field, vhostfd_arg, + "S:vhostfds", vhostfd_arg, NULL) < 0) return NULL; diff --git a/tests/qemuxmlconfdata/downscript.x86_64-latest.args b/tests/qe= muxmlconfdata/downscript.x86_64-latest.args index 9fe2838b75..069003fe8a 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":"3","vhost":true,"vhostfd":"44","id":"hostnet0= "}' \ +-netdev '{"type":"tap","fds":"3","vhost":true,"vhostfds":"44","id":"hostne= t0"}' \ -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/graphics-spice-timeout.x86_64-latest.arg= s b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args index 40506328d4..7871db93a6 100644 --- a/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxmlconfdata/graphics-spice-timeout.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14/.co= nfig \ -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","fd":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ -device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args b/tests= /qemuxmlconfdata/net-bandwidth.x86_64-latest.args index 5fbe15c64f..77da450eb0 100644 --- a/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth.x86_64-latest.args @@ -32,7 +32,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/Fedora-14-x86_64-L= ive-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":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"102","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args b/test= s/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args index f3a6b80ec3..e077158343 100644 --- a/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-bandwidth2.x86_64-latest.args @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-f14-60/= .config \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14-6.img"= ,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":2}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"102","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:24:a5:9f","bus":"pci.0","addr":"0x7"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ diff --git a/tests/qemuxmlconfdata/net-coalesce.x86_64-latest.args b/tests/= qemuxmlconfdata/net-coalesce.x86_64-latest.args index dafd237ea4..8edca659c5 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":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net0"}' \ -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":"102","vhost":true,"vhostfd":"44","id":"hostne= t1"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net1"}' \ -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":"102","vhost":true,"vhostfd":"44","id":"hostne= t2"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net2"}' \ -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-hostip.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args index 6ffc956ab1..84764462c0 100644 --- a/tests/qemuxmlconfdata/net-eth-hostip.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-hostip.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":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00: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-eth-ifname.x86_64-latest.args b/test= s/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args index 6ffc956ab1..84764462c0 100644 --- a/tests/qemuxmlconfdata/net-eth-ifname.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-ifname.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":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00: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-eth-names.x86_64-latest.args b/tests= /qemuxmlconfdata/net-eth-names.x86_64-latest.args index 44e9aa530f..26a659404b 100644 --- a/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth-names.x86_64-latest.args @@ -29,9 +29,9 @@ 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":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:= 22:33:44:55","bus":"pci.0","addr":"0x2"}' \ --netdev '{"type":"tap","fd":"3","id":"hostnet1"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet1"}' \ -device '{"driver":"e1000","netdev":"hostnet1","id":"net1","mac":"00:11:22= :33:44:56","bus":"pci.0","addr":"0x3"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ 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 a7b163bcf5..f97f387f9f 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":"3","vhost":true,"vhostfd":"44","id":"hostnet0= "}' \ +-netdev '{"type":"tap","fds":"3","vhost":true,"vhostfds":"44","id":"hostne= t0"}' \ -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-eth.x86_64-latest.args b/tests/qemux= mlconfdata/net-eth.x86_64-latest.args index 6ffc956ab1..84764462c0 100644 --- a/tests/qemuxmlconfdata/net-eth.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-eth.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":"3","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"3","id":"hostnet0"}' \ -device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00: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 c9ebe3f515..11c34ff32e 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":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net0"}' \ -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 b5124ac967..9adf34c80c 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":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net0"}' \ -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 db4a20b36a..547ce5669f 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":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net0"}' \ -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":"102","vhost":true,"vhostfd":"44","sndbuf":160= 0,"id":"hostnet1"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","sndbuf":1= 600,"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-openvswitch.x86_64-latest.args b/tes= ts/qemuxmlconfdata/net-openvswitch.x86_64-latest.args index 95aaefd139..b5ae0e3bae 100644 --- a/tests/qemuxmlconfdata/net-openvswitch.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-openvswitch.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":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"102","id":"hostnet0"}' \ -device '{"driver":"rtl8139","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-virtio-network-portgroup.x86_64-late= st.args b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.= args index d2ccde705b..90536081fd 100644 --- a/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-network-portgroup.x86_64-latest.args @@ -29,11 +29,11 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUG= uest1/.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":"102","vhost":true,"vhostfd":"44","id":"hostne= t0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net0"}' \ -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":"102","id":"hostnet1"}' \ +-netdev '{"type":"tap","fds":"102","id":"hostnet1"}' \ -device '{"driver":"rtl8139","netdev":"hostnet1","id":"net1","mac":"10:11:= 22:33:44:55","bus":"pci.0","addr":"0x3"}' \ --netdev '{"type":"tap","fd":"102","id":"hostnet2"}' \ +-netdev '{"type":"tap","fds":"102","id":"hostnet2"}' \ -device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"22:11:= 22:33:44:55","bus":"pci.0","addr":"0x4"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ 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 0c07ec4c70..b614dfb87f 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":"102","vhost":true,"vhostfd":"44","id":"hostua= -backup0"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= ua-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":"0001:02:03.4","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 eabe768169..1c2f965307 100644 --- a/tests/qemuxmlconfdata/net-virtio-vhost.x86_64-latest.args +++ b/tests/qemuxmlconfdata/net-virtio-vhost.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","fds":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46= :47:48","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":"3","vhost":true,"vhostfd":"44","id":"hostnet1= "}' \ +-netdev '{"type":"tap","fds":"3","vhost":true,"vhostfds":"44","id":"hostne= t1"}' \ -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":"3:4:5:6:7","vhost":true,"vhostfds":"44:45:46= :47:48","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"}' \ diff --git a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args b= /tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args index f43f75d709..e1ebc3f8cf 100644 --- a/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args +++ b/tests/qemuxmlconfdata/tap-vhost-incorrect.x86_64-latest.args @@ -28,9 +28,9 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c= onfig \ -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","fd":"102","id":"hostnet0"}' \ +-netdev '{"type":"tap","fds":"102","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":"102","vhost":true,"vhostfd":"44","id":"hostne= t1"}' \ +-netdev '{"type":"tap","fds":"102","vhost":true,"vhostfds":"44","id":"host= net1"}' \ -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/user-aliases.x86_64-latest.args b/tests/= qemuxmlconfdata/user-aliases.x86_64-latest.args index c07100ae54..a4184db613 100644 --- a/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args +++ b/tests/qemuxmlconfdata/user-aliases.x86_64-latest.args @@ -49,7 +49,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-gentoo/= .config \ -device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-2-format","id":"ua-myEncryptedDisk1"}' \ -blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-mini= mal-20140619.iso","node-name":"libvirt-1-storage","read-only":true,"cache":= {"direct":true,"no-flush":false}}' \ -device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive"= :"libvirt-1-storage","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cach= e":"on"}' \ --netdev '{"type":"tap","fd":"3","vhost":true,"vhostfd":"44","id":"hostua-C= heckoutThisNIC"}' \ +-netdev '{"type":"tap","fds":"3","vhost":true,"vhostfds":"44","id":"hostua= -CheckoutThisNIC"}' \ -device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id"= :"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}= ' \ -netdev '{"type":"socket","listen":"127.0.0.1:1234","id":"hostua-WeCanAlso= DoServerMode"}' \ -device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":= "ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"= 0x9"}' \ --=20 2.53.0