From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id B22351FF0DF for ; Thu, 15 Oct 2026 10:12:16 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 842672165A; Thu, 15 Oct 2026 10:11:37 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v2 8/9] cfg2cmd: q35: generate chipset devices with machine version 11.1+pve1 Date: Thu, 15 Oct 2026 10:10:30 +0200 Message-ID: <20261015081041.743422-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261015081041.743422-1-d.csapak@proxmox.com> References: <20261015081041.743422-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.317 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: OF6R3P4R224SHOUWNXIBRYODVCF2NP4W X-Message-ID-Hash: OF6R3P4R224SHOUWNXIBRYODVCF2NP4W X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Instead of loading the pve-q35-4.0.cfg machine config file, let `pci_bus_devices` generate the chipset devices. Since this must not change the devices of running guests for live migration, only do that starting with the new machine version 11.1+pve1. Older machines keep using the config file. Since the tests run with QEMU 11.1, the q35 tests without a pinned machine version now get the new revision and thus the generated devices. The tests with an older pinned machine version, as well as the Windows ones, which get pinned to their creation version, keep covering the config file. Add a test with hostpci devices and machine version 11.1+pve1 pinned, so the root ports are covered in combination with the generated chipset, independent of the QEMU version the tests run with. Signed-off-by: Dominik Csapak --- src/PVE/QemuServer.pm | 2 +- src/PVE/QemuServer/Machine.pm | 6 ++ .../cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-ide.conf.cmd | 21 ++++++- .../cfg2cmd/q35-linux-hostpci-11.1+pve1.conf | 21 +++++++ .../q35-linux-hostpci-11.1+pve1.conf.cmd | 61 +++++++++++++++++++ .../q35-linux-hostpci-driver-keep.conf.cmd | 21 ++++++- .../q35-linux-hostpci-mapping.conf.cmd | 21 ++++++- .../q35-linux-hostpci-multifunction.conf.cmd | 21 ++++++- ...q35-linux-hostpci-x-pci-overrides.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-linux-hostpci.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-scsihw2.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-simple.conf.cmd | 21 ++++++- .../cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd | 21 ++++++- .../q35-viommu-intel-guest-phys-bits.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-viommu-intel.conf.cmd | 21 ++++++- .../q35-viommu-virtio-aw-bits.conf.cmd | 21 ++++++- src/test/cfg2cmd/q35-viommu-virtio.conf.cmd | 21 ++++++- 19 files changed, 374 insertions(+), 31 deletions(-) create mode 100644 src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf create mode 100644 src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf.cmd diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index d6a5ed6b..fe16e44b 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3264,7 +3264,7 @@ sub config_to_command { $conf, $arch, $max_scsihw, $machine_version, $forcemachine, ); - if ($q35) { # tell QEMU to load q35 config early + if ($hw_config->uses_q35_config_file()) { # we use different pcie-port hardware for qemu >= 4.0 for passthrough if (min_version($machine_version, 4, 0)) { push @$devices, '-readconfig', '/usr/share/qemu-server/pve-q35-4.0.cfg'; diff --git a/src/PVE/QemuServer/Machine.pm b/src/PVE/QemuServer/Machine.pm index 35161d1f..e60377b2 100644 --- a/src/PVE/QemuServer/Machine.pm +++ b/src/PVE/QemuServer/Machine.pm @@ -50,6 +50,12 @@ our $PVE_MACHINE_VERSION = { '+pve2' => 'Enable hv_emcs for Windows 11/2022/2025 to mitigate issues with VBS.', }, }, + '11.1' => { + highest => 1, + revisions => { + '+pve1' => 'Generate the q35 chipset devices instead of loading pve-q35-4.0.cfg.', + }, + }, }; my $machine_fmt = { diff --git a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd index ab8e323c..3f30a66f 100644 --- a/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd +++ b/src/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd @@ -20,7 +20,24 @@ -m 512 \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -chardev 'socket,id=tpmchar,path=/var/run/qemu-server/8006.swtpm' \ @@ -29,4 +46,4 @@ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.conf.cmd index 242ccf62..02b44fba 100644 --- a/src/test/cfg2cmd/q35-ide.conf.cmd +++ b/src/test/cfg2cmd/q35-ide.conf.cmd @@ -23,7 +23,24 @@ -object '{"id":"throttle-drive-scsi0","limits":{},"qom-type":"throttle-group"}' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -43,4 +60,4 @@ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,device_id=drive-scsi0,bootindex=100,write-cache=on' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'hpet=off,type=q35+pve0' + -machine 'hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf b/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf new file mode 100644 index 00000000..6d71dbc8 --- /dev/null +++ b/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf @@ -0,0 +1,21 @@ +# TEST: q35 with hostpci and machine version 11.1+pve1 generates the chipset devices and root ports +# QEMU_VERSION: 11.1.0 +bios: ovmf +bootdisk: scsi0 +cores: 1 +efidisk0: local:100/vm-100-disk-1.qcow2,size=128K +hostpci0: 00:ff.1 +hostpci1: d0:13.0,pcie=1 +hostpci2: 00:f4.0 +hostpci3: d0:15.1,pcie=1 +hostpci4: d0:17.0,pcie=1,rombar=0 +hostpci7: d0:15.2,pcie=1 +machine: pc-q35-11.1+pve1 +memory: 512 +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 +numa: 1 +ostype: l26 +scsihw: virtio-scsi-pci +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687 +sockets: 2 +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d diff --git a/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf.cmd new file mode 100644 index 00000000..c76be284 --- /dev/null +++ b/src/test/cfg2cmd/q35-linux-hostpci-11.1+pve1.conf.cmd @@ -0,0 +1,61 @@ +/usr/bin/kvm \ + -id 8006 \ + -name vm8006 \ + -no-shutdown \ + -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ + -object 'monitor-qmp,chardev=qmp,id=monitor-qmp' \ + -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect-ms=5000' \ + -object 'monitor-qmp,chardev=qmp-event,id=monitor-qmp-event' \ + -pidfile /var/run/qemu-server/8006.pid \ + -daemonize \ + -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ + -object '{"id":"throttle-drive-efidisk0","limits":{},"qom-type":"throttle-group"}' \ + -blockdev '{"driver":"raw","file":{"driver":"file","filename":"/usr/share/pve-edk2-firmware//OVMF_CODE.fd"},"node-name":"pflash0","read-only":true}' \ + -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":false,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vz/images/100/vm-100-disk-1.qcow2","node-name":"e70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"f70e3017c5a79fdee5a04aa92ac1e9c","read-only":false},"node-name":"drive-efidisk0","read-only":false,"throttle-group":"throttle-drive-efidisk0"}' \ + -smp '2,sockets=2,cores=1,maxcpus=2' \ + -nodefaults \ + -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \ + -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \ + -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ + -m 512 \ + -object 'memory-backend-ram,id=ram-node0,size=256M' \ + -numa 'node,nodeid=0,cpus=0,memdev=ram-node0' \ + -object 'memory-backend-ram,id=ram-node1,size=256M' \ + -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ + -global 'ICH9-LPC.disable_s3=1' \ + -global 'ICH9-LPC.disable_s4=1' \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ + -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ + -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \ + -device 'pcie-root-port,id=ich9-pcie-port-8,addr=10.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=8,chassis=8' \ + -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ + -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ + -device 'vfio-pci,host=0000:00:ff.1,id=hostpci0,bus=pci.0,addr=0x10' \ + -device 'vfio-pci,host=0000:d0:13.0,id=hostpci1,bus=ich9-pcie-port-2,addr=0x0' \ + -device 'vfio-pci,host=0000:00:f4.0,id=hostpci2,bus=pci.0,addr=0x1b' \ + -device 'vfio-pci,host=0000:d0:15.1,id=hostpci3,bus=ich9-pcie-port-4,addr=0x0' \ + -device 'vfio-pci,host=0000:d0:17.0,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0,rombar=0' \ + -device 'vfio-pci,host=0000:d0:15.2,id=hostpci7,bus=ich9-pcie-port-8,addr=0x0' \ + -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ + -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ + -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ + -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ + -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=pc-q35-11.1+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd index d64264ec..ac7b8720 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-driver-keep.conf.cmd @@ -25,7 +25,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \ -device 'pcie-root-port,id=ich9-pcie-port-8,addr=10.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=8,chassis=8' \ @@ -42,4 +59,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd index b50827d2..e5910191 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-mapping.conf.cmd @@ -25,7 +25,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -37,4 +54,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd index 630f2a9b..fbd0e30b 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd @@ -25,7 +25,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -37,4 +54,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd index e1a02dce..0d27ee31 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd @@ -25,7 +25,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -36,4 +53,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd index d64264ec..ac7b8720 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci.conf.cmd @@ -25,7 +25,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'pcie-root-port,id=ich9-pcie-port-5,addr=10.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=5,chassis=5' \ -device 'pcie-root-port,id=ich9-pcie-port-8,addr=10.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=8,chassis=8' \ @@ -42,4 +59,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd b/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd index 11ebc6bf..ca3626a0 100644 --- a/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-ivshmem.conf.cmd @@ -22,7 +22,24 @@ -numa 'node,nodeid=1,cpus=1,memdev=ram-node1' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -33,4 +50,4 @@ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ -device 'ivshmem-plain,memdev=ivshmem,bus=pcie.0,addr=0x14,' \ -object 'memory-backend-file,id=ivshmem,share=on,mem-path=/dev/shm/pve-shm-8006,size=512M' \ - -machine 'hpet=off,type=q35+pve0' + -machine 'hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-scsihw2.conf.cmd b/src/test/cfg2cmd/q35-scsihw2.conf.cmd index da1a251a..e2cced76 100644 --- a/src/test/cfg2cmd/q35-scsihw2.conf.cmd +++ b/src/test/cfg2cmd/q35-scsihw2.conf.cmd @@ -22,7 +22,24 @@ -object '{"id":"throttle-drive-scsi15","limits":{},"qom-type":"throttle-group"}' \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -34,4 +51,4 @@ -device 'scsi-hd,bus=scsihw2.0,scsi-id=1,drive=drive-scsi15,id=scsi15,device_id=drive-scsi15,write-cache=on' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-simple.conf.cmd b/src/test/cfg2cmd/q35-simple.conf.cmd index c01f9e98..75fc78d9 100644 --- a/src/test/cfg2cmd/q35-simple.conf.cmd +++ b/src/test/cfg2cmd/q35-simple.conf.cmd @@ -21,7 +21,24 @@ -m 512 \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ @@ -30,4 +47,4 @@ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/usr/libexec/qemu-server/pve-bridge,downscript=/usr/libexec/qemu-server/pve-bridgedown,vhost=on' \ -device 'virtio-net-pci,mac=2E:01:68:F9:9C:87,netdev=net0,bus=pci.0,addr=0x12,id=net0,rx_queue_size=1024,tx_queue_size=256,bootindex=300,host_mtu=1500,host_tunnel=off' \ - -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve0' + -machine 'pflash0=pflash0,pflash1=drive-efidisk0,hpet=off,type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd index f7c44beb..8b00caba 100644 --- a/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel-aw-bits.conf.cmd @@ -17,10 +17,27 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on,aw-bits=39' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'type=q35+pve0,kernel-irqchip=split' + -machine 'type=q35+pve1,kernel-irqchip=split' diff --git a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd index dab8c958..f000d64d 100644 --- a/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel-guest-phys-bits.conf.cmd @@ -17,10 +17,27 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'type=q35+pve0,kernel-irqchip=split' + -machine 'type=q35+pve1,kernel-irqchip=split' diff --git a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd index fd77a3c5..0191389b 100644 --- a/src/test/cfg2cmd/q35-viommu-intel.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-intel.conf.cmd @@ -17,10 +17,27 @@ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ -device 'intel-iommu,intremap=on,caching-mode=on' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'type=q35+pve0,kernel-irqchip=split' + -machine 'type=q35+pve1,kernel-irqchip=split' diff --git a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd index 51630e2c..1b079349 100644 --- a/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-virtio-aw-bits.conf.cmd @@ -16,11 +16,28 @@ -m 512 \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -device 'virtio-iommu-pci,aw-bits=39' \ - -machine 'type=q35+pve0' + -machine 'type=q35+pve1' diff --git a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd index 400d3247..205fc7ee 100644 --- a/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd +++ b/src/test/cfg2cmd/q35-viommu-virtio.conf.cmd @@ -16,11 +16,28 @@ -m 512 \ -global 'ICH9-LPC.disable_s3=1' \ -global 'ICH9-LPC.disable_s4=1' \ - -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ + -device 'ich9-usb-ehci1,id=ehci,multifunction=on,bus=pcie.0,addr=0x1d.7' \ + -device 'ich9-usb-uhci1,id=uhci-1,multifunction=on,bus=pcie.0,addr=0x1d,masterbus=ehci.0,firstport=0' \ + -device 'ich9-usb-uhci2,id=uhci-2,multifunction=on,bus=pcie.0,addr=0x1d.1,masterbus=ehci.0,firstport=2' \ + -device 'ich9-usb-uhci3,id=uhci-3,multifunction=on,bus=pcie.0,addr=0x1d.2,masterbus=ehci.0,firstport=4' \ + -device 'ich9-usb-ehci2,id=ehci-2,multifunction=on,bus=pcie.0,addr=0x1a.7' \ + -device 'ich9-usb-uhci4,id=uhci-4,multifunction=on,bus=pcie.0,addr=0x1a,masterbus=ehci-2.0,firstport=0' \ + -device 'ich9-usb-uhci5,id=uhci-5,multifunction=on,bus=pcie.0,addr=0x1a.1,masterbus=ehci-2.0,firstport=2' \ + -device 'ich9-usb-uhci6,id=uhci-6,multifunction=on,bus=pcie.0,addr=0x1a.2,masterbus=ehci-2.0,firstport=4' \ + -device 'ich9-intel-hda,id=audio0,bus=pcie.0,addr=0x1b' \ + -device 'pcie-root-port,id=ich9-pcie-port-1,addr=1c.0,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=1,chassis=1' \ + -device 'pcie-root-port,id=ich9-pcie-port-2,addr=1c.1,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=2,chassis=2' \ + -device 'pcie-root-port,id=ich9-pcie-port-3,addr=1c.2,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=3,chassis=3' \ + -device 'pcie-root-port,id=ich9-pcie-port-4,addr=1c.3,x-speed=16,x-width=32,multifunction=on,bus=pcie.0,port=4,chassis=4' \ + -device 'i82801b11-bridge,id=pcidmi,bus=pcie.0,addr=0x1e' \ + -device 'pci-bridge,id=pci.0,chassis_nr=1,bus=pcidmi,addr=0x1' \ + -device 'pci-bridge,id=pci.1,chassis_nr=2,bus=pcidmi,addr=0x2' \ + -device 'pci-bridge,id=pci.2,chassis_nr=3,bus=pcidmi,addr=0x3' \ + -device 'pci-bridge,id=pci.3,chassis_nr=4,bus=pcidmi,addr=0x4' \ -device 'pci-bridge,id=pci.4,chassis_nr=4,bus=pci.1,addr=0x1c' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3,free-page-reporting=on' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ -device virtio-iommu-pci \ - -machine 'type=q35+pve0' + -machine 'type=q35+pve1' -- 2.47.3