From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH qemu-server 1/2] tests: cfg2cmd: add test for templates with more options
Date: Mon, 01 Jul 2024 10:52:05 +0200 [thread overview]
Message-ID: <1719823865.iwgv90h4qe.astroid@yuna.none> (raw)
In-Reply-To: <20240620100922.1637432-1-d.csapak@proxmox.com>
On June 20, 2024 12:09 pm, Dominik Csapak wrote:
> during pbs backups, we need to start templates, so add a test for that.
> We already have some tests for templates, but none with hostpci,tpm,
> etc.
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> test/cfg2cmd/q35-linux-hostpci-template.conf | 23 ++++++++++
> .../q35-linux-hostpci-template.conf.cmd | 45 +++++++++++++++++++
> 2 files changed, 68 insertions(+)
> create mode 100644 test/cfg2cmd/q35-linux-hostpci-template.conf
> create mode 100644 test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
>
> diff --git a/test/cfg2cmd/q35-linux-hostpci-template.conf b/test/cfg2cmd/q35-linux-hostpci-template.conf
> new file mode 100644
> index 00000000..dfbf1322
> --- /dev/null
> +++ b/test/cfg2cmd/q35-linux-hostpci-template.conf
> @@ -0,0 +1,23 @@
> +# TEST: Config with q35, NUMA, hostpci passthrough, EFI, TPM & Linux as a template
> +bios: ovmf
> +bootdisk: scsi0
> +cores: 1
> +efidisk0: local:100/base-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: q35
> +memory: 512
> +net0: virtio=2E:01:68:F9:9C:87,bridge=vmbr0
> +numa: 1
> +ostype: l26
> +scsihw: virtio-scsi-pci
> +scsi0: local:100/base-100-disk-2.raw,size=10G
> +smbios1: uuid=3dd750ce-d910-44d0-9493-525c0be4e687
> +sockets: 2
> +template: 1
> +tpmstate0: local:100/base-100-disk-1.raw,size=4M,version=v2.0
> +vmgenid: 54d1c06c-8f5b-440f-b5b2-6eab1380e13d
> diff --git a/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
> new file mode 100644
> index 00000000..f9b9bf69
> --- /dev/null
> +++ b/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd
> @@ -0,0 +1,45 @@
> +/usr/bin/kvm \
> + -id 8006 \
> + -name 'vm8006,debug-threads=on' \
> + -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,id=drive-efidisk0,format=qcow2,file=/var/lib/vz/images/100/base-100-disk-1.qcow2,readonly=on' \
> + -global 'ICH9-LPC.acpi-pci-hotplug-with-bridge-support=off' \
> + -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' \
> + -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 '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 '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 'vfio-pci,host=0000:d0:17.0,id=hostpci4,bus=ich9-pcie-port-5,addr=0x0,rombar=0' \
> + -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 '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' \
> + -device 'virtio-scsi-pci,id=scsihw0,bus=pci.0,addr=0x5' \
> + -drive 'file=/var/lib/vz/images/100/base-100-disk-2.raw,if=none,id=drive-scsi0,format=raw,cache=none,aio=io_uring,detect-zeroes=on,readonly=on' \
> + -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=/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,rx_queue_size=1024,tx_queue_size=256,bootindex=300' \
> + -machine 'type=q35+pve0' \
> + -snapshot
> --
> 2.39.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
prev parent reply other threads:[~2024-07-01 8:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-20 10:09 [pve-devel] " Dominik Csapak
2024-06-20 10:09 ` [pve-devel] [PATCH qemu-server 2/2] fix #3352: templates: minimize config when starting templates Dominik Csapak
2024-07-01 8:54 ` [pve-devel] applied: " Fabian Grünbichler
2024-07-01 8:52 ` Fabian Grünbichler [this message]
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=1719823865.iwgv90h4qe.astroid@yuna.none \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox