From nobody Mon Apr 29 01:50:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1667559601; cv=none; d=zohomail.com; s=zohoarc; b=GwvzlVPXqMwaIe/pCC8mLPwGrQkgdX/98ie2UFyg05bKo54jUjtp6VAbtymTu5ExLOGhglMu/ZjoSuLr9D2uuXIEMa9Izwl/Uo7WuXP1W4E0PL+z1M3TQ6ppcLlU/4707bncpWsVm95NPVRe3NMvSxIIFjAk9DUnJZ0he/JyFlo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667559601; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=nDT1IpLCj+7hUme/34inuixqiTbOyPBzmJLOnNFB/s0=; b=f/vU938rWRJd0Hemfx0ZD+tWh2iZCb9vl5gQdvllsTsZN1/8MuSO3KiQxZZAgsUORapgTCzO67Ln44KwuSTzdMkC48PvBoydsN53rt2qufjx0TWjHwzJXhtgiLOHZwDkJFRHtk93zYawjy8ikZ+6xHgBHNh5dIXvCDr6GWb/B8E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1667559601554664.6705631441425; Fri, 4 Nov 2022 04:00:01 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-160-RJ3nSo-0NP2YiOGBxjz00w-1; Fri, 04 Nov 2022 06:59:58 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 60A85801231; Fri, 4 Nov 2022 10:59:56 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DBE8C2C8C5; Fri, 4 Nov 2022 10:59:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 54E811946587; Fri, 4 Nov 2022 10:59:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3075A1946586 for ; Fri, 4 Nov 2022 10:59:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id ED7032166B48; Fri, 4 Nov 2022 10:59:52 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E50382166B26 for ; Fri, 4 Nov 2022 10:59:52 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B6F2385A5A6 for ; Fri, 4 Nov 2022 10:59:52 +0000 (UTC) Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-508-sMjudP0TOe6rBwUhb6mCrg-1; Fri, 04 Nov 2022 06:59:49 -0400 Received: from [192.168.16.58] (helo=localhost.localdomain) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1oqu86-000TwK-1d; Fri, 04 Nov 2022 11:43:45 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667559600; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=nDT1IpLCj+7hUme/34inuixqiTbOyPBzmJLOnNFB/s0=; b=FZ1ETfkBDZxAZjf8NggTU16xkmNGtK7EEb7YYU1ckUVl6QHDDD7o9uUaNsZnv1nqb/0w1R cJjiQP2AY2OgShr/3PCFX+tF6vfaaP9d0zPn30w1EF7NtrlTUxe+azToV9WgThM/cWya9Z DeAbkb9DqEiChREh0RBa6jV4Z82GlDE= X-MC-Unique: RJ3nSo-0NP2YiOGBxjz00w-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: sMjudP0TOe6rBwUhb6mCrg-1 From: Oleg Vasilev To: libvir-list@redhat.com Subject: [PATCH] qemu: add pcie-to-pci-bridge for q35 machines Date: Fri, 4 Nov 2022 16:43:00 +0600 Message-Id: <20221104104300.1893081-1-oleg.vasilev@virtuozzo.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Oleg Vasilev , "Denis V . Lunev" Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1667559604291100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Hotplugging PCI devices on pc-i440fx machines is supported without additional configuration. On q35, pcie-to-pci-bridge needs to be added prior to the machine startup in order to support hotplug [1]. The idea is to support the same workflow for creating VMs in q35, as was in pc. Namely, do not require additional configuration when hotplugging is needed. Otherwise, all libvirt clients need to be updated which there are a lot and they are maintained by different parties. Instead, a pcie-to-pci-bridge better be created by default, so that PCI slots are readily available. Might be a good idea to make it configurable in the future. Previously there was a pci-bridge present by default, but was removed in d5fb8f4564 (qemu: don't add pci-bridge to Q35/arm domains unless it's nee= ded, 2016-04-22) [1]: https://libvirt.org/pci-hotplug.html Signed-off-by: Oleg Vasilev --- src/qemu/qemu_domain.c | 19 +++-- .../boot-floppy-q35.x86_64-latest.args | 5 +- .../cpu-host-model.x86_64-4.2.0.args | 9 +- .../cpu-host-model.x86_64-5.0.0.args | 9 +- .../cpu-host-model.x86_64-5.1.0.args | 9 +- .../cpu-host-model.x86_64-5.2.0.args | 9 +- .../cpu-host-model.x86_64-6.0.0.args | 9 +- .../cpu-host-model.x86_64-6.1.0.args | 9 +- .../cpu-host-model.x86_64-latest.args | 9 +- .../disk-floppy-q35.x86_64-latest.args | 5 +- ...are-auto-bios-stateless.x86_64-latest.args | 2 + .../firmware-auto-bios.x86_64-latest.args | 2 + ...-auto-efi-enrolled-keys.x86_64-latest.args | 2 + ...-auto-efi-loader-secure.x86_64-latest.args | 2 + ...to-efi-no-enrolled-keys.x86_64-latest.args | 2 + ...are-auto-efi-no-secboot.x86_64-latest.args | 2 + ...firmware-auto-efi-nvram.x86_64-latest.args | 2 + ...rmware-auto-efi-secboot.x86_64-latest.args | 2 + ...ware-auto-efi-stateless.x86_64-latest.args | 2 + .../firmware-auto-efi.x86_64-latest.args | 2 + ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args | 5 +- ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args | 5 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 + .../qemuxml2argvdata/intel-iommu-aw-bits.xml | 9 ++ ...ntel-iommu-caching-mode.x86_64-latest.args | 2 + .../intel-iommu-caching-mode.xml | 9 ++ ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 + .../intel-iommu-device-iotlb.xml | 9 ++ .../intel-iommu-eim.x86_64-latest.args | 2 + tests/qemuxml2argvdata/intel-iommu-eim.xml | 9 ++ .../intel-iommu.x86_64-latest.args | 2 + tests/qemuxml2argvdata/intel-iommu.xml | 9 ++ .../machine-smm-off.x86_64-latest.args | 2 + .../machine-smm-on.x86_64-latest.args | 2 + ...q35-default-devices-only.x86_64-4.2.0.args | 9 +- ...35-default-devices-only.x86_64-latest.args | 9 +- .../q35-pcie-autoadd.x86_64-4.2.0.args | 53 ++++++------ .../q35-pcie-autoadd.x86_64-latest.args | 53 ++++++------ .../q35-virt-manager-basic.x86_64-4.2.0.args | 21 ++--- .../q35-virt-manager-basic.x86_64-latest.args | 21 ++--- .../tseg-explicit-size.x86_64-latest.args | 9 +- .../user-aliases2.x86_64-latest.args | 5 +- .../virtio-iommu-x86_64.x86_64-latest.args | 4 +- ...virtio-non-transitional.x86_64-latest.args | 37 ++++---- .../virtio-transitional.x86_64-latest.args | 3 +- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 13 +-- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 13 +-- .../x86_64-q35-graphics.x86_64-latest.args | 25 +++--- .../x86_64-q35-headless.x86_64-latest.args | 25 +++--- ...ware-auto-bios-stateless.x86_64-latest.xml | 9 ++ .../firmware-auto-bios.x86_64-latest.xml | 9 ++ ...e-auto-efi-enrolled-keys.x86_64-latest.xml | 9 ++ ...e-auto-efi-loader-secure.x86_64-latest.xml | 9 ++ ...uto-efi-no-enrolled-keys.x86_64-latest.xml | 9 ++ ...ware-auto-efi-no-secboot.x86_64-latest.xml | 9 ++ .../firmware-auto-efi-nvram.x86_64-latest.xml | 9 ++ ...irmware-auto-efi-secboot.x86_64-latest.xml | 9 ++ .../firmware-auto-efi.x86_64-latest.xml | 9 ++ ...dev-scsi-vhost-scsi-pcie.x86_64-latest.xml | 10 ++- .../machine-smm-off.x86_64-latest.xml | 9 ++ .../machine-smm-on.x86_64-latest.xml | 9 ++ .../net-isolated-port.x86_64-latest.xml | 18 ++-- ...q35-default-devices-only.x86_64-latest.xml | 18 ++-- .../q35-pcie-autoadd.x86_64-latest.xml | 84 ++++++++++--------- .../q35-virt-manager-basic.x86_64-latest.xml | 36 ++++---- .../tseg-explicit-size.x86_64-latest.xml | 18 ++-- .../virtio-iommu-x86_64.x86_64-latest.xml | 11 ++- .../virtio-non-transitional.x86_64-latest.xml | 60 ++++++------- .../virtio-transitional.x86_64-latest.xml | 7 +- ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml | 24 +++--- ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml | 24 +++--- .../x86_64-q35-graphics.x86_64-latest.xml | 46 +++++----- .../x86_64-q35-headless.x86_64-latest.xml | 46 +++++----- 73 files changed, 621 insertions(+), 361 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 9ef6c8bb64..52a393e07f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3890,6 +3890,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, bool addImplicitSATA =3D false; bool addPCIRoot =3D false; bool addPCIeRoot =3D false; + bool addPCIeToPCIBridge =3D false; bool addDefaultMemballoon =3D true; bool addDefaultUSBKBD =3D false; bool addDefaultUSBMouse =3D false; @@ -3910,6 +3911,8 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, if (qemuDomainIsQ35(def)) { addPCIeRoot =3D true; addImplicitSATA =3D true; + if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE)) + addPCIeToPCIBridge =3D true; =20 /* Prefer adding a USB3 controller if supported, fall back * to USB2 if there is no USB3 available, and if that's @@ -4046,11 +4049,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } } =20 - /* When a machine has a pcie-root, make sure that there is always - * a dmi-to-pci-bridge controller added as bus 1, and a pci-bridge - * as bus 2, so that standard PCI devices can be connected - * - * NB: any machine that sets addPCIeRoot to true must also return + /* NB: any machine that sets addPCIeRoot to true must also return * true from the function qemuDomainSupportsPCI(). */ if (addPCIeRoot) { @@ -4069,6 +4068,16 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, } } =20 + /* Add a pcie-to-pci-bridge and pcie-root-port to plug it into. */ + if (addPCIeToPCIBridge) { + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _PCI, 1, + VIR_DOMAIN_CONTROLLER_MODEL_PCIE_RO= OT_PORT) < 0) + return -1; + if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE= _PCI, 2, + VIR_DOMAIN_CONTROLLER_MODEL_PCIE_TO= _PCI_BRIDGE) < 0) + return -1; + } + if (addDefaultMemballoon && !def->memballoon) { virDomainMemballoonDef *memballoon; memballoon =3D g_new0(virDomainMemballoonDef, 1); diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args index 7f34c7a965..75aae3254c 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args index 4b2b55be62..577ea9cd8a 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args @@ -27,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args index 2ea818cc13..838265acbf 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args @@ -27,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args index c6e2f345b8..50b8d56390 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args @@ -27,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args index 5bb6545e62..40302a86ee 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args @@ -28,10 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args index 57ae8a19d8..d39171386f 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args @@ -28,10 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/test= s/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args index baf0955027..3b0b09a93c 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args @@ -28,10 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index 853f0d9505..4a57f1dc98 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -28,10 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args index 810cc0796d..59da018898 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lates= t.args index 1d45a8cfba..a27bfa997d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args @@ -27,6 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args b= /tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args index 1d45a8cfba..a27bfa997d 100644 --- a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args @@ -27,6 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64= -latest.args index 0b02464963..7dbed3af6e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.= args @@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-= latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64= -latest.args index 0b02464963..7dbed3af6e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.= args @@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_= 64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.= x86_64-latest.args index a1ef95ee03..9b24126035 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late= st.args @@ -30,6 +30,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lat= est.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lates= t.args index a1ef95ee03..9b24126035 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args @@ -30,6 +30,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args index 3659889bf3..78871166a7 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args @@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest= .args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args index 0b02464963..7dbed3af6e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args @@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-late= st.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.= args index b79c141b18..5e36ff4854 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/= tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args index 0b02464963..7dbed3af6e 100644 --- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args @@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2= .0.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.= args index 992d8ec905..eec461d679 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,bus=3Dpci.1,addr=3D0x0 \ +-device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,bus=3Dpci.3,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lat= est.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lates= t.args index 98b5e9b0ad..af1afcc455 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd= ":"3","id":"hostdev0","bus":"pci.3","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index 417b5fb9dc..dbcb8d7e93 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","aw-bits":4= 8}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml b/tests/qemuxml= 2argvdata/intel-iommu-aw-bits.xml index b4eb81ff5d..6db13b476c 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml @@ -21,6 +21,15 @@ /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index bfcfc35e28..bc98aeb691 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","caching-mo= de":true}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml b/tests/qe= muxml2argvdata/intel-iommu-caching-mode.xml index 4aa4bacf5b..9fb1bcdf8a 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml @@ -21,6 +21,15 @@ /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index 95cd9d26ef..9787ba9b1e 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","device-iot= lb":true}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml b/tests/qe= muxml2argvdata/intel-iommu-device-iotlb.xml index e106737e6a..577bf9bbbd 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml @@ -21,6 +21,15 @@ /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index 12113a2800..a27b8c581b 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","eim":"on"}= ' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.xml b/tests/qemuxml2arg= vdata/intel-iommu-eim.xml index c4942e4c79..76a99bc7f9 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.xml +++ b/tests/qemuxml2argvdata/intel-iommu-eim.xml @@ -21,6 +21,15 @@ /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+
diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index c99efd229b..53c92f69c1 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -28,6 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"intel-iommu","id":"iommu0"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu.xml b/tests/qemuxml2argvdat= a/intel-iommu.xml index 8badf6c970..2aa3c5a3c0 100644 --- a/tests/qemuxml2argvdata/intel-iommu.xml +++ b/tests/qemuxml2argvdata/intel-iommu.xml @@ -18,6 +18,15 @@ /usr/bin/qemu-system-x86_64 + + + +
+ + + +
+
diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/te= sts/qemuxml2argvdata/machine-smm-off.x86_64-latest.args index 46f6a4a70c..737ed31919 100644 --- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args @@ -27,6 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tes= ts/qemuxml2argvdata/machine-smm-on.x86_64-latest.args index 6fde375523..ced719d4e2 100644 --- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args @@ -27,6 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.a= rgs b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args index a4de318a05..d2995d16d0 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args @@ -27,10 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ --device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ --device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.3,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.= args b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args index ce5b2a216e..d3889717f4 100644 --- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args @@ -28,10 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args b/te= sts/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args index 787cbfa511..1f629a0371 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args @@ -27,39 +27,40 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ --device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ --device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ --device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ --device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ --device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ --device pcie-root-port,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x6 \ --device pcie-root-port,port=3D23,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x2.0x7 \ --device pcie-root-port,port=3D24,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi= function=3Don,addr=3D0x3 \ --device pcie-root-port,port=3D25,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x3.0x1 \ --device pcie-root-port,port=3D26,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x3.0x2 \ --device pcie-root-port,port=3D27,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x3.0x3 \ --device pcie-root-port,port=3D28,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x3.0x4 \ --device pcie-root-port,port=3D29,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x3.0x5 \ --device nec-usb-xhci,id=3Dusb,bus=3Dpci.6,addr=3D0x0 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.5,addr=3D0x0 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.4,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D17,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D19,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device pcie-root-port,port=3D22,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x2.0x6 \ +-device pcie-root-port,port=3D23,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,addr= =3D0x2.0x7 \ +-device pcie-root-port,port=3D24,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,mul= tifunction=3Don,addr=3D0x3 \ +-device pcie-root-port,port=3D25,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x3.0x1 \ +-device pcie-root-port,port=3D26,chassis=3D12,id=3Dpci.12,bus=3Dpcie.0,add= r=3D0x3.0x2 \ +-device pcie-root-port,port=3D27,chassis=3D13,id=3Dpci.13,bus=3Dpcie.0,add= r=3D0x3.0x3 \ +-device pcie-root-port,port=3D28,chassis=3D14,id=3Dpci.14,bus=3Dpcie.0,add= r=3D0x3.0x4 \ +-device pcie-root-port,port=3D29,chassis=3D15,id=3Dpci.15,bus=3Dpcie.0,add= r=3D0x3.0x5 \ +-device nec-usb-xhci,id=3Dusb,bus=3Dpci.8,addr=3D0x0 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.7,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.6,addr=3D0x0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.7,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk1,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.1,addr=3D0x0 \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.3,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.4,addr=3D0x0 \ -netdev user,id=3Dhostnet1 \ --device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp= ci.3,addr=3D0x0 \ --device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.10,addr=3D0x0 \ --device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.11,addr=3D0x0 \ --device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.12,addr=3D0x0 \ --device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.13,addr=3D0x0 \ +-device e1000e,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:66,bus=3Dp= ci.5,addr=3D0x0 \ +-device virtio-input-host-pci,id=3Dinput0,evdev=3D/dev/input/event1234,bus= =3Dpci.12,addr=3D0x0 \ +-device virtio-mouse-pci,id=3Dinput1,bus=3Dpci.13,addr=3D0x0 \ +-device virtio-keyboard-pci,id=3Dinput2,bus=3Dpci.14,addr=3D0x0 \ +-device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.8,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \ -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.9,addr=3D0x0 \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12= 34,bus=3Dpci.11,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/t= ests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args index 7992c33ace..4dd06294f5 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args @@ -28,39 +28,40 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"pcie-root-port","port":22,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x6"}' \ --device '{"driver":"pcie-root-port","port":23,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x2.0x7"}' \ --device '{"driver":"pcie-root-port","port":24,"chassis":9,"id":"pci.9","bu= s":"pcie.0","multifunction":true,"addr":"0x3"}' \ --device '{"driver":"pcie-root-port","port":25,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x3.0x1"}' \ --device '{"driver":"pcie-root-port","port":26,"chassis":11,"id":"pci.11","= bus":"pcie.0","addr":"0x3.0x2"}' \ --device '{"driver":"pcie-root-port","port":27,"chassis":12,"id":"pci.12","= bus":"pcie.0","addr":"0x3.0x3"}' \ --device '{"driver":"pcie-root-port","port":28,"chassis":13,"id":"pci.13","= bus":"pcie.0","addr":"0x3.0x4"}' \ --device '{"driver":"pcie-root-port","port":29,"chassis":14,"id":"pci.14","= bus":"pcie.0","addr":"0x3.0x5"}' \ --device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.6","addr":"0x0"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.5","addr":"0x= 0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.4"= ,"addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"pcie-root-port","port":19,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x3"}' \ +-device '{"driver":"pcie-root-port","port":20,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x4"}' \ +-device '{"driver":"pcie-root-port","port":21,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x5"}' \ +-device '{"driver":"pcie-root-port","port":22,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x2.0x6"}' \ +-device '{"driver":"pcie-root-port","port":23,"chassis":9,"id":"pci.9","bu= s":"pcie.0","addr":"0x2.0x7"}' \ +-device '{"driver":"pcie-root-port","port":24,"chassis":10,"id":"pci.10","= bus":"pcie.0","multifunction":true,"addr":"0x3"}' \ +-device '{"driver":"pcie-root-port","port":25,"chassis":11,"id":"pci.11","= bus":"pcie.0","addr":"0x3.0x1"}' \ +-device '{"driver":"pcie-root-port","port":26,"chassis":12,"id":"pci.12","= bus":"pcie.0","addr":"0x3.0x2"}' \ +-device '{"driver":"pcie-root-port","port":27,"chassis":13,"id":"pci.13","= bus":"pcie.0","addr":"0x3.0x3"}' \ +-device '{"driver":"pcie-root-port","port":28,"chassis":14,"id":"pci.14","= bus":"pcie.0","addr":"0x3.0x4"}' \ +-device '{"driver":"pcie-root-port","port":29,"chassis":15,"id":"pci.15","= bus":"pcie.0","addr":"0x3.0x5"}' \ +-device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.8","addr":"0x0"}' \ +-device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.7","addr":"0x= 0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.6"= ,"addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.7","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.9","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk1","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.3","addr":"0x0"}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.4","addr":"0x0"}' \ -netdev user,id=3Dhostnet1 \ --device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:2= 2:33:44:66","bus":"pci.3","addr":"0x0"}' \ --device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.10","addr":"0x0"}' \ --device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.11","addr":= "0x0"}' \ --device '{"driver":"virtio-keyboard-pci","id":"input2","bus":"pci.12","add= r":"0x0"}' \ --device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.13","addr"= :"0x0"}' \ +-device '{"driver":"e1000e","netdev":"hostnet1","id":"net1","mac":"00:11:2= 2:33:44:66","bus":"pci.5","addr":"0x0"}' \ +-device '{"driver":"virtio-input-host-pci","id":"input0","evdev":"/dev/inp= ut/event1234","bus":"pci.12","addr":"0x0"}' \ +-device '{"driver":"virtio-mouse-pci","id":"input1","bus":"pci.13","addr":= "0x0"}' \ +-device '{"driver":"virtio-keyboard-pci","id":"input2","bus":"pci.14","add= r":"0x0"}' \ +-device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.15","addr"= :"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pcie.= 0","addr":"0x1"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.8","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.10","ad= dr":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes= ":123,"period":1234,"bus":"pci.9","addr":"0x0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes= ":123,"period":1234,"bus":"pci.11","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.arg= s b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args index 14093a3f80..b67790f066 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args @@ -29,18 +29,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic= /.config \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ -device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ --device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ --device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ --device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ --device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ --device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ --device nec-usb-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D17,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D19,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device nec-usb-xhci,id=3Dusb,bus=3Dpci.4,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.5,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk0,bootindex=3D1 \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.6,addr=3D0x0,drive=3Dlibvirt-1= -format,id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.3,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ @@ -57,6 +58,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D2 \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D3 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.7,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args index 77a7cf5e4f..02f3ef021f 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args @@ -30,18 +30,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic= /.config \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"pcie-root-port","port":19,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x3"}' \ +-device '{"driver":"pcie-root-port","port":20,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x4"}' \ +-device '{"driver":"pcie-root-port","port":21,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x5"}' \ +-device '{"driver":"nec-usb-xhci","id":"usb","bus":"pci.4","addr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.5"= ,"addr":"0x0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.6","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:9a:e6:c6","bus":"pci.3","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ @@ -58,6 +59,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"2"}' \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ -device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"3"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 3371199be5..a3b6fab557 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -29,10 +29,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/test= s/qemuxml2argvdata/user-aliases2.x86_64-latest.args index 7f34c7a965..75aae3254c 100644 --- a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -device '{"driver":"isa-fdc","bootindexA":1}' \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args index 744367c6c0..0149b63cd5 100644 --- a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args @@ -26,7 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1= "}' \ +-device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x2= "}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 541c074871..18f83e6fe4 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -28,29 +28,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"pcie-root-port","port":15,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x7"}' \ --device '{"driver":"pcie-root-port","port":16,"chassis":9,"id":"pci.9","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"virtio-scsi-pci-non-transitional","id":"scsi0","bus":"= pci.4","addr":"0x0"}' \ --device '{"driver":"virtio-serial-pci-non-transitional","id":"virtio-seria= l0","bus":"pci.3","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"pcie-root-port","port":14,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x6"}' \ +-device '{"driver":"pcie-root-port","port":15,"chassis":9,"id":"pci.9","bu= s":"pcie.0","addr":"0x1.0x7"}' \ +-device '{"driver":"pcie-root-port","port":16,"chassis":10,"id":"pci.10","= bus":"pcie.0","multifunction":true,"addr":"0x2"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":11,"id":"pci.11","= bus":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"virtio-scsi-pci-non-transitional","id":"scsi0","bus":"= pci.6","addr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci-non-transitional","id":"virtio-seria= l0","bus":"pci.5","addr":"0x0"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.5","addr":= "0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.7","addr":= "0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci-non-transitional","id":"fs0","fsdev":"fs= dev-fs0","mount_tag":"fs1","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"virtio-9p-pci-non-transitional","id":"fs0","fsdev":"fs= dev-fs0","mount_tag":"fs1","bus":"pci.3","addr":"0x0"}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.4","addr":"0x0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678= 9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.6","addr":"0x0"}' \ --device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","= bus":"pci.7","addr":"0x0"}' \ +-device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678= 9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.8","addr":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","= bus":"pci.9","addr":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.8","addr":"0x0"}' \ +-device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.10","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.9","addr":"0x0"}' \ +-device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.11","addr":"0x0"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 6d18698ec7..a5730e9059 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -27,9 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","addr":"0x1"}' \ -device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"virtio-scsi-pci-transitional","id":"scsi0","bus":"pci.= 2","addr":"0x4"}' \ -device '{"driver":"virtio-serial-pci-transitional","id":"virtio-serial0",= "bus":"pci.2","addr":"0x3"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index 0368ecc699..b5cf29038f 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -27,14 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index c2eb8066df..4a3169e2a8 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -27,14 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.3","addr":"0x0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index 37a1afb897..31796d9fb6 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -30,19 +30,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"pcie-root-port","port":22,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x6"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":17,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x1"}' \ +-device '{"driver":"pcie-root-port","port":18,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x2"}' \ +-device '{"driver":"pcie-root-port","port":19,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x3"}' \ +-device '{"driver":"pcie-root-port","port":20,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x4"}' \ +-device '{"driver":"pcie-root-port","port":21,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x5"}' \ +-device '{"driver":"pcie-root-port","port":22,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x2.0x6"}' \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.4","a= ddr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.5"= ,"addr":"0x0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.6","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.3","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ @@ -51,8 +52,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710= 8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pcie.0",= "addr":"0x1"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .8","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index b4d90dff5e..6efcbf7943 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -31,26 +31,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device '{"driver":"pcie-root-port","port":10,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x2"}' \ +-device '{"driver":"pcie-root-port","port":11,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device '{"driver":"pcie-root-port","port":12,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x4"}' \ +-device '{"driver":"pcie-root-port","port":13,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x5"}' \ +-device '{"driver":"pcie-root-port","port":14,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x6"}' \ +-device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.4","a= ddr":"0x0"}' \ +-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.5"= ,"addr":"0x0"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device '{"driver":"virtio-blk-pci","bus":"pci.6","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.3","addr":"0x0"}' \ -chardev pty,id=3Dcharserial0 \ -device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","in= dex":0}' \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.7","add= r":"0x0"}' \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .8","addr":"0x0"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-l= atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-la= test.xml index f1b5516ce4..88d9581502 100644 --- a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x= ml +++ b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x= ml @@ -26,6 +26,15 @@
+ + + +
+ + + +
+