External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
785dfe58fa
libvirt/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args

51 lines
3.0 KiB
Plaintext
Raw Normal View History

conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +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 \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +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 \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +00:00
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,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-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 q35,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 \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +00:00
-m 214 \
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 \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +00:00
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-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 \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +00:00
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
-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":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
-device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x0"}' \
-device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x1"}' \
-device '{"driver":"virtio-scsi-pci-transitional","id":"scsi0","bus":"pci.2","addr":"0x4"}' \
-device '{"driver":"virtio-serial-pci-transitional","id":"virtio-serial0","bus":"pci.2","addr":"0x3"}' \
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":"host_device","filename":"/dev/HostVG/QEMUGuest1","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":"virtio-blk-pci-transitional","bus":"pci.2","addr":"0x5","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \
conf: Add <filesystem model='virtio-{non-}transitional'/> <filesystem> devices lack the model= attribute which is used by most other device types. To eventually support virtio-9p-pci-{non-}traditional in qemu, let's add a standard model= attribute. The accepted values are: - virtio - virtio-transitional - virtio-non-transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-17 17:52:36 +00:00
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
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-9p-pci-transitional","id":"fs0","fsdev":"fsdev-fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \
qemu: capabilities: Detect support for JSON args for -netdev JSON args for -netdev were added as precursor for adding the 'dgram' network backend type. Enable the detection and update test cases using DO_TEST_CAPS_LATEST. Enabling the capability also ensures that the -netdev argument is validated against the QAPI schema of 'netdev_add' which was already implemented but not enabled. The parser supporting JSON was added by qemu commit f3eedcddba3 and enabled when adding stream/dgram netdevs in commit 5166fe0ae46. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2022-11-09 17:12:12 +00:00
-netdev '{"type":"user","id":"hostnet0"}' \
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-net-pci-transitional","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \
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: Add implicit watchdog for q35 machine types The iTCO watchdog is part of the q35 machine type since its inception, we just did not add it implicitly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2137346 Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
2023-01-20 10:22:22 +00:00
-global ICH9-LPC.noreboot=off \
-watchdog-action reset \
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":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \
-device '{"driver":"virtio-balloon-pci-transitional","id":"balloon0","bus":"pci.2","addr":"0x7"}' \
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":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \
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-rng-pci-transitional","rng":"objrng0","id":"rng0","bus":"pci.2","addr":"0x8"}' \
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 \
qemu: remove support for transitional virtio-input-host This device was virtio 1.0-only so adding the (non-)transitional model did not make sense and it was only present in QEMU 4.0. Report a validation error for both of the users that will ever hit this code path. Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Andrea Bolognani <abologna@redhat.com>
2022-01-18 17:03:55 +00:00
-device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid":4,"vhostfd":"6789","bus":"pci.2","addr":"0x9"}' \
conf: Add <disk model='virtio-{non-}transitional'/> <disk> devices lack the model= attribute which is used by most other device types. bus= mostly acts as one, but it serves other purposes too like determing what target= prefix to use, and for matching against controller type= values. Extending bus= to handle additional virtio transitional devices will complicate apps lives, and it isn't a clean mapping anyways. So let's bite the bullet and add a new <disk model=X/> attribute, and wire up common handling for virtio and virtio-{non-}transitional Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2019-01-11 20:06:05 +00:00
-msg timestamp=on
Reference in New Issue Copy Permalink