- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 27 Aug '18

27 Aug '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users wanner continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 6 ++++++ src/qemu/qemu_conf.c | 3 +++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 6 +++++- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..f7287ae 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -93,6 +93,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "state_lock_timeout" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..e88db3f 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -813,3 +813,9 @@ # #swtpm_user = "tss" #swtpm_group = "tss" + +# Override the timeout (in seconds) for acquiring state lock. +# +# Default is 0 +# +#state_lock_timeout = 60 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..f452714 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -863,6 +863,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..d375a73 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6714,7 +6714,11 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + if (cfg->stateLockTimeout > 0) + then = now + cfg->stateLockTimeout; + else + then = now + QEMU_JOB_WAIT_TIME; + retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..dc5de96 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -105,3 +105,4 @@ module Test_libvirtd_qemu = { "pr_helper" = "/usr/bin/qemu-pr-helper" } { "swtpm_user" = "tss" } { "swtpm_group" = "tss" } +{ "state_lock_timeout" = "60" } -- 1.8.3.1

3 2

[libvirt] [PATCH 0/2] conf: Cleanups for some device_conf predicates
by Andrea Bolognani 27 Aug '18

27 Aug '18

Andrea Bolognani (2): conf: Rename some device_conf predicates conf: Move some device_conf predicates src/bhyve/bhyve_device.c | 6 ++-- src/conf/device_conf.c | 22 ++++++++++++++ src/conf/device_conf.h | 23 ++------------- src/conf/domain_addr.c | 2 +- src/libvirt_private.syms | 3 ++ src/qemu/qemu_domain_address.c | 52 +++++++++++++++++----------------- 6 files changed, 58 insertions(+), 50 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCH 0/3] Fix default machine when converting argv to xml
by Daniel P. Berrangé 27 Aug '18

27 Aug '18

We must honour the QEMU built-in default machine when converting from argv Daniel P. Berrangé (3): qemu: record the QEMU default machine in capabilities qemu: rename method for getting preferred machine type qemu: fix default machine for argv -> xml convertor src/qemu/qemu_capabilities.c | 37 ++++++++++++++--- src/qemu/qemu_capabilities.h | 3 +- src/qemu/qemu_driver.c | 6 ++- src/qemu/qemu_parse_command.c | 34 ++++++++++------ src/qemu/qemu_parse_command.h | 8 +++- tests/domaincapstest.c | 2 +- tests/qemuargv2xmldata/nomachine-aarch64.args | 11 ----- tests/qemuargv2xmldata/nomachine-aarch64.xml | 40 ------------------- tests/qemuargv2xmldata/nomachine-ppc64.xml | 4 +- tests/qemuargv2xmldata/nomachine-x86_64.xml | 4 +- tests/qemuargv2xmldata/pseries-disk.xml | 4 +- tests/qemuargv2xmldata/pseries-nvram.xml | 4 +- tests/qemuargv2xmltest.c | 18 ++++++++- .../caps_1.5.3.x86_64.xml | 2 +- .../caps_1.6.0.x86_64.xml | 2 +- .../caps_1.7.0.x86_64.xml | 2 +- .../caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0.ppc64.xml | 2 +- .../caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.xml | 2 +- .../caps_2.11.0.s390x.xml | 2 +- .../caps_2.11.0.x86_64.xml | 2 +- .../caps_2.12.0.ppc64.xml | 2 +- .../caps_2.12.0.s390x.xml | 2 +- .../caps_2.12.0.x86_64.xml | 2 +- .../caps_2.4.0.x86_64.xml | 2 +- .../caps_2.5.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../caps_2.9.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 +- .../caps_3.0.0.x86_64.xml | 2 +- 38 files changed, 116 insertions(+), 109 deletions(-) delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.args delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.xml -- 2.17.1

2 6

[libvirt] [PATCH 0/4] Remove more deprecated options
by Thomas Huth 27 Aug '18

