External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 21:01:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
813ccd553b
libvirt/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args

42 lines
2.3 KiB
Plaintext
Raw Normal View History

qemu: Add 'iothread' to command line for supported controller https://bugzilla.redhat.com/show_bug.cgi?id=1286709 Now that we have all the pieces in place, we can add the 'iothread=#' to the command line for the (two) controllers that support it (virtio-scsi-pci and virtio-scsi-ccw). Add the tests as well...
2016-04-21 16:07:00 +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-QEMUGuest1 \
qemu: Add 'iothread' to command line for supported controller https://bugzilla.redhat.com/show_bug.cgi?id=1286709 Now that we have all the pieces in place, we can add the 'iothread=#' to the command line for the (two) controllers that support it (virtio-scsi-pci and virtio-scsi-ccw). Add the tests as well...
2016-04-21 16:07:00 +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-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
qemuxml2argvdata: Use proper arch and emulator for x86 real capability tests Upcoming patches will modify how we populate the capability cache in tests to be more saner. This also means that the emulator binary and architecture used in the test files using real capabilities must match what the real capabilities have. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2022-01-04 15:36:46 +00:00
/usr/bin/qemu-system-x86_64 \
tests: qemuxml2argv: Modernize virtio-scsi iothread tests Use DO_TEST_CAPS_LATEST to obtain modern results. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2019-01-28 13:17:15 +00:00
-name guest=QEMUGuest1,debug-threads=on \
qemu: Add 'iothread' to command line for supported controller https://bugzilla.redhat.com/show_bug.cgi?id=1286709 Now that we have all the pieces in place, we can add the 'iothread=#' to the command line for the (two) controllers that support it (virtio-scsi-pci and virtio-scsi-ccw). Add the tests as well...
2016-04-21 16:07:00 +00:00
-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-QEMUGuest1/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 \
qemu: capabilities: Replace aliased machine type by copy of the canonical machine The previous approac of just purging the alias combined with the fact that we filled in fake machine types in the test data meant that if a test case used an alias machine type such as 'pc' or 'q35' it would not properly resolve to the actual data returned by qemu. This started to be a problem since the CPU driver now looks at the default CPU reported with the machine type. This patch replaces the original approach of just removing the alias by replacing it with a copy of the machine type data which the type would alias to. This means that we are using the real data while we don't modify the test output after every qemu upgrade. Additionally this change will allow us to drop adding the fake machine types later. The test fallout is from actually excercising the CPU driver with actual data. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2020-01-23 12:20:25 +00:00
-cpu qemu64 \
qemu_command: Always use modern syntax of '-m' Specify the memory size by using '-m size=2048k' instead of just '-m 2'. The new syntax is used when memory hotplug is enabled. To preserve memory sizing, if memory hotplug is disabled the size is rounded down to the nearest mebibyte. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2023-06-21 14:31:46 +00:00
-m size=219136k \
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":224395264}' \
qemu_command: Prefer '-overcommit mem-lock' over -realtime mlock' The latter is deprecated and will be removed soon. The advised replacement is '-overcommit mem-lock=on|off'. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-04-12 08:25:40 +00:00
-overcommit mem-lock=off \
qemu: caps: Always assume QEMU_CAPS_SMP_TOPOLOGY Support for SMP topology was added by qemu commit dc6b1c09849484fbbc50 prior to 0.12.0, our minimum supported qemu version. $ git describe --tags dc6b1c09849484fbbc50803307e4c7a3d81eab62 v0.11.0-rc0-449-gdc6b1c0 $ git describe --tags --contains dc6b1c09849484fbbc50803307e4c7a3d81eab v0.12.0-rc0~1477
2016-06-23 11:29:16 +00:00
-smp 2,sockets=2,cores=1,threads=1 \
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":"iothread","id":"iothread1"}' \
-object '{"qom-type":"iothread","id":"iothread2"}' \
qemu: Add 'iothread' to command line for supported controller https://bugzilla.redhat.com/show_bug.cgi?id=1286709 Now that we have all the pieces in place, we can add the 'iothread=#' to the command line for the (two) controllers that support it (virtio-scsi-pci and virtio-scsi-ccw). Add the tests as well...
2016-04-21 16:07:00 +00:00
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
qemu: deprecate QEMU_CAPS_DISPLAY Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-29 10:51:55 +00:00
-display none \
qemu: deprecate QEMU_CAPS_NO_USER_CONFIG Implied by QEMU >= 1.2.0. Delete this one first, because QEMU_CAPS_NODEFCONFIG is only used when QEMU_CAPS_NO_USER_CONFIG is unsupported. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-29 10:51:55 +00:00
-no-user-config \
qemu: Add 'iothread' to command line for supported controller https://bugzilla.redhat.com/show_bug.cgi?id=1286709 Now that we have all the pieces in place, we can add the 'iothread=#' to the command line for the (two) controllers that support it (virtio-scsi-pci and virtio-scsi-ccw). Add the tests as well...
2016-04-21 16:07:00 +00:00
-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 \
qemu: deprecate QEMU_CAPS_MONITOR_JSON We require QEMU >= 1.5.0, assume every QEMU supports it. Sadly that does not let us trivially drop qemuMonitor's priv->monJSON bool, because of qemuDomainQemuAttach. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-28 22:04:58 +00:00
-mon chardev=charmonitor,id=monitor,mode=control \
qemu: deprecate QEMU_CAPS_RTC Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-29 10:51:55 +00:00
-rtc base=utc \
qemu: deprecate QEMU_CAPS_NO_SHUTDOWN Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2018-03-29 10:51:55 +00:00
-no-shutdown \
tests: qemuxml2argv: Modernize virtio-scsi iothread tests Use DO_TEST_CAPS_LATEST to obtain modern results. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2019-01-28 13:17:15 +00:00
-boot 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"}' \
-device '{"driver":"virtio-scsi-pci","iothread":"iothread2","id":"scsi0","bus":"pci.0","addr":"0xb"}' \
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/iothrtest1.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \
tests: qemuxml2argvdata: Remove irrelevant <disk> from 'iothread-*' cases Remove disks which are not necessary to demonstrate iothread config. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2023-02-28 14:35:12 +00:00
-device '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1","bootindex":1}' \
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/iothrtest2.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
-blockdev '{"node-name":"libvirt-1-format","read-only":false,"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":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-format","id":"scsi0-0-0-3"}' \
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"}' \
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 \
tests: qemuxml2argv: Modernize virtio-scsi iothread tests Use DO_TEST_CAPS_LATEST to obtain modern results. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2019-01-28 13:17:15 +00:00
-msg timestamp=on
Reference in New Issue Copy Permalink