From 29348ffca334863dccc462d8337d9bedea3d511f Mon Sep 17 00:00:00 2001 From: liumengqiu Date: Wed, 24 Aug 2022 16:33:34 +0800 Subject: [PATCH] tests: add test case for NVRAM with template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This demonstrates that /usr/share/OVMF/OVMF_CODE.fd gets expanded to give a per-VM NVRAM path. Reviewed-by: Michal Privoznik Signed-off-by: Daniel P. Berrangé Signed-off-by: liumengqiu --- .../bios-nvram-template.x86_64-latest.args | 36 +++++++++++++++++++ .../qemuxml2argvdata/bios-nvram-template.xml | 21 +++++++++++ tests/qemuxml2argvtest.c | 3 +- 3 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/bios-nvram-template.xml diff --git a/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args b/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args new file mode 100644 index 0000000000..bd612d1001 --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test-bios \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=test-bios,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ +-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \ +-accel tcg \ +-cpu qemu64 \ +-m 1024 \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot menu=on,strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/bios-nvram-template.xml b/tests/qemuxml2argvdata/bios-nvram-template.xml new file mode 100644 index 0000000000..1bbe4314b5 --- /dev/null +++ b/tests/qemuxml2argvdata/bios-nvram-template.xml @@ -0,0 +1,21 @@ + + test-bios + 362d1fc1-df7d-193e-5c18-49a71bd1da66 + 1048576 + 1048576 + 1 + + hvm + /usr/share/OVMF/OVMF_CODE.fd + + + + + + + + + + /usr/bin/qemu-system-x86_64 + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d37969d065..dacaf0bca3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -997,7 +997,8 @@ mymain(void) QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_MACHINE_SMM_OPT, QEMU_CAPS_VIRTIO_SCSI); - + DO_TEST_CAPS_LATEST("bios-nvram-template"); + /* Make sure all combinations of ACPI and UEFI behave as expected */ DO_TEST("q35-acpi-uefi", NONE); DO_TEST_PARSE_ERROR("q35-noacpi-uefi", NONE); -- 2.33.0