External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-29 00:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
2642cc0f66
libvirt/tests/qemuxml2argvdata/hugepages-memaccess.args

51 lines
2.0 KiB
Plaintext
Raw Normal View History

qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
LC_ALL=C \
PATH=/bin \
qemu: command: Override HOME variable for system QEMU By default, qemu user's home dir points to '/' which shouldn't be used at all. We therefore pass the HOME variable from the current variable iff not running as SUID, which means that for systemd we never set it. This patch makes sure, that for system QEMU this is always set to libDir/<driver>, session mode is left untouched. Signed-off-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-03-06 12:29:01 +00:00
HOME=/tmp/lib/domain--1-QEMUGuest1 \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
USER=test \
LOGNAME=test \
qemu: command: Enforce setting XDG variables for system QEMU For session mode, only XDG_CACHE_HOME is set, because we want to remain integrating with services in user session, but for system mode, this would have become reading/writing to '/' which carries the obvious issue with permissions (also, '/' is the wrong location in 99.9% cases anyway). Signed-off-by: Erik Skultety <eskultet@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2019-03-08 11:15:07 +00:00
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
QEMU_AUDIO_DRV=none \
tests: fix name of 32-bit x86 QEMU binary The 32-bit x86 binary is called qemu-system-i386, not qemu-system-i686. This mistake across many test XML files was not noticed because the mistake was also made in testutilsqemu.c when mocking the capabilities. Reviewed-by: Erik Skultety <eskultet@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
2019-11-29 16:33:37 +00:00
/usr/bin/qemu-system-i386 \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-name QEMUGuest1 \
-S \
qemu: deprecate QEMU_CAPS_MACHINE_USB_OPT Implied by QEMU >= 1.3.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
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-m size=4194304k,slots=16,maxmem=8388608k \
qemu: Always assume QEMU_CAPS_REALTIME_MLOCK The '-realtime mlock' cmd line argument was introduced in QEMU commit v1.5.0-rc0~190 which matches minimal QEMU version we require. Therefore, the capability will always be present. Apparently, nearly none of our xml2argv test cases had the capability hence slightly bigger change under qemuxml2argvdata/. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2019-04-12 08:03:36 +00:00
-realtime mlock=off \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-smp 4,sockets=4,cores=1,threads=1 \
qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part All three memory backends (-file, -ram and -memfd) have .prealloc attribute. Since we are setting it only for -file, the corresponding code lives only under if() that handles that specific backend. But in near future we will want to set the attribute for other backends too. Therefore, move the corresponding code outside of the if(). This causes some .argv files to be changed, but the only change happening there is move of the attribute (best viewed with: 'git show --color-words=.'). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-05-25 12:35:25 +00:00
-object memory-backend-file,id=ram-node0,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
size=1073741824,host-nodes=0-3,policy=bind \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part All three memory backends (-file, -ram and -memfd) have .prealloc attribute. Since we are setting it only for -file, the corresponding code lives only under if() that handles that specific backend. But in near future we will want to set the attribute for other backends too. Therefore, move the corresponding code outside of the if(). This causes some .argv files to be changed, but the only change happening there is move of the attribute (best viewed with: 'git show --color-words=.'). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-05-25 12:35:25 +00:00
-object memory-backend-file,id=ram-node1,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
size=1073741824,host-nodes=0-3,policy=bind \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part All three memory backends (-file, -ram and -memfd) have .prealloc attribute. Since we are setting it only for -file, the corresponding code lives only under if() that handles that specific backend. But in near future we will want to set the attribute for other backends too. Therefore, move the corresponding code outside of the if(). This causes some .argv files to be changed, but the only change happening there is move of the attribute (best viewed with: 'git show --color-words=.'). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-05-25 12:35:25 +00:00
-object memory-backend-file,id=ram-node2,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
size=1073741824,host-nodes=0-3,policy=bind \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part All three memory backends (-file, -ram and -memfd) have .prealloc attribute. Since we are setting it only for -file, the corresponding code lives only under if() that handles that specific backend. But in near future we will want to set the attribute for other backends too. Therefore, move the corresponding code outside of the if(). This causes some .argv files to be changed, but the only change happening there is move of the attribute (best viewed with: 'git show --color-words=.'). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-05-25 12:35:25 +00:00
-object memory-backend-file,id=ram-node3,\
mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=no,prealloc=yes,\
size=1073741824,host-nodes=3,policy=bind \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
qemuBuildMemoryBackendProps: Move @prealloc setting to backend agnostic part All three memory backends (-file, -ram and -memfd) have .prealloc attribute. Since we are setting it only for -file, the corresponding code lives only under if() that handles that specific backend. But in near future we will want to set the attribute for other backends too. Therefore, move the corresponding code outside of the if(). This causes some .argv files to be changed, but the only change happening there is move of the attribute (best viewed with: 'git show --color-words=.'). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
2020-05-25 12:35:25 +00:00
-object memory-backend-file,id=memdimm0,\
mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,prealloc=yes,\
size=536870912,host-nodes=0-3,policy=bind \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-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: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-nodefaults \
qemu: command: always use -chardev for monitor config AFAIK there aren't any cases where we will/should hit the old code path for our supported qemu versions, so drop the old code. Massive test suite churn follows Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Cole Robinson <crobinso@redhat.com>
2017-06-26 14:40:39 +00:00
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
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
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 \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-no-acpi \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
qemu: caps: Always assume presence of 'ide-hd' and 'ide-cd' devices The split of ide-disk into the two separate devices was introduced by qemu commit 1f56e32a7f4b3 released in qemu v0.15. Note that when compared to the previous commit which made sure that no disk related tests were touched, in this case it's not as careful. Signed-off-by: Peter Krempa <pkrempa@redhat.com>
2019-01-28 13:44:57 +00:00
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
qemu: Allow memAccess for hugepages again https://bugzilla.redhat.com/show_bug.cgi?id=1214369 https://bugzilla.redhat.com/show_bug.cgi?id=1458638 Historically, we've always supported memAccess for domains backed by hugepages. However, somewhere along the way we've regressed and stopped allowing such configuration. Fix it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
2017-06-06 08:58:37 +00:00
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3
Reference in New Issue Copy Permalink