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 3A9531FF0B2 for ; Tue, 08 Sep 2026 15:58:30 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 3FAFA216B8; Tue, 08 Sep 2026 15:57:39 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH qemu-server v3 6/8] cfg2cmd: reject guests with machine version below 5.0 Date: Tue, 8 Sep 2026 15:52:06 +0200 Message-ID: <20260908135729.3869365-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260908135729.3869365-1-d.csapak@proxmox.com> References: <20260908135729.3869365-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.503 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) 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: 7K2PFBSE5E4XROW6SXP3G7BTJVSTJSQH X-Message-ID-Hash: 7K2PFBSE5E4XROW6SXP3G7BTJVSTJSQH 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: since commit c6b32373 (pbs-restore: set 'no-cache' on block devices backed by zfspool) qemu-server depends on qemu 11, which dropped machine versions below 5.0[0]. This makes it impossible for us to start them, so reject them early in `config_to_command`. This means we have to adapt all tests that reference machine versions before 5.0. Also add an extra test which tests the new error message. 0: https://wiki.qemu.org/ChangeLog/11.0 Signed-off-by: Dominik Csapak --- src/PVE/QemuServer.pm | 5 +++++ src/test/cfg2cmd/efi-raw-old.conf | 4 ++-- src/test/cfg2cmd/efi-raw-old.conf.cmd | 4 ++-- src/test/cfg2cmd/old-unsupported-machine-version.conf | 4 ++++ src/test/cfg2cmd/pinned-version-pxe-pve.conf | 2 +- src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd | 2 +- src/test/cfg2cmd/pinned-version.conf | 2 +- src/test/cfg2cmd/pinned-version.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-usb13-error.conf | 2 +- src/test/cfg2cmd/q35-usb2.conf | 2 +- src/test/cfg2cmd/q35-usb2.conf.cmd | 4 ++-- src/test/cfg2cmd/q35-usb3.conf | 2 +- src/test/cfg2cmd/q35-usb3.conf.cmd | 4 ++-- src/test/cfg2cmd/spice-enhancments.conf | 2 +- src/test/cfg2cmd/spice-enhancments.conf.cmd | 4 ++-- .../cfg2cmd/{spice-linux-4.1.conf => spice-linux-5.0.conf} | 2 +- .../{spice-linux-4.1.conf.cmd => spice-linux-5.0.conf.cmd} | 2 +- src/test/cfg2cmd/spice-usb3.conf | 2 +- src/test/cfg2cmd/spice-usb3.conf.cmd | 4 ++-- src/test/cfg2cmd/spice-win.conf | 2 +- src/test/cfg2cmd/spice-win.conf.cmd | 2 +- src/test/cfg2cmd/usb13-error.conf | 2 +- 22 files changed, 36 insertions(+), 27 deletions(-) create mode 100644 src/test/cfg2cmd/old-unsupported-machine-version.conf rename src/test/cfg2cmd/{spice-linux-4.1.conf => spice-linux-5.0.conf} (92%) rename src/test/cfg2cmd/{spice-linux-4.1.conf.cmd => spice-linux-5.0.conf.cmd} (97%) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index fbb0a23e..08580fed 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -3192,6 +3192,11 @@ sub config_to_command { . " or enable in BIOS.\n"; } + # check for the minimum required machine version explicitly + if (!$version_guard->(5, 0)) { + die "unsupported machine version '$machine_version'. At least version 5.0 is required\n"; + } + my $q35 = PVE::QemuServer::Machine::machine_type_is_q35($conf); my $hotplug_features = parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1'); diff --git a/src/test/cfg2cmd/efi-raw-old.conf b/src/test/cfg2cmd/efi-raw-old.conf index 621470ed..fd768d3f 100644 --- a/src/test/cfg2cmd/efi-raw-old.conf +++ b/src/test/cfg2cmd/efi-raw-old.conf @@ -1,5 +1,5 @@ -# TEST: Test raw efidisk size parameter on old version +# TEST: Test raw efidisk size parameter on old (pre-blockdev) machine version smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 bios: ovmf -machine: pc-i440fx-4.1+pve0 +machine: pc-i440fx-5.0+pve0 efidisk0: local:100/vm-100-disk-0.raw diff --git a/src/test/cfg2cmd/efi-raw-old.conf.cmd b/src/test/cfg2cmd/efi-raw-old.conf.cmd index 774607e6..d7bc32c6 100644 --- a/src/test/cfg2cmd/efi-raw-old.conf.cmd +++ b/src/test/cfg2cmd/efi-raw-old.conf.cmd @@ -10,7 +10,7 @@ -daemonize \ -smbios 'type=1,uuid=7b10d7af-b932-4c66-b2c3-3996152ec465' \ -drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \ - -drive 'if=pflash,unit=1,id=drive-efidisk0,format=raw,file=/var/lib/vz/images/100/vm-100-disk-0.raw' \ + -drive 'if=pflash,unit=1,id=drive-efidisk0,format=raw,file=/var/lib/vz/images/100/vm-100-disk-0.raw,size=131072' \ -smp '1,sockets=1,cores=1,maxcpus=1' \ -nodefaults \ -boot 'menu=on,strict=on,reboot-timeout=1000,splash=/usr/share/qemu-server/bootsplash.jpg' \ @@ -24,4 +24,4 @@ -device 'VGA,id=vga,bus=pci.0,addr=0x2' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'type=pc-i440fx-4.1+pve0' + -machine 'type=pc-i440fx-5.0+pve0' diff --git a/src/test/cfg2cmd/old-unsupported-machine-version.conf b/src/test/cfg2cmd/old-unsupported-machine-version.conf new file mode 100644 index 00000000..f2d3586d --- /dev/null +++ b/src/test/cfg2cmd/old-unsupported-machine-version.conf @@ -0,0 +1,4 @@ +# TEST: Test machine version minimum requirement and expect fail on old version +# EXPECT_ERROR: unsupported machine version '4.0'. At least version 5.0 is required +smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 +machine: pc-i440fx-4.0 diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf b/src/test/cfg2cmd/pinned-version-pxe-pve.conf index 36169d7b..21b92149 100644 --- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf +++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf @@ -2,7 +2,7 @@ bootdisk: scsi0 cores: 3 ide2: none,media=cdrom -machine: pc-q35-4.1+pve2.pxe +machine: pc-q35-5.0+pve0.pxe memory: 1024 name: pinned net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd index 41360544..fe7f1a2e 100644 --- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd +++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd @@ -30,4 +30,4 @@ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \ -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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300,romfile=pxe-virtio.rom' \ - -machine 'type=pc-q35-4.1+pve2' + -machine 'type=pc-q35-5.0+pve0' diff --git a/src/test/cfg2cmd/pinned-version.conf b/src/test/cfg2cmd/pinned-version.conf index 61191836..39b5f0ed 100644 --- a/src/test/cfg2cmd/pinned-version.conf +++ b/src/test/cfg2cmd/pinned-version.conf @@ -2,7 +2,7 @@ bootdisk: scsi0 cores: 3 ide2: none,media=cdrom -machine: pc-q35-3.1 +machine: pc-q35-5.0 memory: 1024 name: pinned net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 diff --git a/src/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pinned-version.conf.cmd index e26b35c6..3353da19 100644 --- a/src/test/cfg2cmd/pinned-version.conf.cmd +++ b/src/test/cfg2cmd/pinned-version.conf.cmd @@ -15,7 +15,7 @@ -vnc 'unix:/var/run/qemu-server/8006.vnc,password=on' \ -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ -m 1024 \ - -readconfig /usr/share/qemu-server/pve-q35.cfg \ + -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ -device 'vmgenid,guid=bdd46b98-fefc-11e9-97b4-d72c378e0f96' \ -device 'usb-tablet,id=tablet,bus=ehci.0,port=1' \ -device 'VGA,id=vga,bus=pcie.0,addr=0x1' \ @@ -28,4 +28,4 @@ -device 'scsi-hd,bus=scsihw0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0,id=scsi0,bootindex=100' \ -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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc-q35-3.1+pve0' + -machine 'type=pc-q35-5.0+pve0' diff --git a/src/test/cfg2cmd/q35-usb13-error.conf b/src/test/cfg2cmd/q35-usb13-error.conf index 4777902b..9c4ac55a 100644 --- a/src/test/cfg2cmd/q35-usb13-error.conf +++ b/src/test/cfg2cmd/q35-usb13-error.conf @@ -5,7 +5,7 @@ memory: 768 name: q35-usb3-error net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 ostype: l26 -machine: pc-q35-4.0 +machine: pc-q35-5.0 scsihw: virtio-scsi-pci smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 diff --git a/src/test/cfg2cmd/q35-usb2.conf b/src/test/cfg2cmd/q35-usb2.conf index b106b9e8..31341886 100644 --- a/src/test/cfg2cmd/q35-usb2.conf +++ b/src/test/cfg2cmd/q35-usb2.conf @@ -4,7 +4,7 @@ memory: 768 name: q35-usb2 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 ostype: l26 -machine: pc-q35-4.0 +machine: pc-q35-5.0 scsihw: virtio-scsi-pci smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 diff --git a/src/test/cfg2cmd/q35-usb2.conf.cmd b/src/test/cfg2cmd/q35-usb2.conf.cmd index 915e7008..6e082646 100644 --- a/src/test/cfg2cmd/q35-usb2.conf.cmd +++ b/src/test/cfg2cmd/q35-usb2.conf.cmd @@ -19,7 +19,7 @@ -device 'vmgenid,guid=c773c261-d800-4348-9f5d-167fadd53cf8' \ -chardev 'spicevmc,id=usbredirchardev1,name=usbredir' \ -device 'usb-redir,chardev=usbredirchardev1,id=usbredirdev1,bus=ehci.0' \ - -device 'qxl-vga,id=vga,bus=pcie.0,addr=0x1' \ + -device 'qxl-vga,id=vga,max_outputs=4,bus=pcie.0,addr=0x1' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ -chardev 'spicevmc,id=vdagent,name=vdagent' \ -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \ @@ -28,4 +28,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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc-q35-4.0+pve0' + -machine 'type=pc-q35-5.0+pve0' diff --git a/src/test/cfg2cmd/q35-usb3.conf b/src/test/cfg2cmd/q35-usb3.conf index 3e405919..1d82efe3 100644 --- a/src/test/cfg2cmd/q35-usb3.conf +++ b/src/test/cfg2cmd/q35-usb3.conf @@ -4,7 +4,7 @@ memory: 768 name: q35-usb3 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 ostype: l26 -machine: pc-q35-4.0 +machine: pc-q35-5.0 scsihw: virtio-scsi-pci smbios1: uuid=7b10d7af-b932-4c66-b2c3-3996152ec465 vmgenid: c773c261-d800-4348-9f5d-167fadd53cf8 diff --git a/src/test/cfg2cmd/q35-usb3.conf.cmd b/src/test/cfg2cmd/q35-usb3.conf.cmd index 0fe6f8cb..b2b319d5 100644 --- a/src/test/cfg2cmd/q35-usb3.conf.cmd +++ b/src/test/cfg2cmd/q35-usb3.conf.cmd @@ -20,7 +20,7 @@ -device 'nec-usb-xhci,id=xhci,bus=pci.1,addr=0x1b' \ -chardev 'spicevmc,id=usbredirchardev1,name=usbredir' \ -device 'usb-redir,chardev=usbredirchardev1,id=usbredirdev1,bus=xhci.0' \ - -device 'qxl-vga,id=vga,bus=pcie.0,addr=0x1' \ + -device 'qxl-vga,id=vga,max_outputs=4,bus=pcie.0,addr=0x1' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ -chardev 'spicevmc,id=vdagent,name=vdagent' \ -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \ @@ -29,4 +29,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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc-q35-4.0+pve0' + -machine 'type=pc-q35-5.0+pve0' diff --git a/src/test/cfg2cmd/spice-enhancments.conf b/src/test/cfg2cmd/spice-enhancments.conf index 895565c8..58f3b355 100644 --- a/src/test/cfg2cmd/spice-enhancments.conf +++ b/src/test/cfg2cmd/spice-enhancments.conf @@ -1,5 +1,5 @@ # TEST: Test for SPICE enhancements -machine: pc-i440fx-4.0 +machine: pc-i440fx-5.0 smbios1: uuid=363a6126-5f48-43e1-811f-013294a946a0 spice_enhancements: foldersharing=1,videostreaming=all vga: qxl diff --git a/src/test/cfg2cmd/spice-enhancments.conf.cmd b/src/test/cfg2cmd/spice-enhancments.conf.cmd index 6043488d..20049ca2 100644 --- a/src/test/cfg2cmd/spice-enhancments.conf.cmd +++ b/src/test/cfg2cmd/spice-enhancments.conf.cmd @@ -19,7 +19,7 @@ -device 'pci-bridge,id=pci.2,chassis_nr=2,bus=pci.0,addr=0x1f' \ -device 'vmgenid,guid=719b9591-1b0d-4e43-bca2-22b9ffbd3568' \ -device 'piix3-usb-uhci,id=uhci,bus=pci.0,addr=0x1.0x2' \ - -device 'qxl-vga,id=vga,bus=pci.0,addr=0x2' \ + -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ -chardev 'spicevmc,id=vdagent,name=vdagent' \ -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \ @@ -28,4 +28,4 @@ -spice 'tls-port=61000,addr=127.0.0.1,tls-ciphers=HIGH,seamless-migration=on,streaming-video=all' \ -device 'virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3' \ -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ - -machine 'type=pc-i440fx-4.0+pve0' + -machine 'type=pc-i440fx-5.0+pve0' diff --git a/src/test/cfg2cmd/spice-linux-4.1.conf b/src/test/cfg2cmd/spice-linux-5.0.conf similarity index 92% rename from src/test/cfg2cmd/spice-linux-4.1.conf rename to src/test/cfg2cmd/spice-linux-5.0.conf index e72cbe67..01c19a7d 100644 --- a/src/test/cfg2cmd/spice-linux-4.1.conf +++ b/src/test/cfg2cmd/spice-linux-5.0.conf @@ -1,6 +1,6 @@ # TEST: Test for SPICE with SPICE with max_outputs cores: 2 -machine: pc-i440fx-4.1 +machine: pc-i440fx-5.0 memory: 768 name: spicelinux net0: virtio=A2:C0:43:67:08:A1,bridge=vmbr0 diff --git a/src/test/cfg2cmd/spice-linux-4.1.conf.cmd b/src/test/cfg2cmd/spice-linux-5.0.conf.cmd similarity index 97% rename from src/test/cfg2cmd/spice-linux-4.1.conf.cmd rename to src/test/cfg2cmd/spice-linux-5.0.conf.cmd index 2d2b8055..5f3a8a92 100644 --- a/src/test/cfg2cmd/spice-linux-4.1.conf.cmd +++ b/src/test/cfg2cmd/spice-linux-5.0.conf.cmd @@ -28,4 +28,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=A2:C0:43:67:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc-i440fx-4.1+pve0' + -machine 'type=pc-i440fx-5.0+pve0' diff --git a/src/test/cfg2cmd/spice-usb3.conf b/src/test/cfg2cmd/spice-usb3.conf index 40d0dfb7..1242abfb 100644 --- a/src/test/cfg2cmd/spice-usb3.conf +++ b/src/test/cfg2cmd/spice-usb3.conf @@ -1,6 +1,6 @@ # TEST: Test for SPICE with a USB3 based SPICE port added cores: 2 -machine: pc-i440fx-4.0 +machine: pc-i440fx-5.0 memory: 768 name: spiceusb3 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 diff --git a/src/test/cfg2cmd/spice-usb3.conf.cmd b/src/test/cfg2cmd/spice-usb3.conf.cmd index 2df589f4..9c7bafd0 100644 --- a/src/test/cfg2cmd/spice-usb3.conf.cmd +++ b/src/test/cfg2cmd/spice-usb3.conf.cmd @@ -22,7 +22,7 @@ -device 'nec-usb-xhci,id=xhci,bus=pci.1,addr=0x1b' \ -chardev 'spicevmc,id=usbredirchardev1,name=usbredir' \ -device 'usb-redir,chardev=usbredirchardev1,id=usbredirdev1,bus=xhci.0' \ - -device 'qxl-vga,id=vga,bus=pci.0,addr=0x2' \ + -device 'qxl-vga,id=vga,max_outputs=4,bus=pci.0,addr=0x2' \ -device 'virtio-serial,id=spice,bus=pci.0,addr=0x9' \ -chardev 'spicevmc,id=vdagent,name=vdagent' \ -device 'virtserialport,chardev=vdagent,name=com.redhat.spice.0' \ @@ -31,4 +31,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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ - -machine 'type=pc-i440fx-4.0+pve0' + -machine 'type=pc-i440fx-5.0+pve0' diff --git a/src/test/cfg2cmd/spice-win.conf b/src/test/cfg2cmd/spice-win.conf index 67fb7bc7..0b5ace01 100644 --- a/src/test/cfg2cmd/spice-win.conf +++ b/src/test/cfg2cmd/spice-win.conf @@ -1,6 +1,6 @@ # TEST: Test for SPICE under Win10 with a USB3 based SPICE port added cores: 2 -machine: pc-i440fx-4.0 +machine: pc-i440fx-5.0 memory: 768 name: spiceusb3 net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 diff --git a/src/test/cfg2cmd/spice-win.conf.cmd b/src/test/cfg2cmd/spice-win.conf.cmd index a2885b2e..50aa6b69 100644 --- a/src/test/cfg2cmd/spice-win.conf.cmd +++ b/src/test/cfg2cmd/spice-win.conf.cmd @@ -34,4 +34,4 @@ -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=A2:C0:43:77:08:A1,netdev=net0,bus=pci.0,addr=0x12,id=net0,bootindex=300' \ -rtc 'driftfix=slew,base=localtime' \ - -machine 'hpet=off,type=pc-i440fx-4.0+pve0' + -machine 'hpet=off,type=pc-i440fx-5.0+pve0' diff --git a/src/test/cfg2cmd/usb13-error.conf b/src/test/cfg2cmd/usb13-error.conf index 257be94f..acb0dd70 100644 --- a/src/test/cfg2cmd/usb13-error.conf +++ b/src/test/cfg2cmd/usb13-error.conf @@ -1,7 +1,7 @@ # TEST: Test error for old machine type with newer usb config # EXPECT_ERROR: using usb13 is only possible with machine type >= 7.1 and ostype l26 or windows > 7 cores: 2 -machine: pc-i440fx-4.0 +machine: pc-i440fx-5.0 memory: 768 name: q35-usb3-error net0: virtio=A2:C0:43:77:08:A1,bridge=vmbr0 -- 2.47.3