External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-31 02:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
21b9f65ec0
libvirt/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args

40 lines
2.1 KiB
Plaintext
Raw Normal View History

qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
LC_ALL=C \
PATH=/bin \
tests: Drop more QEMU driver config overrides These are allegedly necessary to keep the output consistent, but now that we're using a privileged config for the driver we get the desired behavior out of the box, and as a bonus the paths match what you would actually see on a regular host. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
2023-03-02 18:05:53 +00:00
HOME=/var/lib/libvirt/qemu/domain--1-test \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
USER=test \
LOGNAME=test \
tests: Drop more QEMU driver config overrides These are allegedly necessary to keep the output consistent, but now that we're using a privileged config for the driver we get the desired behavior out of the box, and as a bonus the paths match what you would actually see on a regular host. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
2023-03-02 18:05:53 +00:00
XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-test/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-test/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-test/.config \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
tests: Drop more QEMU driver config overrides These are allegedly necessary to keep the output consistent, but now that we're using a privileged config for the driver we get the desired behavior out of the box, and as a bonus the paths match what you would actually see on a regular host. Signed-off-by: Andrea Bolognani <abologna@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
2023-03-02 18:05:53 +00:00
-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
qemu: Use '-machine acpi=on/off' instead of deprecated '-no-acpi' QEMU deprecated the '-no-acpi' option, thus we should switch to the modern way to use '-machine'. Certain ARM machine types don't support ACPI. Given our historically broken design of using '<acpi/>' without attribute to enable ACPI and qemu's default of enabling it without '-no-acpi' such configurations would not work. Now when qemu reports whether given machine type supports ACPI we can do a better decision and un-break those configs. Unfortunately not retroactively. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/297 Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2023-02-27 11:46:13 +00:00
-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
qemu: Switch to -accel We currently use -machine accel=XXX which is just a syntax sugar for -accel XXX. The former doesn't allow specifying arguments for accelerator, because all arguments passed to -machine are treated as arguments of machine itself. The -accel argument was introduced in QEMU commit v2.9.0-rc0~70^2~19 and since our minimum required version is newer (2.11.0) we can safely assume its existence and use it without any capability. Resolves: https://gitlab.com/libvirt/libvirt/-/issues/233 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Tested-by: Kashyap Chamarthy <kchamart@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com>
2021-11-05 08:38:10 +00:00
-accel tcg \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
-cpu qemu64 \
-m 1024 \
qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED Base the detection on the presence of the 'secret' qom-type entry, which isn't conditionally compiled in qemu. All caps-based test now switch to using JSON for -object. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2021-03-12 15:28:11 +00:00
-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \
-display none \
-no-user-config \
-nodefaults \
qemu: use long on|off syntax for -chardev boolean option values The preferred syntax for boolean options is to set the value "on" or "off". QEMU 7.1.0 will deprecate the short format we currently use. The long format has been supported with -chardev since at least 1.5.3, so we don't need to check for it. Reviewed-by: Ján Tomko <jtomko@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2021-02-16 11:29:24 +00:00
-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-boot menu=on,strict=on \
qemu: capabilities: Re-enable JSON syntax for -device Now that qemu fixed device unplug when JSON syntax is used with -device we can re-enable the feature. Since the old capability string representation is condemned by suggesting filtering it as a workaround we must introduce a new string. To achieve this the original capability position is renamed to X_QEMU_CAPS_DEVICE_JSON_BROKEN_HOTPLUG and a new position with the original name QEMU_CAPS_DEVICE_JSON is introduced to prevent us having to change the rest of the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-13 15:59:56 +00:00
-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
qemuxml2argvtest: Use internal wrapping of command line arguments virCommandToString has the possibility to return an already wrapped string with better format than what we get from the test wrapper script. The main advantage is that arguments for an option are always on the same line which makes it more easy to see what changed in a diff and prevents re-wrapping of the line if a wrapping point moves over the threshold. Additionally the used output is the same we have in the VM log file when a VM is starting. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-03-31 08:46:36 +00:00
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \
qemu: capabilities: Re-enable JSON syntax for -device Now that qemu fixed device unplug when JSON syntax is used with -device we can re-enable the feature. Since the old capability string representation is condemned by suggesting filtering it as a workaround we must introduce a new string. To achieve this the original capability position is renamed to X_QEMU_CAPS_DEVICE_JSON_BROKEN_HOTPLUG and a new position with the original name QEMU_CAPS_DEVICE_JSON is introduced to prevent us having to change the rest of the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-13 15:59:56 +00:00
-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \
qemuxml2argvtest: Use internal wrapping of command line arguments virCommandToString has the possibility to return an already wrapped string with better format than what we get from the test wrapper script. The main advantage is that arguments for an option are always on the same line which makes it more easy to see what changed in a diff and prevents re-wrapping of the line if a wrapping point moves over the threshold. Additionally the used output is the same we have in the VM log file when a VM is starting. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-03-31 08:46:36 +00:00
-blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ignore","driver":"raw","file":"libvirt-1-storage"}' \
qemu: capabilities: Re-enable JSON syntax for -device Now that qemu fixed device unplug when JSON syntax is used with -device we can re-enable the feature. Since the old capability string representation is condemned by suggesting filtering it as a workaround we must introduce a new string. To achieve this the original capability position is renamed to X_QEMU_CAPS_DEVICE_JSON_BROKEN_HOTPLUG and a new position with the original name QEMU_CAPS_DEVICE_JSON is introduced to prevent us having to change the rest of the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-13 15:59:56 +00:00
-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-format","id":"ide0-1-0","bootindex":1}' \
qemu: command: Use JSON for parameters of -audiodev '-audiodev' as a modern implementation based on QAPI already takes JSON as the argument. Convert our code to use it directly. The declaration of the QAPI types can be found in 'qemu.git/qapi/audio.json'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2021-11-09 15:58:22 +00:00
-audiodev '{"id":"audio1","driver":"none"}' \
qemu: capabilities: Re-enable JSON syntax for -device Now that qemu fixed device unplug when JSON syntax is used with -device we can re-enable the feature. Since the old capability string representation is condemned by suggesting filtering it as a workaround we must introduce a new string. To achieve this the original capability position is renamed to X_QEMU_CAPS_DEVICE_JSON_BROKEN_HOTPLUG and a new position with the original name QEMU_CAPS_DEVICE_JSON is introduced to prevent us having to change the rest of the code. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-13 15:59:56 +00:00
-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
qemuxml2argvtest: Use internal wrapping of command line arguments virCommandToString has the possibility to return an already wrapped string with better format than what we get from the test wrapper script. The main advantage is that arguments for an option are always on the same line which makes it more easy to see what changed in a diff and prevents re-wrapping of the line if a wrapping point moves over the threshold. Additionally the used output is the same we have in the VM log file when a VM is starting. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2021-03-31 08:46:36 +00:00
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
qemuxml2(argv|xml): Modernize 'discard'/'detect-zero' tests Switch to DO_TEST_CAPS_LATEST for all of them and also add pre-blockdev case for 'disk-discard' as we had it before. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-05-04 16:53:31 +00:00
-msg timestamp=on
Reference in New Issue Copy Permalink