From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6445F77088 for ; Thu, 21 Oct 2021 11:35:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B2241BB15 for ; Thu, 21 Oct 2021 11:34:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6E9D01BA5D for ; Thu, 21 Oct 2021 11:34:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 47BB345ABC for ; Thu, 21 Oct 2021 11:34:55 +0200 (CEST) To: Proxmox VE development discussion , Thomas Lamprecht References: <20211021083609.2057094-1-t.lamprecht@proxmox.com> <20211021083609.2057094-4-t.lamprecht@proxmox.com> From: Stefan Reiter Message-ID: <6e264086-e994-0958-a06f-8c1c0a257093@proxmox.com> Date: Thu, 21 Oct 2021 11:34:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20211021083609.2057094-4-t.lamprecht@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.627 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -2.267 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH 3/4] tests: cfg2cmd: add a few q35 related tests X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Oct 2021 09:35:28 -0000 On 10/21/21 10:36 AM, Thomas Lamprecht wrote: > Signed-off-by: Thomas Lamprecht > --- > test/cfg2cmd/q35-simple-6.0.conf | 13 ++++++++++ > test/cfg2cmd/q35-simple-6.0.conf.cmd | 28 +++++++++++++++++++++ > test/cfg2cmd/q35-simple-6.1.conf | 14 +++++++++++ > test/cfg2cmd/q35-simple-6.1.conf.cmd | 28 +++++++++++++++++++++ > test/cfg2cmd/q35-simple-pinned-6.1.conf | 13 ++++++++++ > test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd | 28 +++++++++++++++++++++ > test/cfg2cmd/q35-simple.conf | 13 ++++++++++ > test/cfg2cmd/q35-simple.conf.cmd | 28 +++++++++++++++++++++ > 8 files changed, 165 insertions(+) > create mode 100644 test/cfg2cmd/q35-simple-6.0.conf > create mode 100644 test/cfg2cmd/q35-simple-6.0.conf.cmd > create mode 100644 test/cfg2cmd/q35-simple-6.1.conf > create mode 100644 test/cfg2cmd/q35-simple-6.1.conf.cmd > create mode 100644 test/cfg2cmd/q35-simple-pinned-6.1.conf > create mode 100644 test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd > create mode 100644 test/cfg2cmd/q35-simple.conf > create mode 100644 test/cfg2cmd/q35-simple.conf.cmd > > diff --git a/test/cfg2cmd/q35-simple-6.0.conf b/test/cfg2cmd/q35-simple-6.0.conf > new file mode 100644 > index 0000000..70426b3 > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-6.0.conf > @@ -0,0 +1,13 @@ > +# TEST: Config with q35, Linux & nothing much else but on 6.0 > +# QEMU_VERSION: 6.0.0 > +bios: ovmf > +bootdisk: scsi0 > +cores: 2 > +efidisk0: local:100/vm-100-disk-1.qcow2,size=128K > +machine: q35 > +memory: 512 > +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 > +ostype: l26 > +scsihw: virtio-scsi-pci > +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687 > +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d > diff --git a/test/cfg2cmd/q35-simple-6.0.conf.cmd b/test/cfg2cmd/q35-simple-6.0.conf.cmd > new file mode 100644 > index 0000000..5045caf > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-6.0.conf.cmd > @@ -0,0 +1,28 @@ > +/usr/bin/kvm \ > + -id 8006 \ > + -name vm8006 \ > + -no-shutdown \ > + -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ > + -mon 'chardev=qmp,mode=control' \ > + -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ > + -mon 'chardev=qmp-event,mode=control' \ > + -pidfile /var/run/qemu-server/8006.pid \ > + -daemonize \ > + -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ > + -drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \ > + -drive 'if=pflash,unit=1,format=qcow2,id=drive-efidisk0,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \ > + -smp '2,sockets=1,cores=2,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 \ > + -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ > + -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ > + -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' \ > + -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ > + -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/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,bootindex=300' \ > + -machine 'type=q35+pve0' > diff --git a/test/cfg2cmd/q35-simple-6.1.conf b/test/cfg2cmd/q35-simple-6.1.conf > new file mode 100644 > index 0000000..df5ee73 > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-6.1.conf > @@ -0,0 +1,14 @@ > +# TEST: Config with q35, Linux & nothing much else but on 6.1 > +# QEMU_VERSION: 7.0.0 6.1.0? I mean the test still makes sense, but then the name/comment are wrong ;) > +bios: ovmf > +bootdisk: scsi0 > +cores: 2 > +efidisk0: local:100/vm-100-disk-1.qcow2,size=128K > +machine: q35 > +meta: creation-qemu=6.1 > +memory: 512 > +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 > +ostype: l26 > +scsihw: virtio-scsi-pci > +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687 > +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d > diff --git a/test/cfg2cmd/q35-simple-6.1.conf.cmd b/test/cfg2cmd/q35-simple-6.1.conf.cmd > new file mode 100644 > index 0000000..5045caf > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-6.1.conf.cmd > @@ -0,0 +1,28 @@ > +/usr/bin/kvm \ > + -id 8006 \ > + -name vm8006 \ > + -no-shutdown \ > + -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ > + -mon 'chardev=qmp,mode=control' \ > + -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ > + -mon 'chardev=qmp-event,mode=control' \ > + -pidfile /var/run/qemu-server/8006.pid \ > + -daemonize \ > + -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ > + -drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \ > + -drive 'if=pflash,unit=1,format=qcow2,id=drive-efidisk0,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \ > + -smp '2,sockets=1,cores=2,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 \ > + -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ > + -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ > + -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' \ > + -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ > + -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/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,bootindex=300' \ > + -machine 'type=q35+pve0' > diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf b/test/cfg2cmd/q35-simple-pinned-6.1.conf > new file mode 100644 > index 0000000..9ecfe00 > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-pinned-6.1.conf > @@ -0,0 +1,13 @@ > +# TEST: Config with q35, Linux & nothing much else > +# > +bios: ovmf > +bootdisk: scsi0 > +cores: 2 > +efidisk0: local:100/vm-100-disk-1.qcow2,size=128K > +machine: pc-q35-6.1 > +memory: 512 > +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 > +ostype: l26 > +scsihw: virtio-scsi-pci > +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687 > +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d > diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd > new file mode 100644 > index 0000000..26dfaaa > --- /dev/null > +++ b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd > @@ -0,0 +1,28 @@ > +/usr/bin/kvm \ > + -id 8006 \ > + -name vm8006 \ > + -no-shutdown \ > + -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ > + -mon 'chardev=qmp,mode=control' \ > + -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ > + -mon 'chardev=qmp-event,mode=control' \ > + -pidfile /var/run/qemu-server/8006.pid \ > + -daemonize \ > + -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ > + -drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \ > + -drive 'if=pflash,unit=1,format=qcow2,id=drive-efidisk0,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \ > + -smp '2,sockets=1,cores=2,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 \ > + -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ > + -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ > + -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' \ > + -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ > + -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/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,bootindex=300' \ > + -machine 'type=pc-q35-6.1+pve0' > diff --git a/test/cfg2cmd/q35-simple.conf b/test/cfg2cmd/q35-simple.conf > new file mode 100644 > index 0000000..21f7812 > --- /dev/null > +++ b/test/cfg2cmd/q35-simple.conf > @@ -0,0 +1,13 @@ > +# TEST: Config with q35, Linux & nothing much else > +# Not that it matters much but I think this test is fairly useless, we already have very similar ones with the 'hostpci' q35 configs. May be good to have it explicit though... > +bios: ovmf > +bootdisk: scsi0 > +cores: 2 > +efidisk0: local:100/vm-100-disk-1.qcow2,size=128K > +machine: q35 > +memory: 512 > +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0 > +ostype: l26 > +scsihw: virtio-scsi-pci > +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687 > +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d > diff --git a/test/cfg2cmd/q35-simple.conf.cmd b/test/cfg2cmd/q35-simple.conf.cmd > new file mode 100644 > index 0000000..5045caf > --- /dev/null > +++ b/test/cfg2cmd/q35-simple.conf.cmd > @@ -0,0 +1,28 @@ > +/usr/bin/kvm \ > + -id 8006 \ > + -name vm8006 \ > + -no-shutdown \ > + -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \ > + -mon 'chardev=qmp,mode=control' \ > + -chardev 'socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5' \ > + -mon 'chardev=qmp-event,mode=control' \ > + -pidfile /var/run/qemu-server/8006.pid \ > + -daemonize \ > + -smbios 'type=1,uuid=3dd750ce-d910-44d0-9493-525c0be4e687' \ > + -drive 'if=pflash,unit=0,format=raw,readonly=on,file=/usr/share/pve-edk2-firmware//OVMF_CODE.fd' \ > + -drive 'if=pflash,unit=1,format=qcow2,id=drive-efidisk0,file=/var/lib/vz/images/100/vm-100-disk-1.qcow2' \ > + -smp '2,sockets=1,cores=2,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 \ > + -readconfig /usr/share/qemu-server/pve-q35-4.0.cfg \ > + -device 'vmgenid,guid=54d1c06c-8f5b-440f-b5b2-6eab1380e13d' \ > + -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' \ > + -iscsi 'initiator-name=iqn.1993-08.org.debian:01:aabbccddeeff' \ > + -netdev 'type=tap,id=net0,ifname=tap8006i0,script=/var/lib/qemu-server/pve-bridge,downscript=/var/lib/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,bootindex=300' \ > + -machine 'type=q35+pve0' >