mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-31 02:13:27 +00:00
4ee4809907
Commit24cc9cda82switched over to use -machine hpet, but one of the steps it did was to clear the QEMU_CAPS_NO_HPET capability. The validation check still uses the old capability though which means that for configs which would explicitly enable HPET we'd report an error. Since HPET is an x86(_64) platform specific device, convert the validation check to an architecture check as all supported qemu versions actually support it. Modify a test case to request HPET to catch posible future problems. Fixes:24cc9cda82Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
64 lines
3.3 KiB
Plaintext
64 lines
3.3 KiB
Plaintext
LC_ALL=C \
|
|
PATH=/bin \
|
|
HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic \
|
|
USER=test \
|
|
LOGNAME=test \
|
|
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.local/share \
|
|
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.cache \
|
|
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/.config \
|
|
/usr/bin/qemu-system-x86_64 \
|
|
-name guest=virt-manager-basic,debug-threads=on \
|
|
-S \
|
|
-object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-virt-manager-basic/master-key.aes \
|
|
-machine pc-q35-4.2,usb=off,vmport=off,dump-guest-core=off \
|
|
-accel kvm \
|
|
-cpu qemu64 \
|
|
-m 4096 \
|
|
-overcommit mem-lock=off \
|
|
-smp 2,sockets=2,cores=1,threads=1 \
|
|
-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
|
|
-no-user-config \
|
|
-nodefaults \
|
|
-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
|
|
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
-rtc base=utc,driftfix=slew \
|
|
-global kvm-pit.lost_tick_policy=delay \
|
|
-no-shutdown \
|
|
-global ICH9-LPC.disable_s3=1 \
|
|
-global ICH9-LPC.disable_s4=1 \
|
|
-boot strict=on \
|
|
-device pcie-root-port,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
|
|
-device pcie-root-port,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
|
|
-device pcie-root-port,port=18,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
|
|
-device pcie-root-port,port=19,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x3 \
|
|
-device pcie-root-port,port=20,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x4 \
|
|
-device pcie-root-port,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
|
|
-device nec-usb-xhci,id=usb,bus=pci.2,addr=0x0 \
|
|
-device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
|
|
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
|
|
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \
|
|
-device virtio-blk-pci,scsi=off,bus=pci.4,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
|
|
-netdev user,id=hostnet0 \
|
|
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,addr=0x0 \
|
|
-chardev pty,id=charserial0 \
|
|
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
|
|
-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
|
|
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
|
|
-chardev spicevmc,id=charchannel1,name=vdagent \
|
|
-device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \
|
|
-device usb-tablet,id=input0,bus=usb.0,port=1 \
|
|
-audiodev '{"id":"audio1","driver":"spice"}' \
|
|
-spice port=5901,addr=127.0.0.1,image-compression=off,seamless-migration=on \
|
|
-device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vram64_size_mb=0,vgamem_mb=16,bus=pcie.0,addr=0x1 \
|
|
-device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \
|
|
-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
|
|
-global ICH9-LPC.noreboot=off \
|
|
-watchdog-action reset \
|
|
-chardev spicevmc,id=charredir0,name=usbredir \
|
|
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
|
|
-chardev spicevmc,id=charredir1,name=usbredir \
|
|
-device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=3 \
|
|
-device virtio-balloon-pci,id=balloon0,bus=pci.5,addr=0x0 \
|
|
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
|
|
-msg timestamp=on
|