27 Aug '18

These options are deprecated since at least two releases, and nobody complained. Time to remove them now. (I'm sending these patches as a series since Paolo asked me to send a PULL request on my own for them ... but if one of the subsystems maintainers prefers to take the patches through their own tree instead, just let me know) Thomas Huth (4): Remove the deprecated -balloon option Remove the deprecated -nodefconfig option Remove the deprecated options -startdate, -localtime and -rtc-td-hack net: Remove the deprecated -tftp, -bootp, -redir and -smb options docs/interop/live-block-operations.rst | 4 +- docs/virtio-balloon-stats.txt | 6 +- include/net/net.h | 3 - include/net/slirp.h | 4 - net/slirp.c | 132 ++++++++------------------------- os-posix.c | 8 -- qemu-deprecated.texi | 56 -------------- qemu-options.hx | 36 +-------- vl.c | 132 ++++++--------------------------- 9 files changed, 58 insertions(+), 323 deletions(-) -- 1.8.3.1

5 9

[libvirt] [PATCH] tests: qemuxml2argv: Drop some unused args files
by Peter Krempa 27 Aug '18

27 Aug '18

aarch64-acpi-nouefi and hostdev-scsi-boot are unused. Noticed when checking whether '-nodefconfig' is still used by libvirt. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- tests/qemuxml2argvdata/aarch64-acpi-nouefi.args | 22 --------------------- tests/qemuxml2argvdata/hostdev-scsi-boot.args | 26 ------------------------- 2 files changed, 48 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-acpi-nouefi.args delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-boot.args diff --git a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args deleted file mode 100644 index 5d9e1fb7c8..0000000000 --- a/tests/qemuxml2argvdata/aarch64-acpi-nouefi.args +++ /dev/null @@ -1,22 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-aarch64 \ --name guest \ --S \ --M virt \ --cpu host \ --m 1024 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --nographic \ --nodefconfig \ --nodefaults \ --monitor unix:/tmp/lib/domain--1-guest/monitor.sock,server,nowait \ --boot c \ --kernel /var/lib/libvirt/images/guest.vmlinux \ --initrd /var/lib/libvirt/images/guest.initramfs \ --append 'console=ttyAMA0 rw root=/dev/vda rootwait' diff --git a/tests/qemuxml2argvdata/hostdev-scsi-boot.args b/tests/qemuxml2argvdata/hostdev-scsi-boot.args deleted file mode 100644 index efbdc81415..0000000000 --- a/tests/qemuxml2argvdata/hostdev-scsi-boot.args +++ /dev/null @@ -1,26 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --M pc \ --m 214 \ --smp 1 \ --uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \ --nographic \ --nodefconfig \ --nodefaults \ --monitor unix:/tmp/test-monitor,server,nowait \ --no-acpi \ --device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \ --usb \ --drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sg0,if=none,id=drive-hostdev0 \ --device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=8,\ -drive=drive-hostdev0,id=hostdev0,bootindex=1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 -- 2.16.2

2 1

[libvirt] [PATCH 0/7] cgroup cleanup
by Pavel Hrdina 27 Aug '18

27 Aug '18

Another small set of cgroup cleanup patches as preparation for cgroup v2. Pavel Hrdina (7): vircgroup: Duplicate string before modifying vircgroup: Extract controller detection into function vircgroup: Extract placement validation into function vircgroup: Split virCgroupPathOfController into two functions vircgroup: Call virCgroupRemove inside virCgroupMakeGroup vircgroup: Simplify if conditions in virCgroupMakeGroup vircgroup: Remove obsolete sa_assert src/util/vircgroup.c | 200 +++++++++++++++++++++++++------------------ src/util/vircgroup.h | 2 +- 2 files changed, 118 insertions(+), 84 deletions(-) -- 2.17.1

2 14

[libvirt] [PATCH v4] qemu: qemuDomainChangeNet: validity checks should be done before XML autocompletion
by Katerina Koukiou 27 Aug '18

27 Aug '18

This patch ensures that changes in attributes of interfaces will emit errors accept if they are missing from the XML. Previously we were falsely reporting successful updates, because some changed attributes got overwritten before the validity checks. https://bugzilla.redhat.com/show_bug.cgi?id=1599513 Signed-off-by: Katerina Koukiou <kkoukiou(a)redhat.com> --- Changes from v3: Adjusted to Jano's comments in v3; type and address are now checked together. src/qemu/qemu_hotplug.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0b84a503bb..4f290b5648 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3598,16 +3598,19 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, goto cleanup; } - /* info: if newdev->info is empty, fill it in from olddev, - * otherwise verify that it matches - nothing is allowed to - * change. (There is no helper function to do this, so - * individually check the few feidls of virDomainDeviceInfo that - * are relevant in this case). + /* info: Nothing is allowed to change. First fill the missing newdev->info + * from olddev and then check for changes. */ - if (!virDomainDeviceAddressIsValid(&newdev->info, - VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) && - virDomainDeviceInfoCopy(&newdev->info, &olddev->info) < 0) { - goto cleanup; + /* if pci addr is missing or is invalid we overwrite it from olddev */ + if (newdev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE || + !virDomainDeviceAddressIsValid(&newdev->info, + newdev->info.type)) { + newdev->info.type = olddev->info.type; + newdev->info.addr = olddev->info.addr; + } + if (olddev->info.type != newdev->info.type) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("cannot modify network device address type")); } if (!virPCIDeviceAddressEqual(&olddev->info.addr.pci, &newdev->info.addr.pci)) { @@ -3622,21 +3625,33 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* device alias is checked already in virDomainDefCompatibleDevice */ + if (newdev->info.rombar == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.rombar = olddev->info.rombar; if (olddev->info.rombar != newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom bar setting")); goto cleanup; } + + if (!newdev->info.romfile && + VIR_STRDUP(newdev->info.romfile, olddev->info.romfile) < 0) + goto cleanup; if (STRNEQ_NULLABLE(olddev->info.romfile, newdev->info.romfile)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network rom file")); goto cleanup; } + + if (newdev->info.bootIndex == 0) + newdev->info.bootIndex = olddev->info.bootIndex; if (olddev->info.bootIndex != newdev->info.bootIndex) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device boot index setting")); goto cleanup; } + + if (newdev->info.romenabled == VIR_TRISTATE_BOOL_ABSENT) + newdev->info.romenabled = olddev->info.romenabled; if (olddev->info.romenabled != newdev->info.romenabled) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify network device rom enabled setting")); -- 2.17.1

2 1

[libvirt] [jenkins-ci PATCH] guests: Fix mapping for perl-Digest on Debian Sid
by Andrea Bolognani 27 Aug '18

27 Aug '18

It's now part of perl instead of being its own package. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. guests/vars/mappings.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 59a4b01..5df918f 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -539,6 +539,7 @@ mappings: deb: libdigest-perl pkg: p5-Digest rpm: perl-Digest + DebianSid: perl perl-Digest-MD5: deb: libdigest-perl-md5-perl -- 2.17.1

1 0

[libvirt] [PULL 00/12] Ui 20180827 v4 patches
by Gerd Hoffmann 27 Aug '18

27 Aug '18

The following changes since commit 5ccac548faf041ff5229a8e8342e3be14a34c8af: Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2018-08-23 17:35:48 +0100) are available in the git repository at: git://git.kraxel.org/qemu tags/ui-20180827-v4-pull-request for you to fetch changes up to b1d380372f31672da9318431e84e79bccd8ef3bf: util: promote qemu_egl_rendernode_open() to libqemuutil (2018-08-27 10:51:44 +0200) ---------------------------------------------------------------- ui: misc fixes which piled up during 3.0 release freeze ---------------------------------------------------------------- Daniel P. Berrangé (2): doc: switch to modern syntax for VNC TLS setup vnc: remove support for deprecated tls, x509, x509verify options Marc-André Lureau (3): ui: use enum to string helpers dmabuf: add y0_top, pass it to spice util: promote qemu_egl_rendernode_open() to libqemuutil Paolo Bonzini (2): spice-display: access ptr_x/ptr_y under Mutex spice-display: fix qemu_spice_cursor_refresh_bh locking Peter Wu (1): vnc: fix memleak of the "vnc-worker-output" name Philippe Mathieu-Daudé (1): ui/vnc: Remove useless parenthesis around DIV_ROUND_UP macro Tao Wu (1): sdl2: redraw correctly when scanout_mode enabled. Thomas Huth (2): ui/sdl2: Remove the obsolete SDL_INIT_NOPARACHUTE flag ui/sdl2: Fix broken -full-screen CLI option include/qemu/drm.h | 6 ++++ include/ui/console.h | 1 + qemu-keymap.c | 2 +- ui/console.c | 6 ++-- ui/egl-helpers.c | 51 ++-------------------------- ui/sdl2-gl.c | 5 +++ ui/sdl2.c | 13 +++----- ui/spice-display.c | 42 +++++++++++++++-------- ui/vnc-enc-tight.c | 2 +- ui/vnc-jobs.c | 3 +- ui/vnc.c | 94 ++-------------------------------------------------- util/drm.c | 66 ++++++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + qemu-deprecated.texi | 20 ----------- qemu-doc.texi | 20 ++++++++--- qemu-options.hx | 43 ------------------------ util/Makefile.objs | 1 + 17 files changed, 139 insertions(+), 237 deletions(-) create mode 100644 include/qemu/drm.h create mode 100644 util/drm.c -- 2.9.3

