From nobody Wed May 14 12:37:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522415792579496.9641211784482; Fri, 30 Mar 2018 06:16:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8D3EC045758; Fri, 30 Mar 2018 13:16:30 +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 ADE8B17D2D; Fri, 30 Mar 2018 13:16:30 +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 560C6181BA06; Fri, 30 Mar 2018 13:16:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2UDGBax010408 for ; Fri, 30 Mar 2018 09:16:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C3341C710; Fri, 30 Mar 2018 13:16:11 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0F58A63537 for ; Fri, 30 Mar 2018 13:16:10 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 30 Mar 2018 15:15:22 +0200 Message-Id: <0efbbfd5f84585c76f82a30a6721764ce93f82f2.1522415592.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/44] Deprecate QEMU_CAPS_NETDEV 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 30 Mar 2018 13:16:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 This makes qemuDomainSupportsNetdev identical to qemuDomainSupportsNicdev and leaves some code in qemuDomainAttachNetDevice to be cleaned up later. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_hotplug.c | 120 +++++----------- src/qemu/qemu_process.c | 6 - tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - .../aarch64-aavmf-virtio-mmio.args | 4 +- tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 4 +- .../aarch64-video-virtio-gpu-pci.args | 6 +- .../aarch64-virt-2.6-virtio-pci-default.args | 5 +- .../qemuxml2argvdata/aarch64-virt-default-nic.args | 4 +- tests/qemuxml2argvdata/aarch64-virt-virtio.args | 4 +- .../aarch64-virtio-pci-default.args | 5 +- .../aarch64-virtio-pci-manual-addresses.args | 10 +- tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 4 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 4 +- tests/qemuxml2argvdata/boot-complex-bootindex.args | 11 +- tests/qemuxml2argvdata/boot-complex.args | 10 +- tests/qemuxml2argvdata/boot-order.args | 6 +- tests/qemuxml2argvdata/boot-strict.args | 11 +- tests/qemuxml2argvdata/controller-order.args | 5 +- tests/qemuxml2argvdata/disk-copy_on_read.args | 6 +- tests/qemuxml2argvdata/disk-ioeventfd.args | 4 +- tests/qemuxml2argvdata/event_idx.args | 6 +- tests/qemuxml2argvdata/graphics-spice-timeout.args | 5 +- .../qemuxml2argvdata/intel-iommu-caching-mode.args | 5 +- .../machine-loadparm-multiple-disks-nets-s390.args | 11 +- .../machine-loadparm-net-s390.args | 6 +- tests/qemuxml2argvdata/net-client.args | 5 +- tests/qemuxml2argvdata/net-eth-hostip.args | 5 +- tests/qemuxml2argvdata/net-eth-ifname.args | 5 +- tests/qemuxml2argvdata/net-eth-names.args | 9 +- tests/qemuxml2argvdata/net-eth.args | 5 +- tests/qemuxml2argvdata/net-mcast.args | 5 +- tests/qemuxml2argvdata/net-server.args | 5 +- tests/qemuxml2argvdata/net-udp.args | 6 +- tests/qemuxml2argvdata/net-user.args | 5 +- tests/qemuxml2argvdata/net-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/net-virtio-device.args | 6 +- .../net-virtio-disable-offloads.args | 4 +- .../qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 6 +- tests/qemuxml2argvdata/net-virtio-s390.args | 4 +- tests/qemuxml2argvdata/net-virtio.args | 5 +- tests/qemuxml2argvdata/pci-bridge.args | 151 +++++++++++------= --- tests/qemuxml2argvdata/pci-expander-bus.args | 151 +++++++++++------= --- tests/qemuxml2argvdata/pci-rom.args | 12 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 155 ++++++++++++-----= ---- tests/qemuxml2argvdata/q35-pci-force-address.args | 5 +- tests/qemuxml2argvdata/user-aliases.args | 18 +-- tests/qemuxml2argvdata/virtio-lun.args | 5 +- tests/qemuxml2argvdata/virtio-options.args | 6 +- tests/qemuxml2argvtest.c | 20 +-- tests/qemuxml2xmltest.c | 8 +- 79 files changed, 454 insertions(+), 458 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50f656e26..f51364e58 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3637,7 +3637,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_SERIAL); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 32527ce78..532024e72 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -87,7 +87,7 @@ typedef enum { X_QEMU_CAPS_DEVICE, /* Is the -device arg available */ QEMU_CAPS_SDL, /* Is the new -sdl arg available */ X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */ - QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ + X_QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */ =20 /* 30 */ QEMU_CAPS_RTC, /* The -rtc flag for clock options */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 580e0f830..6b22f9dc3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9111,12 +9111,12 @@ qemuDomainSupportsNicdev(virDomainDefPtr def, =20 bool qemuDomainSupportsNetdev(virDomainDefPtr def, - virQEMUCapsPtr qemuCaps, + virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, virDomainNetDefPtr net) { if (!qemuDomainSupportsNicdev(def, net)) return false; - return virQEMUCapsGet(qemuCaps, QEMU_CAPS_NETDEV); + return true; } =20 bool diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 49af4d4ff..7f5c68e0c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1029,18 +1029,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, =20 releaseaddr =3D true; =20 - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - vlan =3D -1; - } else { - vlan =3D qemuDomainNetVLAN(net); - - if (vlan < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Unable to attach network devices without vla= n")); - goto cleanup; - } - } - + vlan =3D -1; if (VIR_ALLOC_N(tapfdName, tapfdSize) < 0 || VIR_ALLOC_N(vhostfdName, vhostfdSize) < 0) goto cleanup; @@ -1055,19 +1044,11 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, goto cleanup; } =20 - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - if (!(netstr =3D qemuBuildHostNetStr(net, driver, - ',', -1, - tapfdName, tapfdSize, - vhostfdName, vhostfdSize))) - goto cleanup; - } else { - if (!(netstr =3D qemuBuildHostNetStr(net, driver, - ' ', vlan, - tapfdName, tapfdSize, - vhostfdName, vhostfdSize))) - goto cleanup; - } + if (!(netstr =3D qemuBuildHostNetStr(net, driver, + ',', -1, + tapfdName, tapfdSize, + vhostfdName, vhostfdSize))) + goto cleanup; =20 qemuDomainObjEnterMonitor(driver, vm); =20 @@ -1080,25 +1061,14 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, charDevPlugged =3D true; } =20 - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - if (qemuMonitorAddNetdev(priv->mon, netstr, - tapfd, tapfdName, tapfdSize, - vhostfd, vhostfdName, vhostfdSize) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - virDomainAuditNet(vm, NULL, net, "attach", false); - goto try_remove; - } - netdevPlugged =3D true; - } else { - if (qemuMonitorAddHostNetwork(priv->mon, netstr, - tapfd, tapfdName, tapfdSize, - vhostfd, vhostfdName, vhostfdSize) <= 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - virDomainAuditNet(vm, NULL, net, "attach", false); - goto try_remove; - } - hostPlugged =3D true; + if (qemuMonitorAddNetdev(priv->mon, netstr, + tapfd, tapfdName, tapfdSize, + vhostfd, vhostfdName, vhostfdSize) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + virDomainAuditNet(vm, NULL, net, "attach", false); + goto try_remove; } + netdevPlugged =3D true; =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; @@ -1129,15 +1099,10 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, } else { qemuDomainObjEnterMonitor(driver, vm); =20 - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOM= AIN_NET_INTERFACE_LINK_STATE_DOWN) < 0) { - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - virDomainAuditNet(vm, NULL, net, "attach", false); - goto try_remove; - } - } else { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("setting of link state not supported: Lin= k is up")); + if (qemuMonitorSetLink(priv->mon, net->info.alias, VIR_DOMAIN_= NET_INTERFACE_LINK_STATE_DOWN) < 0) { + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + virDomainAuditNet(vm, NULL, net, "attach", false); + goto try_remove; } =20 if (qemuDomainObjExitMonitor(driver, vm) < 0) @@ -1205,22 +1170,18 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, =20 virErrorPreserveLast(&originalError); if (vlan < 0) { - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - char *netdev_name; - if (virAsprintf(&netdev_name, "host%s", net->info.alias) >=3D = 0) { - qemuDomainObjEnterMonitor(driver, vm); - if (charDevPlugged && - qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) - VIR_WARN("Failed to remove associated chardev %s", cha= rDevAlias); - if (netdevPlugged && - qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) - VIR_WARN("Failed to remove network backend for netdev = %s", - netdev_name); - ignore_value(qemuDomainObjExitMonitor(driver, vm)); - VIR_FREE(netdev_name); - } - } else { - VIR_WARN("Unable to remove network backend"); + char *netdev_name; + if (virAsprintf(&netdev_name, "host%s", net->info.alias) >=3D 0) { + qemuDomainObjEnterMonitor(driver, vm); + if (charDevPlugged && + qemuMonitorDetachCharDev(priv->mon, charDevAlias) < 0) + VIR_WARN("Failed to remove associated chardev %s", charDev= Alias); + if (netdevPlugged && + qemuMonitorRemoveNetdev(priv->mon, netdev_name) < 0) + VIR_WARN("Failed to remove network backend for netdev %s", + netdev_name); + ignore_value(qemuDomainObjExitMonitor(driver, vm)); + VIR_FREE(netdev_name); } } else { char *hostnet_name; @@ -4098,26 +4059,11 @@ qemuDomainRemoveNetDevice(virQEMUDriverPtr driver, =20 =20 qemuDomainObjEnterMonitor(driver, vm); - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; - virDomainAuditNet(vm, net, NULL, "detach", false); - goto cleanup; - } - } else { - int vlan; - if ((vlan =3D qemuDomainNetVLAN(net)) < 0 || - qemuMonitorRemoveHostNetwork(priv->mon, vlan, hostnet_name) < = 0) { - if (vlan < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("unable to determine original VLAN")); - } - if (qemuDomainObjExitMonitor(driver, vm) < 0) - goto cleanup; - virDomainAuditNet(vm, net, NULL, "detach", false); + if (qemuMonitorRemoveNetdev(priv->mon, hostnet_name) < 0) { + if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - } + virDomainAuditNet(vm, net, NULL, "detach", false); + goto cleanup; } =20 if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VHOSTUSER) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1afb71f11..13c9e5a56 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2377,12 +2377,6 @@ qemuProcessSetLinkStates(virQEMUDriverPtr driver, =20 VIR_DEBUG("Setting link state: %s", def->nets[i]->info.alias); =20 - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("Setting of link state is not supported b= y this qemu")); - goto cleanup; - } - rv =3D qemuMonitorSetLink(priv->mon, def->nets[i]->info.alias, VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DO= WN); diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.3.1.x86_64.xml index 48281548a..3b667498a 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.4.2.x86_64.xml index f6e8f588f..f84b7b9bb 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.5.3.x86_64.xml index 109fa2ada..983c2f75c 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.6.0.x86_64.xml index 6da349861..751c9c005 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_1.7.0.x86_64.xml index 9c1cc7b67..792cdf77c 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.1.1.x86_64.xml index 73cd42409..4be6ccf18 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 88b3e9edb..91458b593 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index 846d8989e..7e843887a 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 6110c227a..f13e09cb2 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 5689532c8..dca324aa1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 0ca9c7a82..f1fe5aa07 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index c4f03d253..1270d3d63 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index c3051be2f..0292fcd49 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index 015e97beb..0798c5512 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 90bea5d6b..f4865b2b2 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.4.0.x86_64.xml index 0fec3cd0a..39ddfdeba 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.5.0.x86_64.xml index d6bb7cecd..8bf11d86b 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_2.6.0.aarch64.xml index 0172055e5..46c095fd9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.6.0.ppc64.xml index 3072c479c..a69c3e383 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.6.0.x86_64.xml index e2b064a52..fcbccb54f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.7.0.s390x.xml index cc01bf729..b82d3ebce 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.7.0.x86_64.xml index 61eedfb9e..30bb7d787 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index b33d92f21..f701835a3 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index f6cc85c57..096bc32f9 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index 75236851a..4e1d10a4d 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 17fe8f215..0e8272885 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index e26fe5db5..1a39067b9 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -8,7 +8,6 @@ - diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/= qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index ffb37a55a..f192dd006 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -27,8 +27,8 @@ path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server= ,nowait \ -device virtio-serial-device,id=3Dvirtio-serial0 \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -device virtio-balloon-device,id=3Dballoon0 \ diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemux= ml2argvdata/aarch64-kvm-32-on-64.args index 693b48931..143d0bcbe 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args @@ -24,7 +24,7 @@ server,nowait \ -append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ -drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tes= ts/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args index 5730646da..14a57e537 100644 --- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args +++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args @@ -23,7 +23,7 @@ path=3D/tmp/lib/domain--1-aarch64-vgpu/monitor.sock,serve= r,nowait \ addr=3D0x1 \ -device ioh3420,port=3D0x9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,multifuncti= on=3Don,\ addr=3D0x1.0x1 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:73:34:53,bus=3Dpc= i.1,addr=3D0x0,\ -bootindex=3D1 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:73:34:53= ,bus=3Dpci.1,\ +addr=3D0x0,bootindex=3D1 \ -device virtio-gpu-pci,id=3Dvideo0,bus=3Dpci.2,addr=3D0x0 diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.arg= s b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args index 662259e22..1d6db44a3 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args @@ -31,8 +31,9 @@ path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server= ,nowait \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37,bus=3Dpc= i.2,addr=3D0x1 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.2,\ +addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/q= emuxml2argvdata/aarch64-virt-default-nic.args index f27fe0a1d..fed5f0944 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args +++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args @@ -23,5 +23,5 @@ path=3D/tmp/lib/domain--1-aarch64-virt-default/monitor.so= ck,server,nowait \ -kernel /aarch64.kernel \ -initrd /aarch64.initrd \ -append console=3DttyAMA0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxm= l2argvdata/aarch64-virt-virtio.args index b1f7e6ea5..537446121 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args @@ -27,8 +27,8 @@ path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server= ,nowait \ -device virtio-serial-device,id=3Dvirtio-serial0 \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests= /qemuxml2argvdata/aarch64-virtio-pci-default.args index 28ec390a1..955dddf51 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args @@ -35,8 +35,9 @@ addr=3D0x1 \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,\ id=3Dvirtio-disk0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37,bus=3Dpc= i.1,addr=3D0x0 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ +addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.arg= s b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index d3a68eae4..ab2288b4e 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -31,7 +31,9 @@ path=3D/tmp/lib/domain--1-aarch64test/monitor.sock,server= ,nowait \ -drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ -device scsi-disk,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\ drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37,bus=3Dpc= i.3,addr=3D0x2 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-pci,vlan=3D1,id=3Dnet1,mac=3D52:54:00:09:a4:38,bus=3Dpc= i.2,addr=3D0x1 \ --net user,vlan=3D1,name=3Dhostnet1 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,\ +addr=3D0x2 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:09:a4:38= ,bus=3Dpci.2,\ +addr=3D0x1 diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemu= xml2argvdata/arm-vexpressa9-virtio.args index 850775177..49b7cf477 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args @@ -27,8 +27,8 @@ server,nowait \ -usb \ -drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2ar= gvdata/arm-virt-virtio.args index f051839dd..c33b4f0fb 100644 --- a/tests/qemuxml2argvdata/arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/arm-virt-virtio.args @@ -25,8 +25,8 @@ server,nowait \ -device virtio-serial-device,id=3Dvirtio-serial0 \ -drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ -device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ --device virtio-net-device,vlan=3D0,id=3Dnet0,mac=3D52:54:00:09:a4:37 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/boot-complex-bootindex.args b/tests/qem= uxml2argvdata/boot-complex-bootindex.args index 639acbd7b..994829829 100644 --- a/tests/qemuxml2argvdata/boot-complex-bootindex.args +++ b/tests/qemuxml2argvdata/boot-complex-bootindex.args @@ -37,8 +37,9 @@ bootindex=3D1 \ -global isa-fdc.bootindexA=3D4 \ -drive file=3D/dev/fd1,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ -global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:11,bus=3Dpc= i.0,addr=3D0x3,\ -bootindex=3D2 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-pci,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:44:22,bus=3Dpc= i.0,addr=3D0x4 \ --net user,vlan=3D1,name=3Dhostnet1 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bus=3Dpci.0,\ +addr=3D0x3,bootindex=3D2 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:22= ,bus=3Dpci.0,\ +addr=3D0x4 diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvd= ata/boot-complex.args index b7a2fc119..68fcfe2bf 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -36,7 +36,9 @@ readonly=3Don \ -global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ -drive file=3D/dev/fd1,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ -global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:11,bus=3Dpc= i.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-pci,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:44:22,bus=3Dpc= i.0,addr=3D0x4 \ --net user,vlan=3D1,name=3Dhostnet1 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bus=3Dpci.0,\ +addr=3D0x3 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:22= ,bus=3Dpci.0,\ +addr=3D0x4 diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdat= a/boot-order.args index 8c366f1dd..5c78e3acb 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -31,7 +31,7 @@ id=3Dvirtio-disk0,bootindex=3D3 \ -drive file=3D/dev/null,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ -global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ -global isa-fdc.bootindexB=3D4 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpc= i.0,addr=3D0x3,\ -bootindex=3D2 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,\ +addr=3D0x3,bootindex=3D2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvda= ta/boot-strict.args index 9aeb80199..221a43805 100644 --- a/tests/qemuxml2argvdata/boot-strict.args +++ b/tests/qemuxml2argvdata/boot-strict.args @@ -38,8 +38,9 @@ bootindex=3D1 \ -global isa-fdc.bootindexA=3D4 \ -drive file=3D/dev/fd1,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ -global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:11,bus=3Dpc= i.0,addr=3D0x3,\ -bootindex=3D2 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-pci,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:44:22,bus=3Dpc= i.0,addr=3D0x4 \ --net user,vlan=3D1,name=3Dhostnet1 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bus=3Dpci.0,\ +addr=3D0x3,bootindex=3D2 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:22= ,bus=3Dpci.0,\ +addr=3D0x4 diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 70a8ba9ce..ec421f12e 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -28,8 +28,9 @@ id=3Dvirtio-disk0 \ -drive file=3D/tmp/Fedora-17-x86_64-Live-Desktop.iso,format=3Draw,if=3Dnon= e,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:4d:4b:19,bus=3Dpc= i.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4d:4b:19= ,bus=3Dpci.0,\ +addr=3D0x3 \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ -device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2= argvdata/disk-copy_on_read.args index 8353a1573..9dc06054e 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.args @@ -27,7 +27,7 @@ id=3Dvirtio-disk0 \ -drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-net-pci,tx=3Dbh,vlan=3D0,id=3Dnet0,mac=3D52:54:00:e5:48:58,= bus=3Dpci.0,\ -addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:= e5:48:58,\ +bus=3Dpci.0,addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2arg= vdata/disk-ioeventfd.args index e752b3874..cf8ec0564 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.args @@ -27,7 +27,7 @@ drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ -drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-net-pci,tx=3Dbh,ioeventfd=3Doff,vlan=3D0,id=3Dnet0,\ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,tx=3Dbh,ioeventfd=3Doff,netdev=3Dhostnet0,id=3Dnet0= ,\ mac=3D52:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata= /event_idx.args index ff7b0b6ea..74da03987 100644 --- a/tests/qemuxml2argvdata/event_idx.args +++ b/tests/qemuxml2argvdata/event_idx.args @@ -27,7 +27,7 @@ drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0 \ -drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device virtio-net-pci,event_idx=3Doff,vlan=3D0,id=3Dnet0,mac=3D52:54:00:e= 5:48:58,\ -bus=3Dpci.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,event_idx=3Doff,netdev=3Dhostnet0,id=3Dnet0,\ +mac=3D52:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qem= uxml2argvdata/graphics-spice-timeout.args index 06a124576..5ce92b3c0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args @@ -27,8 +27,9 @@ id=3Dvirtio-disk0 \ -drive file=3D/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso,format=3Draw,= if=3Dnone,\ id=3Ddrive-ide0-1-0,media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:71:70:89,bus=3Dpci.0,add= r=3D0x7 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostnet0 \ +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:71:70:89,bus=3D= pci.0,\ +addr=3D0x7 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -spice port=3D5900,addr=3D127.0.0.1 \ -vga std \ diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args b/tests/q= emuxml2argvdata/intel-iommu-caching-mode.args index 81feecfcf..ad868f853 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.args @@ -23,5 +23,6 @@ server,nowait \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ioh3420,port=3D0x10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2= \ -device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.2,addr=3D0x2.0x7 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:ab:0c:5c,bus=3Dpci.2,add= r=3D0x1 \ --net user,vlan=3D0,name=3Dhostnet0 +-netdev user,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ab:0c:5c,bus=3D= pci.2,\ +addr=3D0x1 diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s3= 90.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.= args index 46b553086..9c5f71e2a 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args @@ -22,9 +22,10 @@ id=3Dvirtio-disk0,bootindex=3D1 \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ -device virtio-blk-ccw,devno=3Dfe.0.0003,drive=3Ddrive-virtio-disk1,\ id=3Dvirtio-disk1,bootindex=3D3 \ --device virtio-net-ccw,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:54,devno=3D= fe.0.0000,\ -bootindex=3D2 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-ccw,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:42:36,devno=3D= fe.0.0004 \ --net user,vlan=3D1,name=3Dhostnet1 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:54= ,\ +devno=3Dfe.0.0000,bootindex=3D2 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-ccw,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:42:36= ,\ +devno=3Dfe.0.0004 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/= qemuxml2argvdata/machine-loadparm-net-s390.args index c9d8ff7f1..686d99ce8 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args @@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=3Dnone \ -chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni= tor.sock,\ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ --device virtio-net-ccw,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:54,devno=3D= fe.0.0000,\ -bootindex=3D1 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:54= ,\ +devno=3Dfe.0.0000,bootindex=3D1 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdat= a/net-client.args index 93c0ca0bf..73740d8d5 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -21,6 +21,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3Dpci.0,add= r=3D0x3 \ --net socket,connect=3D192.168.0.1:5558,vlan=3D0,name=3Dhostnet0 \ +-netdev socket,connect=3D192.168.0.1:5558,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,\ +addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2arg= vdata/net-eth-hostip.args index bc70ef598..a7a8a49d3 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,add= r=3D0x3 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostnet0 +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ +addr=3D0x3 diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2arg= vdata/net-eth-ifname.args index bc70ef598..a7a8a49d3 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,add= r=3D0x3 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostnet0 +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ +addr=3D0x3 diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argv= data/net-eth-names.args index a47725063..432d6393c 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -21,8 +21,9 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,add= r=3D0x3 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostnet0 \ --device e1000,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:44:56,bus=3Dpci.0,addr= =3D0x4 \ --net tap,fd=3D3,vlan=3D1,name=3Dhostnet1 \ +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ +addr=3D0x3 \ +-netdev tap,fd=3D3,id=3Dhostnet1 \ +-device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:56,bus=3Dpc= i.0,addr=3D0x4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/n= et-eth.args index bc70ef598..a7a8a49d3 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,add= r=3D0x3 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostnet0 +-netdev tap,fd=3D3,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ +addr=3D0x3 diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata= /net-mcast.args index 707e258cf..a749220b5 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -21,6 +21,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3Dpci.0,add= r=3D0x3 \ --net socket,mcast=3D192.0.0.1:5558,vlan=3D0,name=3Dhostnet0 \ +-netdev socket,mcast=3D192.0.0.1:5558,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,\ +addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdat= a/net-server.args index f849d2fd6..d1432c2a0 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -21,6 +21,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3Dpci.0,add= r=3D0x3 \ --net socket,listen=3D192.168.0.1:5558,vlan=3D0,name=3Dhostnet0 \ +-netdev socket,listen=3D192.168.0.1:5558,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,\ +addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/n= et-udp.args index 064204ce3..170816a47 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -21,7 +21,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3Dpci.0,add= r=3D0x3 \ --net socket,udp=3D192.168.10.1:5555,localaddr=3D192.168.10.1:5556,vlan=3D0= ,\ -name=3Dhostnet0 \ +-netdev socket,udp=3D192.168.10.1:5555,localaddr=3D192.168.10.1:5556,id=3D= hostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,\ +addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/= net-user.args index 3dc94b9b5..604987d7d 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,add= r=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 +-netdev user,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,\ +addr=3D0x3 diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2arg= vdata/net-virtio-ccw.args index 663e0680e..87de274fa 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.args @@ -17,8 +17,10 @@ QEMU_AUDIO_DRV=3Dnone \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -boot c \ --device virtio-net-ccw,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,devno=3D= fe.0.0001 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-ccw,vlan=3D1,id=3Dnet1,mac=3D00:11:22:33:44:54,devno=3D= fe.0.0000 \ --net user,vlan=3D1,name=3Dhostnet1 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,\ +devno=3Dfe.0.0001 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-ccw,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:54= ,\ +devno=3Dfe.0.0000 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2= argvdata/net-virtio-device.args index 24e1456b7..8068bd72f 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -22,7 +22,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device virtio-net-pci,tx=3Dbh,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,= bus=3Dpci.0,\ -addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:= 33:44:55,\ +bus=3Dpci.0,addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/test= s/qemuxml2argvdata/net-virtio-disable-offloads.args index 2ec4ccd3a..21747a2e6 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -22,9 +22,9 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest7,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ +-netdev user,id=3Dhostnet0 \ -device virtio-net-pci,csum=3Doff,gso=3Doff,host_tso4=3Doff,host_tso6=3Dof= f,\ host_ecn=3Doff,host_ufo=3Doff,mrg_rxbuf=3Doff,guest_csum=3Doff,guest_tso4= =3Doff,\ -guest_tso6=3Doff,guest_ecn=3Doff,guest_ufo=3Doff,vlan=3D0,id=3Dnet0,\ +guest_tso6=3Doff,guest_ecn=3Doff,guest_ufo=3Doff,netdev=3Dhostnet0,id=3Dne= t0,\ mac=3D00:22:44:66:88:aa,bus=3Dpci.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/q= emuxml2argvdata/net-virtio-rxtxqueuesize.args index c78da3d17..e8ebdef45 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -21,7 +21,7 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device virtio-net-pci,rx_queue_size=3D512,tx_queue_size=3D1024,vlan=3D0,i= d=3Dnet0,\ -mac=3D00:11:22:33:44:55,bus=3Dpci.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,rx_queue_size=3D512,tx_queue_size=3D1024,netdev=3Dh= ostnet0,\ +id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2ar= gvdata/net-virtio-s390.args index 616fe5751..7b4cd2353 100644 --- a/tests/qemuxml2argvdata/net-virtio-s390.args +++ b/tests/qemuxml2argvdata/net-virtio-s390.args @@ -17,5 +17,5 @@ QEMU_AUDIO_DRV=3Dnone \ server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \ -boot c \ --device virtio-net-s390,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55 \ --net user,vlan=3D0,name=3Dhostnet0 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-s390,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55 diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdat= a/net-virtio.args index 4adef1811..7f906efed 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -21,5 +21,6 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpc= i.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,\ +addr=3D0x3 diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index 1d2a0428e..789b572d7 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -22,70 +22,93 @@ server,nowait \ -drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1= -0,\ media=3Dcdrom,readonly=3Don \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-= 0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.0,add= r=3D0x5 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.0,addr= =3D0x7 \ --net user,vlan=3D1,name=3Dhostnet1 \ --device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.0,addr= =3D0x8 \ --net user,vlan=3D2,name=3Dhostnet2 \ --device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpci.0,addr= =3D0x9 \ --net user,vlan=3D3,name=3Dhostnet3 \ --device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.0,addr= =3D0xa \ --net user,vlan=3D4,name=3Dhostnet4 \ --device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpci.0,addr= =3D0xb \ --net user,vlan=3D5,name=3Dhostnet5 \ --device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpci.0,addr= =3D0xc \ --net user,vlan=3D6,name=3Dhostnet6 \ --device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpci.0,addr= =3D0xd \ --net user,vlan=3D7,name=3Dhostnet7 \ --device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpci.0,addr= =3D0xe \ --net user,vlan=3D8,name=3Dhostnet8 \ --device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpci.0,addr= =3D0xf \ --net user,vlan=3D9,name=3Dhostnet9 \ --device rtl8139,vlan=3D10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus=3Dpci.0,a= ddr=3D0x10 \ --net user,vlan=3D10,name=3Dhostnet10 \ --device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3Dpci.0,add= r=3D0x11 \ --net user,vlan=3D11,name=3Dhostnet11 \ --device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3Dpci.0,add= r=3D0x12 \ --net user,vlan=3D12,name=3Dhostnet12 \ --device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3Dpci.0,add= r=3D0x13 \ --net user,vlan=3D13,name=3Dhostnet13 \ --device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3Dpci.0,add= r=3D0x14 \ --net user,vlan=3D14,name=3Dhostnet14 \ --device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3Dpci.0,add= r=3D0x15 \ --net user,vlan=3D15,name=3Dhostnet15 \ --device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3Dpci.0,add= r=3D0x16 \ --net user,vlan=3D16,name=3Dhostnet16 \ --device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3Dpci.0,add= r=3D0x17 \ --net user,vlan=3D17,name=3Dhostnet17 \ --device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3Dpci.0,add= r=3D0x18 \ --net user,vlan=3D18,name=3Dhostnet18 \ --device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.0,add= r=3D0x19 \ --net user,vlan=3D19,name=3Dhostnet19 \ --device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3Dpci.0,add= r=3D0x1a \ --net user,vlan=3D20,name=3Dhostnet20 \ --device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3Dpci.0,add= r=3D0x1b \ --net user,vlan=3D21,name=3Dhostnet21 \ --device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3Dpci.0,add= r=3D0x1c \ --net user,vlan=3D22,name=3Dhostnet22 \ --device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3Dpci.0,add= r=3D0x1d \ --net user,vlan=3D23,name=3Dhostnet23 \ --device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3Dpci.0,add= r=3D0x1e \ --net user,vlan=3D24,name=3Dhostnet24 \ --device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.0,add= r=3D0x1f \ --net user,vlan=3D25,name=3Dhostnet25 \ --device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.1,add= r=3D0x1 \ --net user,vlan=3D26,name=3Dhostnet26 \ --device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3Dpci.1,add= r=3D0x2 \ --net user,vlan=3D27,name=3Dhostnet27 \ --device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3Dpci.1,add= r=3D0x3 \ --net user,vlan=3D28,name=3Dhostnet28 \ --device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.1,add= r=3D0x4 \ --net user,vlan=3D29,name=3Dhostnet29 \ --device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.1,add= r=3D0x5 \ --net user,vlan=3D30,name=3Dhostnet30 \ --device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.1,add= r=3D0x6 \ --net user,vlan=3D31,name=3Dhostnet31 \ +-netdev user,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.0,\ +addr=3D0x5 \ +-netdev user,id=3Dhostnet1 \ +-device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.0,addr=3D0x7 \ +-netdev user,id=3Dhostnet2 \ +-device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.0,addr=3D0x8 \ +-netdev user,id=3Dhostnet3 \ +-device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpc= i.0,addr=3D0x9 \ +-netdev user,id=3Dhostnet4 \ +-device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.0,addr=3D0xa \ +-netdev user,id=3Dhostnet5 \ +-device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.0,addr=3D0xb \ +-netdev user,id=3Dhostnet6 \ +-device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.0,addr=3D0xc \ +-netdev user,id=3Dhostnet7 \ +-device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.0,addr=3D0xd \ +-netdev user,id=3Dhostnet8 \ +-device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.0,addr=3D0xe \ +-netdev user,id=3Dhostnet9 \ +-device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.0,addr=3D0xf \ +-netdev user,id=3Dhostnet10 \ +-device rtl8139,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus= =3Dpci.0,\ +addr=3D0x10 \ +-netdev user,id=3Dhostnet11 \ +-device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3D= pci.0,\ +addr=3D0x11 \ +-netdev user,id=3Dhostnet12 \ +-device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3D= pci.0,\ +addr=3D0x12 \ +-netdev user,id=3Dhostnet13 \ +-device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3D= pci.0,\ +addr=3D0x13 \ +-netdev user,id=3Dhostnet14 \ +-device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3D= pci.0,\ +addr=3D0x14 \ +-netdev user,id=3Dhostnet15 \ +-device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3D= pci.0,\ +addr=3D0x15 \ +-netdev user,id=3Dhostnet16 \ +-device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3D= pci.0,\ +addr=3D0x16 \ +-netdev user,id=3Dhostnet17 \ +-device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3D= pci.0,\ +addr=3D0x17 \ +-netdev user,id=3Dhostnet18 \ +-device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3D= pci.0,\ +addr=3D0x18 \ +-netdev user,id=3Dhostnet19 \ +-device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.0,\ +addr=3D0x19 \ +-netdev user,id=3Dhostnet20 \ +-device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3D= pci.0,\ +addr=3D0x1a \ +-netdev user,id=3Dhostnet21 \ +-device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3D= pci.0,\ +addr=3D0x1b \ +-netdev user,id=3Dhostnet22 \ +-device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3D= pci.0,\ +addr=3D0x1c \ +-netdev user,id=3Dhostnet23 \ +-device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3D= pci.0,\ +addr=3D0x1d \ +-netdev user,id=3Dhostnet24 \ +-device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3D= pci.0,\ +addr=3D0x1e \ +-netdev user,id=3Dhostnet25 \ +-device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.0,\ +addr=3D0x1f \ +-netdev user,id=3Dhostnet26 \ +-device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.1,\ +addr=3D0x1 \ +-netdev user,id=3Dhostnet27 \ +-device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3D= pci.1,\ +addr=3D0x2 \ +-netdev user,id=3Dhostnet28 \ +-device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3D= pci.1,\ +addr=3D0x3 \ +-netdev user,id=3Dhostnet29 \ +-device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.1,\ +addr=3D0x4 \ +-netdev user,id=3Dhostnet30 \ +-device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.1,\ +addr=3D0x5 \ +-netdev user,id=3Dhostnet31 \ +-device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.1,\ +addr=3D0x6 \ -vnc 127.0.0.1:0 \ -k en-us \ -vga cirrus \ diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2a= rgvdata/pci-expander-bus.args index 7327afbc4..4a43f1fd3 100644 --- a/tests/qemuxml2argvdata/pci-expander-bus.args +++ b/tests/qemuxml2argvdata/pci-expander-bus.args @@ -22,68 +22,91 @@ path=3D/tmp/lib/domain--1-expander-test/monitor.sock,se= rver,nowait \ -boot c \ -device pxb,bus_nr=3D254,id=3Dpci.1,numa_node=3D1,bus=3Dpci.0,addr=3D0x3 \ -device pxb,bus_nr=3D252,id=3Dpci.2,bus=3Dpci.0,addr=3D0x4 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.0,add= r=3D0x5 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.0,addr= =3D0x7 \ --net user,vlan=3D1,name=3Dhostnet1 \ --device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.0,addr= =3D0x8 \ --net user,vlan=3D2,name=3Dhostnet2 \ --device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpci.0,addr= =3D0x9 \ --net user,vlan=3D3,name=3Dhostnet3 \ --device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.0,addr= =3D0xa \ --net user,vlan=3D4,name=3Dhostnet4 \ --device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpci.0,addr= =3D0xb \ --net user,vlan=3D5,name=3Dhostnet5 \ --device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpci.0,addr= =3D0xc \ --net user,vlan=3D6,name=3Dhostnet6 \ --device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpci.0,addr= =3D0xd \ --net user,vlan=3D7,name=3Dhostnet7 \ --device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpci.0,addr= =3D0xe \ --net user,vlan=3D8,name=3Dhostnet8 \ --device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpci.0,addr= =3D0xf \ --net user,vlan=3D9,name=3Dhostnet9 \ --device e1000,vlan=3D10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus=3Dpci.0,add= r=3D0x10 \ --net user,vlan=3D10,name=3Dhostnet10 \ --device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3Dpci.0,add= r=3D0x11 \ --net user,vlan=3D11,name=3Dhostnet11 \ --device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3Dpci.0,add= r=3D0x12 \ --net user,vlan=3D12,name=3Dhostnet12 \ --device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3Dpci.0,add= r=3D0x13 \ --net user,vlan=3D13,name=3Dhostnet13 \ --device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3Dpci.0,add= r=3D0x14 \ --net user,vlan=3D14,name=3Dhostnet14 \ --device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3Dpci.0,add= r=3D0x15 \ --net user,vlan=3D15,name=3Dhostnet15 \ --device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3Dpci.0,add= r=3D0x16 \ --net user,vlan=3D16,name=3Dhostnet16 \ --device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3Dpci.0,add= r=3D0x17 \ --net user,vlan=3D17,name=3Dhostnet17 \ --device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3Dpci.0,add= r=3D0x18 \ --net user,vlan=3D18,name=3Dhostnet18 \ --device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.0,add= r=3D0x19 \ --net user,vlan=3D19,name=3Dhostnet19 \ --device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3Dpci.0,add= r=3D0x1a \ --net user,vlan=3D20,name=3Dhostnet20 \ --device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3Dpci.0,add= r=3D0x1b \ --net user,vlan=3D21,name=3Dhostnet21 \ --device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3Dpci.0,add= r=3D0x1c \ --net user,vlan=3D22,name=3Dhostnet22 \ --device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3Dpci.0,add= r=3D0x1d \ --net user,vlan=3D23,name=3Dhostnet23 \ --device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3Dpci.0,add= r=3D0x1e \ --net user,vlan=3D24,name=3Dhostnet24 \ --device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.0,add= r=3D0x1f \ --net user,vlan=3D25,name=3Dhostnet25 \ --device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.1,add= r=3D0x0 \ --net user,vlan=3D26,name=3Dhostnet26 \ --device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3Dpci.1,add= r=3D0x1 \ --net user,vlan=3D27,name=3Dhostnet27 \ --device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3Dpci.1,add= r=3D0x2 \ --net user,vlan=3D28,name=3Dhostnet28 \ --device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.1,add= r=3D0x3 \ --net user,vlan=3D29,name=3Dhostnet29 \ --device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.1,add= r=3D0x4 \ --net user,vlan=3D30,name=3Dhostnet30 \ --device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.1,add= r=3D0x5 \ --net user,vlan=3D31,name=3Dhostnet31 \ +-netdev user,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.0,\ +addr=3D0x5 \ +-netdev user,id=3Dhostnet1 \ +-device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.0,addr=3D0x7 \ +-netdev user,id=3Dhostnet2 \ +-device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.0,addr=3D0x8 \ +-netdev user,id=3Dhostnet3 \ +-device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:45:28:cb,bus=3Dpc= i.0,addr=3D0x9 \ +-netdev user,id=3Dhostnet4 \ +-device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.0,addr=3D0xa \ +-netdev user,id=3Dhostnet5 \ +-device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.0,addr=3D0xb \ +-netdev user,id=3Dhostnet6 \ +-device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.0,addr=3D0xc \ +-netdev user,id=3Dhostnet7 \ +-device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.0,addr=3D0xd \ +-netdev user,id=3Dhostnet8 \ +-device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.0,addr=3D0xe \ +-netdev user,id=3Dhostnet9 \ +-device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.0,addr=3D0xf \ +-netdev user,id=3Dhostnet10 \ +-device e1000,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:3b:d0:51,bus=3D= pci.0,\ +addr=3D0x10 \ +-netdev user,id=3Dhostnet11 \ +-device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:8d:2d:17,bus=3D= pci.0,\ +addr=3D0x11 \ +-netdev user,id=3Dhostnet12 \ +-device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:a7:66:af,bus=3D= pci.0,\ +addr=3D0x12 \ +-netdev user,id=3Dhostnet13 \ +-device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:54:ab:d7,bus=3D= pci.0,\ +addr=3D0x13 \ +-netdev user,id=3Dhostnet14 \ +-device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:1f:99:90,bus=3D= pci.0,\ +addr=3D0x14 \ +-netdev user,id=3Dhostnet15 \ +-device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:c8:43:87,bus=3D= pci.0,\ +addr=3D0x15 \ +-netdev user,id=3Dhostnet16 \ +-device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:df:22:b2,bus=3D= pci.0,\ +addr=3D0x16 \ +-netdev user,id=3Dhostnet17 \ +-device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:d2:9a:47,bus=3D= pci.0,\ +addr=3D0x17 \ +-netdev user,id=3Dhostnet18 \ +-device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:86:05:e2,bus=3D= pci.0,\ +addr=3D0x18 \ +-netdev user,id=3Dhostnet19 \ +-device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.0,\ +addr=3D0x19 \ +-netdev user,id=3Dhostnet20 \ +-device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:48:58:92,bus=3D= pci.0,\ +addr=3D0x1a \ +-netdev user,id=3Dhostnet21 \ +-device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:99:e5:bf,bus=3D= pci.0,\ +addr=3D0x1b \ +-netdev user,id=3Dhostnet22 \ +-device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:b1:8c:25,bus=3D= pci.0,\ +addr=3D0x1c \ +-netdev user,id=3Dhostnet23 \ +-device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:60:e0:d0,bus=3D= pci.0,\ +addr=3D0x1d \ +-netdev user,id=3Dhostnet24 \ +-device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:37:00:6a,bus=3D= pci.0,\ +addr=3D0x1e \ +-netdev user,id=3Dhostnet25 \ +-device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.0,\ +addr=3D0x1f \ +-netdev user,id=3Dhostnet26 \ +-device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.1,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet27 \ +-device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:00:79:69,bus=3D= pci.1,\ +addr=3D0x1 \ +-netdev user,id=3Dhostnet28 \ +-device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:47:00:6f,bus=3D= pci.1,\ +addr=3D0x2 \ +-netdev user,id=3Dhostnet29 \ +-device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.1,\ +addr=3D0x3 \ +-netdev user,id=3Dhostnet30 \ +-device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.1,\ +addr=3D0x4 \ +-netdev user,id=3Dhostnet31 \ +-device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.1,\ +addr=3D0x5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index b50581283..612c29ef1 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -22,12 +22,12 @@ server,nowait \ -usb \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-drive,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-= 0 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:24:a5:9f,bus=3Dpc= i.0,addr=3D0x3,\ -rombar=3D1 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device virtio-net-pci,vlan=3D1,id=3Dnet1,mac=3D52:54:00:24:a5:9e,bus=3Dpc= i.0,addr=3D0x4,\ -romfile=3D/etc/fake/bootrom.bin \ --net user,vlan=3D1,name=3Dhostnet1 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:24:a5:9f= ,bus=3Dpci.0,\ +addr=3D0x3,rombar=3D1 \ +-netdev user,id=3Dhostnet1 \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:24:a5:9e= ,bus=3Dpci.0,\ +addr=3D0x4,romfile=3D/etc/fake/bootrom.bin \ -device pci-assign,host=3D06:12.5,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x5,rom= bar=3D0 \ -device pci-assign,host=3D06:12.6,id=3Dhostdev1,bus=3Dpci.0,addr=3D0x6,rom= bar=3D1,\ romfile=3D/etc/fake/bootrom.bin \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index 23852b45e..cd70bb520 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -57,67 +57,94 @@ path=3D/tmp/lib/domain--1-pcie-expander-bus-te/monitor.= sock,server,nowait \ -device xio3130-downstream,port=3D0x1f,chassis=3D35,id=3Dpci.35,bus=3Dpci.= 3,addr=3D0x1f \ -drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ -device ide-drive,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0 \ --device rtl8139,vlan=3D0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3Dpci.4,add= r=3D0x0 \ --net user,vlan=3D0,name=3Dhostnet0 \ --device e1000,vlan=3D1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpci.5,addr= =3D0x0 \ --net user,vlan=3D1,name=3Dhostnet1 \ --device e1000,vlan=3D2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpci.6,addr= =3D0x0 \ --net user,vlan=3D2,name=3Dhostnet2 \ --device e1000,vlan=3D3,id=3Dnet3,mac=3D52:54:00:ee:b9:a8,bus=3Dpci.7,addr= =3D0x0 \ --net user,vlan=3D3,name=3Dhostnet3 \ --device e1000,vlan=3D4,id=3Dnet4,mac=3D52:54:00:a9:f7:17,bus=3Dpci.8,addr= =3D0x0 \ --net user,vlan=3D4,name=3Dhostnet4 \ --device e1000,vlan=3D5,id=3Dnet5,mac=3D52:54:00:df:2b:f3,bus=3Dpci.9,addr= =3D0x0 \ --net user,vlan=3D5,name=3Dhostnet5 \ --device e1000,vlan=3D6,id=3Dnet6,mac=3D52:54:00:78:94:b4,bus=3Dpci.10,addr= =3D0x0 \ --net user,vlan=3D6,name=3Dhostnet6 \ --device e1000,vlan=3D7,id=3Dnet7,mac=3D52:54:00:6b:9b:06,bus=3Dpci.11,addr= =3D0x0 \ --net user,vlan=3D7,name=3Dhostnet7 \ --device e1000,vlan=3D8,id=3Dnet8,mac=3D52:54:00:17:df:bc,bus=3Dpci.12,addr= =3D0x0 \ --net user,vlan=3D8,name=3Dhostnet8 \ --device e1000,vlan=3D9,id=3Dnet9,mac=3D52:54:00:3b:d0:51,bus=3Dpci.13,addr= =3D0x0 \ --net user,vlan=3D9,name=3Dhostnet9 \ --device e1000,vlan=3D10,id=3Dnet10,mac=3D52:54:00:8d:2d:17,bus=3Dpci.14,ad= dr=3D0x0 \ --net user,vlan=3D10,name=3Dhostnet10 \ --device e1000,vlan=3D11,id=3Dnet11,mac=3D52:54:00:a7:66:af,bus=3Dpci.15,ad= dr=3D0x0 \ --net user,vlan=3D11,name=3Dhostnet11 \ --device e1000,vlan=3D12,id=3Dnet12,mac=3D52:54:00:54:ab:d7,bus=3Dpci.16,ad= dr=3D0x0 \ --net user,vlan=3D12,name=3Dhostnet12 \ --device e1000,vlan=3D13,id=3Dnet13,mac=3D52:54:00:1f:99:90,bus=3Dpci.17,ad= dr=3D0x0 \ --net user,vlan=3D13,name=3Dhostnet13 \ --device e1000,vlan=3D14,id=3Dnet14,mac=3D52:54:00:c8:43:87,bus=3Dpci.18,ad= dr=3D0x0 \ --net user,vlan=3D14,name=3Dhostnet14 \ --device e1000,vlan=3D15,id=3Dnet15,mac=3D52:54:00:df:22:b2,bus=3Dpci.19,ad= dr=3D0x0 \ --net user,vlan=3D15,name=3Dhostnet15 \ --device e1000,vlan=3D16,id=3Dnet16,mac=3D52:54:00:d2:9a:47,bus=3Dpci.20,ad= dr=3D0x0 \ --net user,vlan=3D16,name=3Dhostnet16 \ --device e1000,vlan=3D17,id=3Dnet17,mac=3D52:54:00:86:05:e2,bus=3Dpci.21,ad= dr=3D0x0 \ --net user,vlan=3D17,name=3Dhostnet17 \ --device e1000,vlan=3D18,id=3Dnet18,mac=3D52:54:00:8c:1c:c2,bus=3Dpci.22,ad= dr=3D0x0 \ --net user,vlan=3D18,name=3Dhostnet18 \ --device e1000,vlan=3D19,id=3Dnet19,mac=3D52:54:00:48:58:92,bus=3Dpci.23,ad= dr=3D0x0 \ --net user,vlan=3D19,name=3Dhostnet19 \ --device e1000,vlan=3D20,id=3Dnet20,mac=3D52:54:00:99:e5:bf,bus=3Dpci.24,ad= dr=3D0x0 \ --net user,vlan=3D20,name=3Dhostnet20 \ --device e1000,vlan=3D21,id=3Dnet21,mac=3D52:54:00:b1:8c:25,bus=3Dpci.25,ad= dr=3D0x0 \ --net user,vlan=3D21,name=3Dhostnet21 \ --device e1000,vlan=3D22,id=3Dnet22,mac=3D52:54:00:60:e0:d0,bus=3Dpci.26,ad= dr=3D0x0 \ --net user,vlan=3D22,name=3Dhostnet22 \ --device e1000,vlan=3D23,id=3Dnet23,mac=3D52:54:00:37:00:6a,bus=3Dpci.27,ad= dr=3D0x0 \ --net user,vlan=3D23,name=3Dhostnet23 \ --device e1000,vlan=3D24,id=3Dnet24,mac=3D52:54:00:c7:c8:ad,bus=3Dpci.28,ad= dr=3D0x0 \ --net user,vlan=3D24,name=3Dhostnet24 \ --device e1000,vlan=3D25,id=3Dnet25,mac=3D52:54:00:4e:a7:cf,bus=3Dpci.29,ad= dr=3D0x0 \ --net user,vlan=3D25,name=3Dhostnet25 \ --device e1000,vlan=3D26,id=3Dnet26,mac=3D52:54:00:00:79:69,bus=3Dpci.30,ad= dr=3D0x0 \ --net user,vlan=3D26,name=3Dhostnet26 \ --device e1000,vlan=3D27,id=3Dnet27,mac=3D52:54:00:47:00:6f,bus=3Dpci.31,ad= dr=3D0x0 \ --net user,vlan=3D27,name=3Dhostnet27 \ --device e1000,vlan=3D28,id=3Dnet28,mac=3D52:54:00:2a:8c:8b,bus=3Dpci.32,ad= dr=3D0x0 \ --net user,vlan=3D28,name=3Dhostnet28 \ --device e1000,vlan=3D29,id=3Dnet29,mac=3D52:54:00:ec:d5:e3,bus=3Dpci.33,ad= dr=3D0x0 \ --net user,vlan=3D29,name=3Dhostnet29 \ --device e1000,vlan=3D30,id=3Dnet30,mac=3D52:54:00:7e:6e:c8,bus=3Dpci.34,ad= dr=3D0x0 \ --net user,vlan=3D30,name=3Dhostnet30 \ --device e1000,vlan=3D31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3Dpci.35,ad= dr=3D0x0 \ --net user,vlan=3D31,name=3Dhostnet31 +-netdev user,id=3Dhostnet0 \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.4,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet1 \ +-device e1000,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:5c:c6:1a,bus=3Dpc= i.5,addr=3D0x0 \ +-netdev user,id=3Dhostnet2 \ +-device e1000,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:39:97:ac,bus=3Dpc= i.6,addr=3D0x0 \ +-netdev user,id=3Dhostnet3 \ +-device e1000,netdev=3Dhostnet3,id=3Dnet3,mac=3D52:54:00:ee:b9:a8,bus=3Dpc= i.7,addr=3D0x0 \ +-netdev user,id=3Dhostnet4 \ +-device e1000,netdev=3Dhostnet4,id=3Dnet4,mac=3D52:54:00:a9:f7:17,bus=3Dpc= i.8,addr=3D0x0 \ +-netdev user,id=3Dhostnet5 \ +-device e1000,netdev=3Dhostnet5,id=3Dnet5,mac=3D52:54:00:df:2b:f3,bus=3Dpc= i.9,addr=3D0x0 \ +-netdev user,id=3Dhostnet6 \ +-device e1000,netdev=3Dhostnet6,id=3Dnet6,mac=3D52:54:00:78:94:b4,bus=3Dpc= i.10,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet7 \ +-device e1000,netdev=3Dhostnet7,id=3Dnet7,mac=3D52:54:00:6b:9b:06,bus=3Dpc= i.11,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet8 \ +-device e1000,netdev=3Dhostnet8,id=3Dnet8,mac=3D52:54:00:17:df:bc,bus=3Dpc= i.12,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet9 \ +-device e1000,netdev=3Dhostnet9,id=3Dnet9,mac=3D52:54:00:3b:d0:51,bus=3Dpc= i.13,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet10 \ +-device e1000,netdev=3Dhostnet10,id=3Dnet10,mac=3D52:54:00:8d:2d:17,bus=3D= pci.14,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet11 \ +-device e1000,netdev=3Dhostnet11,id=3Dnet11,mac=3D52:54:00:a7:66:af,bus=3D= pci.15,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet12 \ +-device e1000,netdev=3Dhostnet12,id=3Dnet12,mac=3D52:54:00:54:ab:d7,bus=3D= pci.16,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet13 \ +-device e1000,netdev=3Dhostnet13,id=3Dnet13,mac=3D52:54:00:1f:99:90,bus=3D= pci.17,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet14 \ +-device e1000,netdev=3Dhostnet14,id=3Dnet14,mac=3D52:54:00:c8:43:87,bus=3D= pci.18,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet15 \ +-device e1000,netdev=3Dhostnet15,id=3Dnet15,mac=3D52:54:00:df:22:b2,bus=3D= pci.19,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet16 \ +-device e1000,netdev=3Dhostnet16,id=3Dnet16,mac=3D52:54:00:d2:9a:47,bus=3D= pci.20,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet17 \ +-device e1000,netdev=3Dhostnet17,id=3Dnet17,mac=3D52:54:00:86:05:e2,bus=3D= pci.21,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet18 \ +-device e1000,netdev=3Dhostnet18,id=3Dnet18,mac=3D52:54:00:8c:1c:c2,bus=3D= pci.22,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet19 \ +-device e1000,netdev=3Dhostnet19,id=3Dnet19,mac=3D52:54:00:48:58:92,bus=3D= pci.23,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet20 \ +-device e1000,netdev=3Dhostnet20,id=3Dnet20,mac=3D52:54:00:99:e5:bf,bus=3D= pci.24,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet21 \ +-device e1000,netdev=3Dhostnet21,id=3Dnet21,mac=3D52:54:00:b1:8c:25,bus=3D= pci.25,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet22 \ +-device e1000,netdev=3Dhostnet22,id=3Dnet22,mac=3D52:54:00:60:e0:d0,bus=3D= pci.26,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet23 \ +-device e1000,netdev=3Dhostnet23,id=3Dnet23,mac=3D52:54:00:37:00:6a,bus=3D= pci.27,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet24 \ +-device e1000,netdev=3Dhostnet24,id=3Dnet24,mac=3D52:54:00:c7:c8:ad,bus=3D= pci.28,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet25 \ +-device e1000,netdev=3Dhostnet25,id=3Dnet25,mac=3D52:54:00:4e:a7:cf,bus=3D= pci.29,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet26 \ +-device e1000,netdev=3Dhostnet26,id=3Dnet26,mac=3D52:54:00:00:79:69,bus=3D= pci.30,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet27 \ +-device e1000,netdev=3Dhostnet27,id=3Dnet27,mac=3D52:54:00:47:00:6f,bus=3D= pci.31,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet28 \ +-device e1000,netdev=3Dhostnet28,id=3Dnet28,mac=3D52:54:00:2a:8c:8b,bus=3D= pci.32,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet29 \ +-device e1000,netdev=3Dhostnet29,id=3Dnet29,mac=3D52:54:00:ec:d5:e3,bus=3D= pci.33,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet30 \ +-device e1000,netdev=3Dhostnet30,id=3Dnet30,mac=3D52:54:00:7e:6e:c8,bus=3D= pci.34,\ +addr=3D0x0 \ +-netdev user,id=3Dhostnet31 \ +-device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3D= pci.35,\ +addr=3D0x0 diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu= xml2argvdata/q35-pci-force-address.args index bbd606680..24270663b 100644 --- a/tests/qemuxml2argvdata/q35-pci-force-address.args +++ b/tests/qemuxml2argvdata/q35-pci-force-address.args @@ -21,7 +21,8 @@ server,nowait \ -device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ioh3420,port=3D0x10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2= \ --device e1000e,vlan=3D0,id=3Dnet0,mac=3D52:54:00:aa:bf:ef,bus=3Dpci.2,addr= =3D0x1 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device e1000e,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:aa:bf:ef,bus=3Dp= ci.2,\ +addr=3D0x1 \ -device intel-hda,id=3Dsound0,bus=3Dpci.3,addr=3D0x0 \ -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0 diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvd= ata/user-aliases.args index ad9394710..579d84c91 100644 --- a/tests/qemuxml2argvdata/user-aliases.args +++ b/tests/qemuxml2argvdata/user-aliases.args @@ -48,15 +48,15 @@ id=3Dua-myEncryptedDisk1 \ if=3Dnone,id=3Ddrive-ua-WhatAnAwesomeCDROM,media=3Dcdrom,readonly=3Don,cac= he=3Dnone \ -device ide-drive,bus=3Dide.1,unit=3D0,drive=3Ddrive-ua-WhatAnAwesomeCDROM= ,\ id=3Dua-WhatAnAwesomeCDROM \ --device virtio-net-pci,vlan=3D0,id=3Dua-CheckoutThisNIC,mac=3D52:54:00:d6:= c0:0b,\ -bus=3Dpci.0,addr=3D0x3 \ --net tap,fd=3D3,vlan=3D0,name=3Dhostua-CheckoutThisNIC \ --device rtl8139,vlan=3D1,id=3Dua-WeCanAlsoDoServerMode,mac=3D52:54:00:22:c= 9:42,\ -bus=3Dpci.0,addr=3D0x9 \ --net socket,listen=3D127.0.0.1:1234,vlan=3D1,name=3Dhostua-WeCanAlsoDoServ= erMode \ --device rtl8139,vlan=3D2,id=3Dua-AndAlsoClientMode,mac=3D52:54:00:8c:b1:f8= ,bus=3Dpci.0,\ -addr=3D0xa \ --net socket,connect=3D127.0.0.1:1234,vlan=3D2,name=3Dhostua-AndAlsoClientM= ode \ +-netdev tap,fd=3D3,id=3Dhostua-CheckoutThisNIC \ +-device virtio-net-pci,netdev=3Dhostua-CheckoutThisNIC,id=3Dua-CheckoutThi= sNIC,\ +mac=3D52:54:00:d6:c0:0b,bus=3Dpci.0,addr=3D0x3 \ +-netdev socket,listen=3D127.0.0.1:1234,id=3Dhostua-WeCanAlsoDoServerMode \ +-device rtl8139,netdev=3Dhostua-WeCanAlsoDoServerMode,\ +id=3Dua-WeCanAlsoDoServerMode,mac=3D52:54:00:22:c9:42,bus=3Dpci.0,addr=3D0= x9 \ +-netdev socket,connect=3D127.0.0.1:1234,id=3Dhostua-AndAlsoClientMode \ +-device rtl8139,netdev=3Dhostua-AndAlsoClientMode,id=3Dua-AndAlsoClientMod= e,\ +mac=3D52:54:00:8c:b1:f8,bus=3Dpci.0,addr=3D0xa \ -device ccid-card-emulated,backend=3Dnss-emulated,id=3Dsmartcard0,bus=3Dua= -myCCID.0 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdat= a/virtio-lun.args index 54bc28e0d..5a38d860f 100644 --- a/tests/qemuxml2argvdata/virtio-lun.args +++ b/tests/qemuxml2argvdata/virtio-lun.args @@ -26,6 +26,7 @@ id=3Dvirtio-disk0 \ -drive file=3D/dev/sdfake2,format=3Dqcow2,if=3Dnone,id=3Ddrive-virtio-disk= 1 \ -device virtio-blk-pci,scsi=3Don,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virt= io-disk1,\ id=3Dvirtio-disk1 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:00:e5:48:58,bus=3Dpc= i.0,addr=3D0x3 \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:e5:48:58= ,bus=3Dpci.0,\ +addr=3D0x3 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 diff --git a/tests/qemuxml2argvdata/virtio-options.args b/tests/qemuxml2arg= vdata/virtio-options.args index aca0ee232..3c1751368 100644 --- a/tests/qemuxml2argvdata/virtio-options.args +++ b/tests/qemuxml2argvdata/virtio-options.args @@ -33,9 +33,9 @@ ats=3Don,bus=3Dpci.0,addr=3D0x3 \ path=3D/export/fs2 \ -device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,iommu_pla= tform=3Don,\ ats=3Don,bus=3Dpci.0,addr=3D0x4 \ --device virtio-net-pci,vlan=3D0,id=3Dnet0,mac=3D52:54:56:58:5a:5c,bus=3Dpc= i.0,addr=3D0x6,\ -iommu_platform=3Don,ats=3Don \ --net user,vlan=3D0,name=3Dhostnet0 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c= ,bus=3Dpci.0,\ +addr=3D0x6,iommu_platform=3Don,ats=3Don \ -device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0xe,iommu_platform= =3Don,ats=3Don \ -device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x10,iommu_plat= form=3Don,\ ats=3Don \ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 2ba2b7021..21de3e6cf 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1163,8 +1163,7 @@ mymain(void) DO_TEST("graphics-spice-auto-socket", QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_UNIX, - QEMU_CAPS_DEVICE_CIRRUS_VGA); - driver.config->spiceAutoUnixSocket =3D true; + QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceAutoUnixSock= et =3D true; DO_TEST("graphics-spice-auto-socket-cfg", QEMU_CAPS_SPICE, QEMU_CAPS_SPICE_UNIX, @@ -1181,22 +1180,21 @@ mymain(void) DO_TEST("misc-no-reboot", NONE); DO_TEST("misc-uuid", NONE); DO_TEST_PARSE_ERROR("vhost_queues-invalid", NONE); - DO_TEST("net-vhostuser", QEMU_CAPS_NETDEV); + DO_TEST("net-vhostuser", NONE); DO_TEST("net-vhostuser-multiq", - QEMU_CAPS_NETDEV, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); - DO_TEST_FAILURE("net-vhostuser-multiq", QEMU_CAPS_NETDEV); + QEMU_CAPS_VHOSTUSER_MULTIQUEUE); + DO_TEST_FAILURE("net-vhostuser-multiq", NONE); DO_TEST_FAILURE("net-vhostuser-fail", - QEMU_CAPS_NETDEV, QEMU_CAPS_VHOSTUSER_MULTIQUEUE); DO_TEST("net-user", NONE); - DO_TEST("net-user-addr", QEMU_CAPS_NETDEV); + DO_TEST("net-user-addr", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_TX_ALG); DO_TEST("net-virtio-disable-offloads", QEMU_CAPS_NODEFCONFIG); DO_TEST("net-virtio-netdev", - QEMU_CAPS_NETDEV, QEMU_CAPS_NODEFCONFIG); + QEMU_CAPS_NODEFCONFIG); DO_TEST("net-virtio-s390", QEMU_CAPS_VIRTIO_S390); DO_TEST("net-virtio-ccw", @@ -2203,7 +2201,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -2228,7 +2225,6 @@ mymain(void) DO_TEST("q35-virtio-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -2251,7 +2247,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -2273,7 +2268,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -2295,7 +2289,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -2323,7 +2316,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 30bf68b02..30285623d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -437,7 +437,7 @@ mymain(void) DO_TEST("misc-uuid", NONE); DO_TEST("net-vhostuser", NONE); DO_TEST("net-user", NONE); - DO_TEST("net-user-addr", QEMU_CAPS_NETDEV); + DO_TEST("net-user-addr", NONE); DO_TEST("net-virtio", NONE); DO_TEST("net-virtio-device", NONE); DO_TEST("net-virtio-disable-offloads", NONE); @@ -754,7 +754,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -777,7 +776,6 @@ mymain(void) DO_TEST("q35-virtio-pci", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -800,7 +798,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -822,7 +819,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -844,7 +840,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, @@ -871,7 +866,6 @@ mymain(void) QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_NETDEV, QEMU_CAPS_DEVICE_VIRTIO_NET, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VIRTIO_GPU_VIRGL, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list