From: Stefan Reiter <s.reiter@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Thomas Lamprecht <t.lamprecht@proxmox.com>
Subject: Re: [pve-devel] [PATCH 3/4] tests: cfg2cmd: add a few q35 related tests
Date: Thu, 21 Oct 2021 11:34:53 +0200 [thread overview]
Message-ID: <6e264086-e994-0958-a06f-8c1c0a257093@proxmox.com> (raw)
In-Reply-To: <20211021083609.2057094-4-t.lamprecht@proxmox.com>
On 10/21/21 10:36 AM, Thomas Lamprecht wrote:
> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> ---
> 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'
>
next prev parent reply other threads:[~2021-10-21 9:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 8:36 [pve-devel] [PATCH 0/4] add meta info and bandaid for QEMU 6.1 and unpinned q35 machine backward compat Thomas Lamprecht
2021-10-21 8:36 ` [pve-devel] [PATCH 1/4] config: add new meta property withe creation time Thomas Lamprecht
2021-10-21 8:36 ` [pve-devel] [PATCH 2/4] config: meta: also save the QEMU version installed during creation Thomas Lamprecht
2021-10-21 8:36 ` [pve-devel] [PATCH 3/4] tests: cfg2cmd: add a few q35 related tests Thomas Lamprecht
2021-10-21 9:34 ` Stefan Reiter [this message]
2021-10-21 9:45 ` Thomas Lamprecht
2021-10-21 8:36 ` [pve-devel] [PATCH 4/4] cfg2cmd: switch off ACPI hotplug on bridges for q35 VMs Thomas Lamprecht
2021-10-21 9:34 ` Stefan Reiter
2021-10-21 9:47 ` Thomas Lamprecht
2021-10-21 9:34 ` [pve-devel] [PATCH 0/4] add meta info and bandaid for QEMU 6.1 and unpinned q35 machine backward compat Stefan Reiter
2021-10-21 9:47 ` Thomas Lamprecht
2021-10-21 9:56 ` Stefan Reiter
2021-10-21 10:01 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6e264086-e994-0958-a06f-8c1c0a257093@proxmox.com \
--to=s.reiter@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
--cc=t.lamprecht@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.