2 13

[libvirt] [PATCH] vl.c deprecate incorrect CPUs topology
by Igor Mammedov 27 Aug '18

27 Aug '18

-smp [cpus],sockets/cores/threads[,maxcpus] should describe topology so that total number of logical CPUs [sockets * cores * threads] would be equal to [maxcpus], however historically we didn't have such check in QEMU and it is possible to start VM with an invalid topology. Deprecate invalid options combination so we can make sure that the topology VM started with is always correct in the future. Users with an invalid sockets/cores/threads/maxcpus values should fix their CLI to make sure that [sockets * cores * threads] == [maxcpus] Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> --- qemu-deprecated.texi | 11 +++++++++++ vl.c | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 87212b6..d5d9ce6 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -159,6 +159,17 @@ The 'file' driver for drives is no longer appropriate for character or host devices and will only accept regular files (S_IFREG). The correct driver for these file types is 'host_cdrom' or 'host_device' as appropriate. +@subsection -smp X,[socket=a,core=b,thread=c],maxcpus=Y (since 3.1) + +CPU topology properties should describe whole machine topology including +possible CPUs. but historically it was possible to start QEMU with +an incorrect topology where + socket * core * thread >= X && < maxcpus +which could lead to incorrect topology enumeration by the guest. +Support for invalid topology will be removed, end user must ensure +that topology described with -smp includes all possible cpus, i.e.: + socket * core * thread == maxcpus + @section QEMU Machine Protocol (QMP) commands @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/vl.c b/vl.c index 5ba06ad..bc53828 100644 --- a/vl.c +++ b/vl.c @@ -1238,6 +1238,12 @@ static void smp_parse(QemuOpts *opts) exit(1); } + if (sockets * cores * threads != max_cpus) { + warn_report("Invalid CPUs topology deprecated. " + "sockets (%u) * cores (%u) * threads (%u) " + "!= maxcpus (%u)", + sockets, cores, threads, max_cpus); + } if (sockets * cores * threads > max_cpus) { error_report("cpu topology: " "sockets (%u) * cores (%u) * threads (%u) > " -- 2.7.4

2 2