- Devel - libvirt List Archives

[libvirt] [PATCH 0/2] Update docs for GIT repo access
by Daniel P. Berrangé 20 Mar '18

20 Mar '18

Daniel P. Berrangé (2): docs: remove obsolete docs about gitorious and cvs access docs: update all GIT repo examples to use https:// protocol README-hacking | 2 +- docs/csharp.html.in | 2 +- docs/devguide.html.in | 6 +++--- docs/downloads.html.in | 9 +++++++++ docs/hacking.html.in | 2 +- docs/java.html.in | 45 +-------------------------------------------- docs/php.html.in | 2 +- docs/virshcmdref.html.in | 2 +- 8 files changed, 18 insertions(+), 52 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH 0/4] python3: Finishing touches
by Andrea Bolognani 20 Mar '18

20 Mar '18

>>> import blurb Traceback (most recent call last): File "<stdin>", line 1, in <module> ModuleNotFoundError: No module named 'blurb' >>> Andrea Bolognani (4): configure: Allow (and prefer) Python 3 spec: Use Python 3 for building on Fedora mingw: Use Python 3 for building news: Update for Python 3 compatibility configure.ac | 4 ++-- docs/news.xml | 11 +++++++++++ libvirt.spec.in | 9 ++++++++- mingw-libvirt.spec.in | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) -- 2.14.3

2 12

[libvirt] [PATCH 0/3] Drop old Policy-Kit support
by Ján Tomko 20 Mar '18

20 Mar '18

The build WITH_POLKIT0 and -Wunused-label was broken for almost two years. Ján Tomko (3): Remove Policy-Kit support Merge WITH_POLKIT1 and WITH_POLKIT Do not check for pkcheck .gitignore | 1 - m4/virt-polkit.m4 | 80 +++------------ src/access/Makefile.inc.am | 6 +- src/access/viraccessmanager.c | 4 +- src/libvirt.c | 27 ----- src/remote/Makefile.inc.am | 24 +---- src/remote/{libvirtd.policy.in => libvirtd.policy} | 6 +- src/remote/remote_driver.c | 63 ------------ src/util/Makefile.inc.am | 2 - src/util/virpolkit.c | 113 +-------------------- tests/Makefile.am | 4 +- 11 files changed, 28 insertions(+), 302 deletions(-) rename src/remote/{libvirtd.policy.in => libvirtd.policy} (92%) -- 2.16.1

6 13

[libvirt] [PATCH] mingw: Require Fedora
by Andrea Bolognani 20 Mar '18

20 Mar '18

Although it was never formally specified, it was always expected that the mingw RPM build would happen on Fedora, if anything because RHEL / CentOS don't ship the necessary mingw dependencies. Make this fact explicit by erroring out if that's not the case, the same way we already do in the main spec file. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- mingw-libvirt.spec.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 5e12bb1cae..8f3f26d2d9 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -1,5 +1,16 @@ %{?mingw_package_header} +# This spec file assumes you are building on a Fedora version +# that's still supported by the vendor. It may work on other distros +# or versions, but no effort will be made to ensure that going forward. +%define min_fedora 26 + +%if 0%{?fedora} && 0%{?fedora} >= %{min_fedora} + %define supported_platform 1 +%else + %define supported_platform 0 +%endif + # Default to skipping autoreconf. Distros can change just this one line # (or provide a command-line override) if they backport any patches that # touch configure.ac or Makefile.am. @@ -124,6 +135,11 @@ MinGW Windows libvirt virtualization library, static version. %setup -q -n libvirt-%{version} %build +%if ! %{supported_platform} +echo "This RPM requires Fedora >= %{min_fedora}" +exit 1 +%endif + %if ! %{with_phyp} %define _without_phyp --without-phyp %endif -- 2.14.3

2 1

[libvirt] [PATCH] virDomainDeviceDefValidateAliasesIterator: Ignore some hostdevs
by Michal Privoznik 20 Mar '18

20 Mar '18

https://bugzilla.redhat.com/show_bug.cgi?id=1556828 When defining a domain that has <interface type='hostdev'/> our parser creates two entries in virDomainDef: one for <interface/> and one for <hostdev/>. However, some info is shared between the two which makes user alias validation fail because alias belongs to the set of shared info. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/domain_conf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 86fc275116..c8d051fa9f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5584,6 +5584,13 @@ virDomainDeviceDefValidateAliasesIterator(virDomainDefPtr def, virDomainChrEquals(def->serials[0], dev->data.chr)) return 0; + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV && + dev->data.hostdev->parent.type == VIR_DOMAIN_DEVICE_NET) { + /* This hostdev is a copy of some previous interface. + * Aliases are duplicated. */ + return 0; + } + if (virHashLookup(data->aliases, alias)) { virReportError(VIR_ERR_XML_ERROR, _("non unique alias detected: %s"), -- 2.16.1

2 1

[libvirt] Emacs tip for easily adding Reviewed-by tags & friends
by Daniel P. Berrangé 20 Mar '18

20 Mar '18

It is nice that git has the short-hand for adding Signed-off-by, but adding other tags during reviews is kind of tedious and long winded. eg "ACK" is much shorter than typing "Reviewed-by: ...blah blah blah.." Good editors have a way to setup macros though, and so I thought I'd share the emacs approach to making life easy again... In my $HOME/.emacs.d/abbrev_defs file I have this: (define-abbrev-table 'global-abbrev-table '( ("8rev" "Reviewed-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1) ("8ack" "Acked-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1) ("8test" "Tested-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1) ("8sob" "Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>" nil 1) )) Now, if I type the "8rev" [1] and then hit space-bar or enter, emacs expands it to the full "Reviewed-by: ....blah blah blah..." line. This makes adding the full tags just as quick & easy as it was to type a traditional "ACK". Anyone have an equivalent tip for Vim ? Perhaps we could add them to the hacking file. Regards, Daniel [1] Why the leading "8" you might ask ? I've no idea. I just got this tip from QEMU developers - guess you just want some character seq that you're unlikely to want to type for real, to avoid accidental expansions. -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

5 6

[libvirt] [PATCH] hyperv: Sync generator output between python versions
by Cole Robinson 20 Mar '18

20 Mar '18

Yet another dependency on dict() hash ordering Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/hyperv/hyperv_wmi_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index d54810211..6582fe1f1 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -271,7 +271,7 @@ class WmiClass: # isolate those that are common for all and keep track of their postions pos = 0 - for key in property_info: + for key in sorted(property_info): info = property_info[key] # exists in all class versions if info[1] == num_classes: -- 2.14.3

3 2

[libvirt] [snmp PATCH 0/2] Fix build and use proper OID
by Michael Corcoran 20 Mar '18

20 Mar '18

The first patch fixes the build against net-snmp newer than 2016ish, where they removed their U64 typedef from headers to avoid a Perl incompability. Second patch replaces the placeholder organisation OID (12345) with the IANA registered libvirt OID (36957). I have tested these patches lightly on my local machine, but only get. My goal is purely monitoring. Thanks to Michal Privoznik for his advice. Michael Corcoran (2): Replace U64 with struct counter64 to fix build Replace placeholder org OID with libvirt OID src/LIBVIRT-MIB.txt | 7 ++++--- src/defaults/node-libvirtGuestCpuTime.m2d | 2 +- src/libvirtGuestTable-README-libvirtGuestTable.txt | 20 ++++++++++---------- src/libvirtGuestTable.h | 6 +++--- src/libvirtGuestTable_data_access.c | 4 ++-- src/libvirtGuestTable_data_access.h | 2 +- src/libvirtGuestTable_data_get.c | 20 ++++++++++---------- src/libvirtGuestTable_data_get.h | 4 ++-- src/libvirtGuestTable_data_set.c | 6 +++--- src/libvirtGuestTable_data_set.h | 6 +++--- src/libvirtGuestTable_interface.c | 10 +++++----- src/libvirtGuestTable_oids.h | 2 +- src/libvirtNotifications.c | 10 +++++----- 13 files changed, 50 insertions(+), 49 deletions(-)

1 0

[libvirt] [PATCH] qemu: Don't assign alias to disabled balloon device
by Jiri Denemark 20 Mar '18

20 Mar '18

<memballoon model='none'/> is the only way to disable balloon driver since libvirt will add one automatically if the memballoon element is missing. In other words, there's no balloon device if model is 'none' and generating an alias for it makes no sense. The alias will be ignored when parsing the XML and it will disappear once libvirtd is restarted. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_alias.c | 3 ++- tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml | 4 +--- ...muhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 +--- .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml | 4 +--- ...emuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 4 +--- .../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 4 +--- .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml | 4 +--- .../qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml | 4 +--- .../qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml | 4 +--- .../qemuhotplug-base-live+watchdog-user-alias.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml | 4 +--- tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml | 4 +--- .../qemuhotplug-base-with-scsi-controller-live.xml | 4 +--- .../qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml | 4 +--- 20 files changed, 21 insertions(+), 58 deletions(-) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index d0ca15bae2..95d1e0370a 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -612,7 +612,8 @@ qemuAssignDeviceAliases(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) if (qemuAssignDeviceWatchdogAlias(def->watchdog) < 0) return -1; } - if (def->memballoon) { + if (def->memballoon && + def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) { if (qemuAssingDeviceMemballoonAlias(def->memballoon, 0) < 0) return -1; } diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml index 75948f324e..f501cde333 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml @@ -50,9 +50,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml index bb9d427c2f..223e929ad5 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml @@ -60,9 +60,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml index c41f5affdd..c745d48558 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml @@ -50,9 +50,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml index b1114dba9b..3189294b65 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml @@ -59,9 +59,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml index b1114dba9b..3189294b65 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml @@ -59,9 +59,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml index 3476f61db5..edf57fcd3f 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml @@ -49,9 +49,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml index 3a202d069e..b97bba78c6 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml @@ -40,9 +40,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <panic model='s390'/> </devices> <seclabel type='none' model='none'/> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml index 4c3ea3202b..035ec25304 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml @@ -66,9 +66,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml index 493a615fd3..dd65a48057 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml @@ -54,9 +54,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml index 3609819ea3..c161e5b289 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml @@ -54,9 +54,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml index b88b220e33..299d595d6e 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml @@ -54,9 +54,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml index 11ffd9fba8..a6930bfa69 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml @@ -44,9 +44,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <shmem name='shmem0'> <model type='ivshmem-plain'/> <size unit='M'>4</size> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml index 9736f6bda7..757b6b0980 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml @@ -44,9 +44,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> <shmem name='shmem0'> <model type='ivshmem-plain'/> <size unit='M'>4</size> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml index 051273ccf6..b1ba51b2d8 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml @@ -50,9 +50,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml index 27aff2b6f8..1fddd68a27 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml @@ -48,9 +48,7 @@ <alias name='ua-UserWatchdog'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </watchdog> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml index 9f8f983e5d..76b573f25c 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml @@ -48,9 +48,7 @@ <alias name='watchdog0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </watchdog> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml index 67cf41ad6b..d46e20fa58 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml @@ -44,9 +44,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml index d23d3d483e..5ee6ea25c3 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml @@ -48,9 +48,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml index cceb678bb9..d35fea6f5f 100644 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml @@ -58,9 +58,7 @@ <input type='keyboard' bus='ps2'> <alias name='input1'/> </input> - <memballoon model='none'> - <alias name='balloon0'/> - </memballoon> + <memballoon model='none'/> </devices> <seclabel type='none' model='none'/> </domain> -- 2.16.2

2 1

[libvirt] [PATCH 00/22] Python tweaks
by Radostin Stoyanov 19 Mar '18

19 Mar '18

These patches improve the code style of python code by applying some PEP8 recommendations and simplifying some functions. Radostin Stoyanov (22): apibuild: Use isinctance for type checking apibuild: Split imports on separate lines apibuild: Remove whitespace before ',' and ':' python: Add whitespace around = and % operators esx_vi_generator: Simplify generate_helper_source esx_vi_generator: Simplify generate_helper_header esx_vi_generator: Simplify get_occurrence_comment esx_vi_generator: Simplify alignment function apibuild: Simplify conditional statements python: Remove space around = in keyword args WmiClass: Don't share "versions" between instances apibuild: Simplify uniq function apibuild: Avoid double sorting of ids python3: cpu-reformat: Use the print() function apibuild: Drop backslash between brackets apibuild: Fix indentation not multiple of 4 apibuild: Simplify strip_lead_star() apibuild: Simplify parseTypeComment() apibuild: Simplify type checking of literals apibuild: Use list comprehension insteand of map apibuild: Simplify merging of preproc tokens apibuild: Simplify parsing string tokens docs/apibuild.py | 643 +++++++++++++++++-------------------- docs/index.py | 54 ++-- src/esx/esx_vi_generator.py | 179 +++++------ src/hyperv/hyperv_wmi_generator.py | 36 ++- tests/cputestdata/cpu-cpuid.py | 6 +- tests/cputestdata/cpu-reformat.py | 6 +- 6 files changed, 424 insertions(+), 500 deletions(-) -- 2.14.3

4 52

[libvirt] [PATCH v5 0/9] Add setting CPU features (CPUID) with libxenlight driver.
by Marek Marczykowski-Górecki 19 Mar '18

19 Mar '18

Add support for CPUID setting based on <cpu> element. Since libxl format support only adjusting specific bits over host CPU, only mode='host-passthrough' is supported - other values are rejected (including default 'custom'). This will break some configurations working before (bare <cpu> element with for example NUMA configuration), but libxl driver never supported full 'custom' mode - it was silently ignored, which might lead to some unexpected effects. Since mode='host-passthrough' is now necessary to specify CPU options, do not enable nested HVM feature by mere presence of this element, require also enabling it in libxl.conf. Nested HVM is still in "preview" state, so better be explicit here. v2 of this patch series: https://www.redhat.com/archives/libvir-list/2017-July/msg00050.html v3 of this patch series: https://www.redhat.com/archives/libvir-list/2017-December/msg00314.html v4 of this patch series: https://www.redhat.com/archives/libvir-list/2018-February/msg00504.html Marek Marczykowski-Górecki (9): libxl: fix libxlDriverConfigDispose for partially constructed object libxl: pass driver config to libxlMakeDomBuildInfo libxl: error out on not supported CPU mode, instead of silently ignoring libxl: do not enable nested HVM unless global nested_hvm option enabled xenconfig: do not override def->cpu if already set elsewhere libxl: add support for CPUID features policy tests: check CPU features handling in libxl driver xenconfig: add CPUID handling to domXML <-> xl.cfg conversion tests: add test case for CPUID in xenconfig driver src/libxl/libvirtd_libxl.aug | 2 +- src/libxl/libxl.conf | 8 +- src/libxl/libxl_conf.c | 70 ++- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_domain.c | 7 +- src/libxl/test_libvirtd_libxl.aug.in | 1 +- src/xenconfig/xen_xl.c | 238 ++++++++- src/xenconfig/xen_xl.h | 2 +- tests/libxlxml2domconfigdata/fullvirt-cpuid.json | 64 ++- tests/libxlxml2domconfigdata/fullvirt-cpuid.xml | 37 +- tests/libxlxml2domconfigtest.c | 27 +- tests/virmocklibxl.c | 25 +- tests/xlconfigdata/test-fullvirt-cpuid.cfg | 25 +- tests/xlconfigdata/test-fullvirt-cpuid.xml | 35 +- tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.cfg | 1 +- tests/xlconfigdata/test-fullvirt-vnuma-autocomplete.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-nodistances.cfg | 1 +- tests/xlconfigdata/test-fullvirt-vnuma-nodistances.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma-partialdist.cfg | 1 +- tests/xlconfigdata/test-fullvirt-vnuma-partialdist.xml | 2 +- tests/xlconfigdata/test-fullvirt-vnuma.cfg | 1 +- tests/xlconfigdata/test-fullvirt-vnuma.xml | 2 +- tests/xlconfigtest.c | 1 +- 23 files changed, 509 insertions(+), 51 deletions(-) create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.json create mode 100644 tests/libxlxml2domconfigdata/fullvirt-cpuid.xml create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-cpuid.xml base-commit: 6ce3acc129bfdbe7fd02bcb8bbe8af6d13903684 -- git-series 0.9.1

2 22

[libvirt] [dbus PATCH 0/8] some improvements and rewrite to GDBus
by Pavel Hrdina 19 Mar '18

19 Mar '18

Pavel Hrdina (8): configure: call AC_PROG_CC_STDC to enable C99 if necessary configure: use LIBVIRT_ARG_WITH macro spec: explicitly require gcc m4: remove gnulib compile warning exceptions maint: set the first minimal version that will be released introduce support for GDBus implementation switch from sd-bus to GDBus implementation main: introduce thread pool to process D-Bus messages README | 2 +- configure.ac | 53 ++-- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++++ data/org.libvirt.Domain.xml | 51 +++ libvirt-dbus.spec.in | 11 +- m4/virt-compile-warnings.m4 | 37 --- src/Makefile.am | 20 +- src/connect.c | 320 ++++++++----------- src/connect.h | 36 +-- src/domain.c | 729 +++++++++++++++++++------------------------ src/domain.h | 7 +- src/events.c | 177 +++++------ src/gdbus.c | 448 ++++++++++++++++++++++++++ src/gdbus.h | 99 ++++++ src/main.c | 307 ++++++++---------- src/util.c | 170 +++++----- src/util.h | 53 ++-- test/Makefile.am | 3 +- test/travis-run | 2 +- 20 files changed, 1468 insertions(+), 1120 deletions(-) create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 src/gdbus.c create mode 100644 src/gdbus.h -- 2.14.3

2 19

[libvirt] [PATCH] pci: Ignore 32-bit PCIe domains
by Keith Busch 19 Mar '18

19 Mar '18

Intel VMD creates secondary PCIe domain, where child devices in this domain are aggregated behind a single end point. Linux exposes these as special 32-bit domains, and devices in them are not individually assignable. This patch ignores devices in such domains as desired, and prevents logging excessive errors, like: internal error: dev->name buffer overflow: 10000:00:00.0 Cc: Jonathan Derrick <jonathan.derrick(a)intel.com> Signed-off-by: Keith Busch <keith.busch(a)intel.com> --- src/util/virpci.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 55e4c3e49..53a6f2e51 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1762,6 +1762,13 @@ virPCIDeviceNew(unsigned int domain, char *vendor = NULL; char *product = NULL; + + /* Devices in a 32-bit domain are special. Currently applicable to Intel + * VMD PCIe, where individual devices are not individually assignable. + */ + if (domain > USHRT_MAX) + return NULL; + if (VIR_ALLOC(dev) < 0) return NULL; -- 2.14.3

2 2

[libvirt] [PATCH] virt-aa-helper: resolve file symlinks
by Christian Ehrhardt 19 Mar '18

19 Mar '18

In a recent change b932ed69: "virt-aa-helper: resolve yet to be created paths" several cases with symlinks in paths were fixed, but it regressed cases where the file being last element of the path was the actual link. In the case of the last element being the symlink realpath can (and shall) be called on the full path that was passed. Examples would be zfs/lvm block devices like: <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/mapper/testlvm-testvol1'/> <target dev='vdd' bus='virtio'/> </disk> With the target being: /dev/mapper/testlvm-testvol1 -> ../dm-0 That currently is rendered as "/dev/mapper/testlvm-testvol1" rwk, but instead should be (and is with the fix): "/dev/dm-0" rwk, Fixes: b932ed69: "virt-aa-helper: resolve yet to be created paths" Fixes: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1756394 Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- src/security/virt-aa-helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 992bd44..456cfce 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -777,7 +777,7 @@ vah_add_path(virBufferPtr buf, const char *path, const char *perms, bool recursi * 3. re-combine the realpath with the remaining suffix * Note: A totally non existent path is used as-is */ - if ((pathdir = mdir_name(path)) == NULL) + if (VIR_STRDUP_QUIET(pathdir, path) < 0) goto cleanup; while (!virFileExists(pathdir)) { if ((pathtmp = mdir_name(pathdir)) == NULL) -- 2.7.4

2 1

[libvirt] [PATCH tck] Relabel SELinux when customizing virt-builder image
by Daniel P. Berrangé 19 Mar '18

19 Mar '18

When you tell virt-builder to install extra RPMs, this potentially looses the SELinux labelling that Anaconda had originally setup. Thus we must tell virt-builder to enable SELinux relabelling. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- lib/Sys/Virt/TCK.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index e9da8d2..b39f578 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -405,7 +405,7 @@ sub create_virt_builder_disk { } print "# running virt-builder $osname\n"; - system "virt-builder", "--install", "dsniff", "--root-password", "password:$password", "--output", $target, $osname; + system "virt-builder", "--install", "dsniff", "--selinux-relabel", "--root-password", "password:$password", "--output", $target, $osname; die "cannot run virt-builder: $?" if $? != 0; -- 2.14.3

4 4

[libvirt] [PATCH 0/2] python3: Further minor tweaks
by Andrea Bolognani 19 Mar '18

19 Mar '18

Andrea Bolognani (2): docs: Import print_function in reformat-news.py python: Drop explicit version where possible docs/reformat-news.py | 4 +++- src/esx/esx_vi_generator.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.14.3

2 5

[libvirt] [PATCH v2 0/2] Fix the odd VFIO error for a non-existent mdev when IOMMU is disabled
by Erik Skultety 19 Mar '18

19 Mar '18

Unlike GPU assignment, mdev doesn't need the IOMMU to be enabled within kernel, since the physical parent device takes care of the isolation, i.e. there's an IOMMU group entry for each mdev created under sysfs, thus a VM can start successfully. Since v1: - adjusted the error msg in patch 1 according to reviewer - rephrased the commit message for patch 2 to make it less confusing Erik Skultety (2): util: mdev: Improve the error msg on non-existent mdev prior to VM start qemu: hostdev: Fix the error on VM start with an mdev when IOMMU is off src/qemu/qemu_hostdev.c | 7 ++++++- src/util/virmdev.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) -- 2.13.6

2 5

[libvirt] [PATCH] virNetlinkDumpCommand: Don't leak response buffer
by Michal Privoznik 19 Mar '18

19 Mar '18

==16451== 32,768 bytes in 2 blocks are definitely lost in loss record 1,007 of 1,013 ==16451== at 0x4C2AF0F: malloc (vg_replace_malloc.c:299) ==16451== by 0x7CADB40: nl_recv (in /usr/lib64/libnl-3.so.200.23.0) ==16451== by 0x532DFAC: virNetlinkDumpCommand (virnetlink.c:363) ==16451== by 0x53236AE: virNetDevIPCheckIPv6Forwarding (virnetdevip.c:641) ==16451== by 0xE3E4A1A: networkStartNetworkVirtual (bridge_driver.c:2490) ==16451== by 0xE3E55F5: networkStartNetwork (bridge_driver.c:2832) ==16451== by 0xE3DFFE5: networkAutostartConfig (bridge_driver.c:531) ==16451== by 0x53F47E0: virNetworkObjListForEachHelper (virnetworkobj.c:1412) ==16451== by 0x52FE69F: virHashForEach (virhash.c:606) ==16451== by 0x53F4857: virNetworkObjListForEach (virnetworkobj.c:1439) ==16451== by 0xE3E0BF4: networkStateAutoStart (bridge_driver.c:808) ==16451== by 0x55689CE: virStateInitialize (libvirt.c:758) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 0e281b06b8..955f1558ee 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -360,6 +360,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, goto cleanup; while (!end) { + VIR_FREE(resp); len = nl_recv(nlhandle, &nladdr, (unsigned char **)&resp, NULL); VIR_WARNINGS_NO_CAST_ALIGN for (msg = resp; NLMSG_OK(msg, len); msg = NLMSG_NEXT(msg, len)) { @@ -378,6 +379,7 @@ virNetlinkDumpCommand(struct nl_msg *nl_msg, ret = 0; cleanup: + VIR_FREE(resp); virNetlinkFree(nlhandle); return ret; } -- 2.16.1

2 2

[libvirt] [PATCH] gnulib: switch to use https:// instead of git:// protocol
by Daniel P. Berrangé 19 Mar '18

19 Mar '18

Some contributors are behind obnoxious firewalls that block everything except http(s) traffic, preventing checkout of modules using the git:// protocol. Since git.savannah.gnu.org is using the modern, fast HTTP transport, there's no real downside to using that by default. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- AFAICT, this change has no effect for anyone with an existing checkout of gnulib. They'll continue using the git protocol, just new checkouts will start using http. This is fine so no effort is made to "fix" existing checkouts. .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index cfee24d7b8..0fda887528 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "gnulib"] path = .gnulib - url = git://git.sv.gnu.org/gnulib.git + url = https://git.savannah.gnu.org/git/gnulib.git/ [submodule "keycodemapdb"] path = src/keycodemapdb url = https://gitlab.com/keycodemap/keycodemapdb.git -- 2.14.3

2 1

[libvirt] [GSoC] Pointers for project idea
by Sukrit Bhatnagar 19 Mar '18

19 Mar '18

Hi, Can anyone provide me with some pointers for the project "Conversion to and from OCI formatted containers"? I have referred to the relevant source files listed on the ideas page and would like to read more about it. Thanks, Sukrit

2 1

[libvirt] [PATCH rebase v4 0/5] qemu: use arp table of host to get the
by Chen Hanxiao 18 Mar '18

18 Mar '18

introduce VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP to get ip address of VM from the output of /proc/net/arp Chen Hanxiao (5): util: introduce virNetlinkGetNeighbor to get neighbor table entry util: introduce helper to parse message from RTM_GETNEIGH query qemu: introduce qemuARPGetInterfaces to get IP from host's arp table virsh: add --source arp to domifaddr news: qemu: use arp table of host to get the IP address of guests docs/news.xml | 9 ++ include/libvirt/libvirt-domain.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libvirt-domain.c | 7 ++ src/libvirt_private.syms | 6 ++ src/qemu/qemu_driver.c | 72 ++++++++++++++++ src/util/Makefile.inc.am | 2 + src/util/virarptable.c | 181 +++++++++++++++++++++++++++++++++++++++ src/util/virarptable.h | 48 +++++++++++ src/util/virnetlink.c | 82 ++++++++++++++++++ src/util/virnetlink.h | 2 + tools/virsh-domain-monitor.c | 2 + tools/virsh.pod | 7 +- 14 files changed, 418 insertions(+), 3 deletions(-) create mode 100644 src/util/virarptable.c create mode 100644 src/util/virarptable.h -- 2.14.3

3 13

[libvirt] [PATCH 0/2] virarptable: fix some leaks and format
by Chen Hanxiao 17 Mar '18

17 Mar '18

Address John's comment on v4 Chen Hanxiao (2): virarptable: fix some leaks and format issue qemu: fix some leaks src/qemu/qemu_driver.c | 3 +++ src/util/virarptable.c | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH V2] libxl: MigratePrepare: use standard begin and end API pattern
by Jim Fehlig 16 Mar '18

16 Mar '18

libxlDomainMigrationPrepare adds the incoming domain def to the list of domains via virDomainObjListAdd, but never adds its own ref to the returned virDomainObj as other callers of virDomainObjListAdd do. libxlDomainMigrationPrepareTunnel3 suffers the same discrepancy. Change both to add a ref to the virDomainObj after a successful virDomainObjListAdd, similar to other callers. This ensures a consistent pattern throughout the drivers and allows using the virDomainObjEndAPI function for cleanup. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V2 of https://www.redhat.com/archives/libvir-list/2018-March/msg00674.html Changes in V2: Add ref after call to virDomainObjListAdd so that EndAPI can be used in the usual pattern. src/libxl/libxl_migration.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 42a84bd35..7dc39ae02 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -583,6 +583,7 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, NULL))) goto error; + virObjectRef(vm); *def = NULL; priv = vm->privateData; @@ -635,13 +636,11 @@ libxlDomainMigrationPrepareTunnel3(virConnectPtr dconn, /* Remove virDomainObj from domain list */ if (vm) { virDomainObjListRemove(driver->domains, vm); - vm = NULL; + virObjectLock(vm); } done: - if (vm) - virObjectUnlock(vm); - + virDomainObjEndAPI(&vm); return ret; } @@ -683,6 +682,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, NULL))) goto error; + virObjectRef(vm); *def = NULL; priv = vm->privateData; @@ -810,7 +810,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, /* Remove virDomainObj from domain list */ if (vm) { virDomainObjListRemove(driver->domains, vm); - vm = NULL; + virObjectLock(vm); } done: @@ -820,8 +820,7 @@ libxlDomainMigrationPrepare(virConnectPtr dconn, VIR_FREE(hostname); else virURIFree(uri); - if (vm) - virObjectUnlock(vm); + virDomainObjEndAPI(&vm); virObjectUnref(cfg); return ret; } -- 2.16.2

2 1

[libvirt] [PATCH v1 0/7] Add support for video and input devices on S390
by Farhan Ali 16 Mar '18

16 Mar '18

Hi, This patch series adds Libvirt support for video and input devices for QEMU guests on S390. QEMU v2.11.0 added support for the virtio-gpu-ccw device [1] and virtio-{keyboard, mouse, tablet}-ccw devices [2], which can be used as video and input devices respectively. Thanks Farhan [1] https://git.qemu.org/?p=qemu.git;a=commit;h=1f8ad88935f5cb5a2968909e392dbee… [2] https://git.qemu.org/?p=qemu.git;a=commit;h=3382cf1fabbf722dce931846853dae7… Farhan Ali (7): qemu: Fix comment for 'qemuValidateDevicePCISlotsChipsets' qemu: Add support for virtio-gpu-ccw device tests: Add test case for virtio-gpu-ccw qemu: Use correct bus type for input devices qemu: Add support for virtio input ccw devices tests: Add test case for virtio input ccw devices news: Update for virtio-gpu-ccw and virtio input ccw devices docs/formatdomain.html.in | 5 ++ docs/news.xml | 10 +++ src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 6 ++ src/qemu/qemu_command.c | 32 +++++++-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domain_address.c | 12 +++- src/qemu/qemu_process.c | 5 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 83 +++++++++++++++++++--- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 6 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 26 +++++++ tests/qemuxml2argvdata/input-virtio-ccw.xml | 29 ++++++++ .../qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml | 18 +++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 25 +++++++ tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml | 35 +++++++++ tests/qemuxml2argvtest.c | 15 ++++ tests/qemuxml2xmloutdata/input-virtio-ccw.xml | 36 ++++++++++ .../video-virtio-gpu-ccw-auto.xml | 34 +++++++++ tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml | 38 ++++++++++ tests/qemuxml2xmltest.c | 23 ++++++ 20 files changed, 434 insertions(+), 19 deletions(-) create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.args create mode 100644 tests/qemuxml2argvdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.args create mode 100644 tests/qemuxml2argvdata/video-virtio-gpu-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/input-virtio-ccw.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml create mode 100644 tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml -- 2.7.4

2 19

[libvirt] [PATCH 0/2] apibuild: fix with python3
by Cole Robinson 16 Mar '18

16 Mar '18

These patches fix apibuild.py to work with python3 and generate identical output to python2, at least in my testing. Someone else should confirm though Thanks, Cole Cole Robinson (2): apibuild: Fix errors on python3 apibuild: Fix -refs.xml building docs/apibuild.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH 0/4] libxl: fix virDomainObj locking and ref counting in migration APIs
by Jim Fehlig 16 Mar '18

16 Mar '18

While reviewing a patch [0] from John's series to rework virDomainObjListFindBy{UUID|ID}Ref, I noticed several problems with locking and ref counting in the libxl migration APIs. This series changes the Begin, Prepare, Perform, and Confirm APIs to use the standard pattern of get a locked and ref counted virDomainObj, perform API, virDomainObjEndAPI. [0] https://www.redhat.com/archives/libvir-list/2018-March/msg00516.html Jim Fehlig (4): libxl: MigrateBegin: Dont call EndAPI in helper function libxl: MigrateConfirm: Dont unlock virDomainObj in helper function libxl: MigratePrepare: properly cleanup after virDomainObjListAdd libxl: MigratePerform: properly cleanup after libxlDomObjFromDomain src/libxl/libxl_driver.c | 40 ++++++++++++++++++++++------------------ src/libxl/libxl_migration.c | 10 ++-------- 2 files changed, 24 insertions(+), 26 deletions(-) -- 2.16.2

3 12

[libvirt] [PATCH] docs: mention viewing security notices on front page
by Daniel P. Berrangé 16 Mar '18

16 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a trivial docs change after suggestion by Roman in other review docs/index.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html.in b/docs/index.html.in index c0c55cb148..1b3a7a3db6 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -52,7 +52,7 @@ <dd>Get involved in the libvirt community & student outreach programs</dd> <dt><a href="securityprocess.html">Security vulnerabilities</a></dt> - <dd>Report vulnerabilities to the libvirt security response team</dd> + <dd>View security notices and report vulnerabilities to the libvirt security response team</dd> <dt><a href="bugs.html">Bug reporting</a></dt> <dd>View and report bugs in libvirt packages</dd> -- 2.14.3

1 0

[libvirt] [PATCH] qemu: Build usb controller command line more wisely
by Michal Privoznik 16 Mar '18

16 Mar '18

https://bugzilla.redhat.com/show_bug.cgi?id=1552127 When building command line for USB controllers we have to do more than just put controller's alias onto the command line. QEMU has concept of these joined USB controllers. For instance ehci and uhci controllers need to create the same USB bus. To achieve that the slave controller needs to refer the master controller. This worked until we've introduced user aliases because both master and slave had the same alias. With user aliases slave can have different alias than master. Therefore, when generating command line for slave we need to look up the master's alias. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 44 ++++++++++++++-- tests/qemuxml2argvdata/user-aliases-usb.args | 38 ++++++++++++++ tests/qemuxml2argvdata/user-aliases-usb.xml | 78 ++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ 4 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.args create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fa0aa5d5c3..a8afbd14fa 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2545,8 +2545,34 @@ qemuControllerModelUSBToCaps(int model) } +static const char * +qemuBuildUSBControllerFindMasterAlias(const virDomainDef *domainDef, + const virDomainControllerDef *def) +{ + size_t i; + + for (i = 0; i < domainDef->ncontrollers; i++) { + const virDomainControllerDef *tmp = domainDef->controllers[i]; + + if (tmp->type != VIR_DOMAIN_CONTROLLER_TYPE_USB) + continue; + + if (tmp->idx != def->idx) + continue; + + if (tmp->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) + continue; + + return tmp->info.alias; + } + + return NULL; +} + + static int -qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, +qemuBuildUSBControllerDevStr(const virDomainDef *domainDef, + virDomainControllerDefPtr def, virQEMUCapsPtr qemuCaps, virBuffer *buf) { @@ -2586,11 +2612,19 @@ qemuBuildUSBControllerDevStr(virDomainControllerDefPtr def, def->opts.usbopts.ports, def->opts.usbopts.ports); } - if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) + if (def->info.mastertype == VIR_DOMAIN_CONTROLLER_MASTER_USB) { + const char *masterbus; + + if (!(masterbus = qemuBuildUSBControllerFindMasterAlias(domainDef, def))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("masterbus not found")); + return -1; + } virBufferAsprintf(buf, ",masterbus=%s.0,firstport=%d", - def->info.alias, def->info.master.usb.startport); - else + masterbus, def->info.master.usb.startport); + } else { virBufferAsprintf(buf, ",id=%s", def->info.alias); + } return 0; } @@ -2722,7 +2756,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, break; case VIR_DOMAIN_CONTROLLER_TYPE_USB: - if (qemuBuildUSBControllerDevStr(def, qemuCaps, &buf) == -1) + if (qemuBuildUSBControllerDevStr(domainDef, def, qemuCaps, &buf) == -1) goto error; if (nusbcontroller) diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args new file mode 100644 index 0000000000..3dfaadc33b --- /dev/null +++ b/tests/qemuxml2argvdata/user-aliases-usb.args @@ -0,0 +1,38 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name gentoo \ +-S \ +-M pc-i440fx-1.4 \ +-m 4096 \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \ +-nographic \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-gentoo/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-global PIIX4_PM.disable_s3=0 \ +-global PIIX4_PM.disable_s4=0 \ +-boot cd \ +-device ich9-usb-ehci1,id=ua-myUSB1,bus=pci.0,addr=0x4.0x7 \ +-device ich9-usb-uhci1,masterbus=ua-myUSB1.0,firstport=0,bus=pci.0,\ +multifunction=on,addr=0x4 \ +-device ich9-usb-uhci2,masterbus=ua-myUSB1.0,firstport=2,bus=pci.0,\ +addr=0x4.0x1 \ +-device ich9-usb-uhci3,masterbus=ua-myUSB1.0,firstport=4,bus=pci.0,\ +addr=0x4.0x2 \ +-device ich9-usb-ehci1,id=ua-myUSB5,bus=pci.0,addr=0x5.0x7 \ +-device ich9-usb-uhci1,masterbus=ua-myUSB5.0,firstport=0,bus=pci.0,\ +multifunction=on,addr=0x5 \ +-device ich9-usb-uhci2,masterbus=ua-myUSB5.0,firstport=2,bus=pci.0,\ +addr=0x5.0x1 \ +-device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,\ +addr=0x5.0x2 \ +-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \ +-device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/user-aliases-usb.xml b/tests/qemuxml2argvdata/user-aliases-usb.xml new file mode 100644 index 0000000000..668a9c384b --- /dev/null +++ b/tests/qemuxml2argvdata/user-aliases-usb.xml @@ -0,0 +1,78 @@ +<domain type='kvm'> + <name>gentoo</name> + <uuid>a75aca4b-a02f-2bcb-4a91-c93cd848c34b</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc-i440fx-1.4'>hvm</type> + <boot dev='hd'/> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + <apic/> + <pae/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <pm> + <suspend-to-mem enabled='yes'/> + <suspend-to-disk enabled='yes'/> + </pm> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='ich9-ehci1'> + <alias name='ua-myUSB1'/> + <address type='pci' domain='0' bus='0' slot='4' function='7'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci1'> + <alias name='ua-myUSB2'/> + <master startport='0'/> + <address type='pci' domain='0' bus='0' slot='4' function='0' multifunction='on'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci2'> + <alias name='ua-myUSB3'/> + <master startport='2'/> + <address type='pci' domain='0' bus='0' slot='4' function='1'/> + </controller> + <controller type='usb' index='0' model='ich9-uhci3'> + <alias name='ua-myUSB4'/> + <master startport='4'/> + <address type='pci' domain='0' bus='0' slot='4' function='2'/> + </controller> + <controller type='usb' index='1' model='ich9-ehci1'> + <alias name='ua-myUSB5'/> + <address type='pci' domain='0' bus='0' slot='5' function='7'/> + </controller> + <controller type='usb' index='1' model='ich9-uhci1'> + <alias name='ua-myUSB6'/> + <master startport='0'/> + <address type='pci' domain='0' bus='0' slot='5' function='0' multifunction='on'/> + </controller> + <controller type='usb' index='1' model='ich9-uhci2'> + <alias name='ua-myUSB7'/> + <master startport='2'/> + <address type='pci' domain='0' bus='0' slot='5' function='1'/> + </controller> + <controller type='usb' index='1' model='ich9-uhci3'> + <alias name='ua-myUSB8'/> + <master startport='4'/> + <address type='pci' domain='0' bus='0' slot='5' function='2'/> + </controller> + <hostdev mode='subsystem' type='usb' managed='yes'> + <source> + <address bus='14' device='6'/> + </source> + <address type='usb' bus='0' port='3'/> + </hostdev> + <hostdev mode='subsystem' type='usb' managed='yes'> + <source> + <address bus='15' device='6'/> + </source> + <address type='usb' bus='1' port='3'/> + </hostdev> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 731db9ed52..f6a90c2814 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2997,6 +2997,9 @@ mymain(void) QEMU_CAPS_DEVICE_ISA_SERIAL, QEMU_CAPS_HDA_DUPLEX); DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI); + DO_TEST("user-aliases-usb", QEMU_CAPS_KVM, + QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4, + QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION); /* Test disks with format probing enabled for legacy reasons. * New tests should not go in this section. */ -- 2.16.1

2 1

[libvirt] [PATCH] docs: link to security.libvirt.org website
by Daniel P. Berrangé 16 Mar '18

16 Mar '18

We forgot to tell anyone that we were publishing security notices online at https://security.libvirt.org Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- docs/securityprocess.html.in | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/docs/securityprocess.html.in b/docs/securityprocess.html.in index 2bab07bf39..adf30259b0 100644 --- a/docs/securityprocess.html.in +++ b/docs/securityprocess.html.in @@ -37,6 +37,19 @@ moderator and the reporter copied on any replies. </p> + <h2><a id="secnotice">Security notices</a></h2> + + <p> + Information for all historical security issues is maintained in + machine parsable format in the + <a href="https://libvirt.org/git/?p=libvirt-security-notice.git;a=log">libvirt-security-notice GIT repository</a> and + <a href="https://security.libvirt.org">published online</a> + in text, HTML and XML formats. Security notices are published + on the <a href="https://libvirt.org/contact.html#email">libvirt-announce mailing list</a> + when any embargo is lifted, or as soon as triaged if already + public knowledge. + </p> + <h2><a id="seclist">Security team</a></h2> <p> @@ -102,12 +115,5 @@ will be responsible for backporting the officially published fixes to other release branches where applicable. </p> - - <h2><a id="notification">Notification of issues</a></h2> - - <p> - When an embargo expires, security issues will be announced on both - the libvirt development and announcement <a href="https://libvirt.org/contact.html#email">mailing lists</a>. - </p> </body> </html> -- 2.14.3

3 2

[libvirt] [GSoC] Contribution towards GSoC'18 [BiteSizedTasks].
by Sukrit Bhatnagar 16 Mar '18

16 Mar '18

Task: Use comma escaping for more command line values in qemu Added virQEMUBuildBufferEscapeComma wherever applicable in src/qemu/qemu_command.c as specified in the Task page. Places where no changes were made: - src->hosts->socket in qemuBuildNetworkDriveURI uses virAsprintf not virBufferAsprintf - TYPE_DEV, TYPE_FILE, TYPE_PIPE, TYPE_UNIX not found in qemuBuildChrArgStr - not applicable on data.nix.path in qemuBuildVhostuserCommandLine - UNCLEAR: places that use strchr in qemuBuildSmartcardCommandLine, can be converted to use virBufferEscape All tests which were passed by an unmodified clone were passed after I made these changes. Once `make syntax-check` gave a false error related to matching of braces in if-else. Your feedback is welcome :) Signed-off-by: Sukrit Bhatnagar <skrtbhtngr(a)gmail.com> --- src/qemu/qemu_command.c | 74 ++++++++++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fa0aa5d5c..beabf8837 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -474,8 +474,10 @@ qemuBuildRomStr(virBufferPtr buf, default: break; } - if (info->romfile) - virBufferAsprintf(buf, ",romfile=%s", info->romfile); + if (info->romfile) { + virBufferAddLit(buf, ",romfile="); + virQEMUBuildBufferEscapeComma(buf, info->romfile); + } } return 0; } @@ -2177,11 +2179,15 @@ qemuBuildDriveDevStr(const virDomainDef *def, virBufferAsprintf(&opt, ",wwn=0x%s", disk->wwn); } - if (disk->vendor) - virBufferAsprintf(&opt, ",vendor=%s", disk->vendor); + if (disk->vendor) { + virBufferAddLit(&opt, ",vendor="); + virQEMUBuildBufferEscapeComma(&opt, disk->vendor); + } - if (disk->product) - virBufferAsprintf(&opt, ",product=%s", disk->product); + if (disk->product) { + virBufferAddLit(&opt, ",product="); + virQEMUBuildBufferEscapeComma(&opt, disk->product); + } if (disk->bus == VIR_DOMAIN_DISK_BUS_USB) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_STORAGE_REMOVABLE)) { @@ -2418,7 +2424,8 @@ qemuBuildFSStr(virDomainFSDefPtr fs, } virBufferAsprintf(&opt, ",id=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); - virBufferAsprintf(&opt, ",path=%s", fs->src->path); + virBufferAddLit(&opt, ",path="); + virQEMUBuildBufferEscapeComma(&opt, fs->src->path); if (fs->readonly) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_FSDEV_READONLY)) { @@ -2463,7 +2470,8 @@ qemuBuildFSDevStr(const virDomainDef *def, virBufferAsprintf(&opt, ",id=%s", fs->info.alias); virBufferAsprintf(&opt, ",fsdev=%s%s", QEMU_FSDEV_HOST_PREFIX, fs->info.alias); - virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); + virBufferAddLit(&opt, ",mount_tag="); + virQEMUBuildBufferEscapeComma(&opt, fs->dst); if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) goto error; @@ -3603,10 +3611,9 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, break; case VIR_DOMAIN_NET_TYPE_CLIENT: - virBufferAsprintf(&buf, "socket%cconnect=%s:%d,", - type_sep, - net->data.socket.address, - net->data.socket.port); + virBufferAsprintf(&buf, "socket%cconnect=", type_sep); + virQEMUBuildBufferEscapeComma(&buf, net->data.socket.address); + virBufferAsprintf(&buf, ":%d,", net->data.socket.port); break; case VIR_DOMAIN_NET_TYPE_SERVER: @@ -4858,7 +4865,8 @@ qemuBuildChrChardevFileStr(virLogManagerPtr logManager, virBufferAsprintf(buf, ",%s=%s,%s=on", filearg, fdpath, appendarg); VIR_FREE(fdpath); } else { - virBufferAsprintf(buf, ",%s=%s", filearg, fileval); + virBufferAsprintf(buf, ",%s=", filearg); + virQEMUBuildBufferEscapeComma(buf, fileval); if (appendval != VIR_TRISTATE_SWITCH_ABSENT) { virBufferAsprintf(buf, ",%s=%s", appendarg, virTristateSwitchTypeToString(appendval)); @@ -4916,9 +4924,10 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_DEV: - virBufferAsprintf(&buf, "%s,id=%s,path=%s", + virBufferAsprintf(&buf, "%s,id=%s,path=", STRPREFIX(alias, "parallel") ? "parport" : "tty", - charAlias, dev->data.file.path); + charAlias); + virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_FILE: @@ -4938,8 +4947,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager, break; case VIR_DOMAIN_CHR_TYPE_PIPE: - virBufferAsprintf(&buf, "pipe,id=%s,path=%s", charAlias, - dev->data.file.path); + virBufferAsprintf(&buf, "pipe,id=%s,path=", charAlias); + virQEMUBuildBufferEscapeComma(&buf, dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -7829,10 +7838,14 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, if (cfg->vncTLS) { virBufferAddLit(&opt, ",tls"); - if (cfg->vncTLSx509verify) - virBufferAsprintf(&opt, ",x509verify=%s", cfg->vncTLSx509certdir); - else - virBufferAsprintf(&opt, ",x509=%s", cfg->vncTLSx509certdir); + if (cfg->vncTLSx509verify) { + virBufferAddLit(&opt, ",x509verify="); + virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); + } + else { + virBufferAddLit(&opt, ",x509="); + virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); + } } if (cfg->vncSASL) { @@ -7977,8 +7990,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, !cfg->spicePassword) virBufferAddLit(&opt, "disable-ticketing,"); - if (hasSecure) - virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); + if (hasSecure) { + virBufferAddLit(&opt, "x509-dir="); + virQEMUBuildBufferEscapeComma(&opt, cfg->spiceTLSx509certdir); + virBufferAddLit(&opt, ","); + } switch (graphics->data.spice.defaultMode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: @@ -9463,9 +9479,9 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, NULL); } - virBufferAsprintf(&buf, - "file=%s,if=pflash,format=raw,unit=%d", - loader->path, unit); + virBufferAddLit(&buf, "file="); + virQEMUBuildBufferEscapeComma(&buf, loader->path); + virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit); unit++; if (loader->readonly) { @@ -9478,9 +9494,9 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, if (loader->nvram) { virBufferFreeAndReset(&buf); - virBufferAsprintf(&buf, - "file=%s,if=pflash,format=raw,unit=%d", - loader->nvram, unit); + virBufferAddLit(&buf, "file="); + virQEMUBuildBufferEscapeComma(&buf, loader->nvram); + virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit); virCommandAddArg(cmd, "-drive"); virCommandAddArgBuffer(cmd, &buf); -- 2.16.2

2 1

[libvirt] [PATCH 0/2] Don't report a VFIO error for mdev when IOMMU is disabled
by Erik Skultety 16 Mar '18

16 Mar '18

Unlike GPU assignment, mdev doesn't need the IOMMU to be enabled within kernel, since the physical parent device takes care of the isolation, i.e. there's an IOMMU group entry for each mdev created under sysfs, thus a VM can start successfully Erik Skultety (2): util:mdev: Improve the error msg on non-existent mdev prior to VM start qemu: hostdev: Don't error out on domain with an mdev when IOMMU is off src/qemu/qemu_hostdev.c | 7 ++++++- src/util/virmdev.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) -- 2.13.6

2 7

[libvirt] [PATCH 0/2] Another round of build fixes
by Michal Privoznik 16 Mar '18

16 Mar '18

Pushed under build-breaker rule. Michal Privoznik (2): virarptable: Avoid cast align warnings virnetlink: Provide virNetlinkGetNeighbor non-Linux stub src/util/virarptable.c | 100 ++++++++++++++++++++++++------------------------- src/util/virnetlink.c | 11 ++++++ 2 files changed, 61 insertions(+), 50 deletions(-) -- 2.16.1

1 2

[libvirt] [PATCH 0/2] Two small fixes
by Michal Privoznik 16 Mar '18

16 Mar '18

*** BLURB HERE *** Michal Privoznik (2): src: Don't add virarptable.c to setuid library virarptable: Include rtnetlink.h only on Linux src/Makefile.am | 1 - src/util/virarptable.c | 3 +++ src/util/virarptable.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) -- 2.16.1

3 6

[libvirt] [GSoC] git send-email help
by Sukrit Bhatnagar 16 Mar '18

16 Mar '18

Hi, I am trying to mail a patch I made to this list, but git send-email is not working. I have followed the steps in Contributing Guidelines page. What can I do? Thanks, Sukrit

2 1

[libvirt] [RFC PATCH 00/28] Enable multifunction pci hotplug
by Shivaprasad G Bhat 15 Mar '18

15 Mar '18

Hi All, I have revisited/rewritten my previously posted patches. Here is the RFC. Since this patchset is a complete rewrite, I am starting with v1 here. The semantics is as discussed before https://www.redhat.com/archives/libvir-list/2016-April/msg01057.html As I went on to refactor the code to support multifunction virtio devices, I realised the abort/cleanup path would be a nightmare there, in case of failures. So, dropped that attempt. The current RFC limits to the real practical use cases of Multifunction PCI hostdevices. All new test code to support multifunction PCI hostdevices and test cases are added to prove the functionality. So, to summarise ============= Patch 1 - is a bug fix Patch 2-6 - Adds all PCI/VFIO/Multifunction/multiple devices per IOMMU group support to our mock test environment. Patches till here, are kind of basic and independent but necessary for the remaining patches. ============= Patch 7-14 - Detect and auto-address PCI multifunction devices. ============= Patch 15-25 - Refactor/Prepare for hotplug/unplug Patch 26-28 - Finally implement Hotplug/Unplug Thanks, Shivaprasad --- Shivaprasad G Bhat (28): Fix the iommu group path in mock pci util: move the hostdev passthrough support functions to utility tests: pci: Mock the iommu groups and vfio virpcitest: Change the stub driver to vfio from pci-stub virpcimock: Mock the SRIOV Virtual functions tests: qemu: Add test case for pci-hostdev hotplug tests: Add a baseline test for multifunction pci device use case util: virpci: detect if the device is a multifunction device from sysfs tests: qemu: mock pci environment for qemuargv2xmltests virhostdev: Introduce virHostdevPCIDevicesBelongToSameSlot qemu: address: Separate the slots into multiple aggregates qemu: address: Enable auto addressing multifunction cards util: make virHostdevIsVirtualFunction() public conf: qemu: validate multifunction hostdevice domain configs conf: Add helper to get active functions of a slot of domain qemu: hostdev: Move the hostdev preparation to a separate function qemu: hotplug: Move the detach of PCI device to the beginnging of live hotplug qemu: hotplug: move assignment outside qemuDomainAttachHostPCIDevice Introduce virDomainDeviceDefParseXMLMany Introduce qemuDomainDeviceParseXMLMany qemu: refactor qemuDomain[Attach|Detach]DeviceConfig qemu: refactor qemuDomain[Attach|Detach]DeviceLive qemu: hotplug: Queue and wait for multiple devices domain: addr: Introduce virDomainPCIAddressEnsureMultifunctionAddress qemu: hotplug: Implement multifunction device hotplug qemu: hotplug : Prevent updates to mulitfunction device qemu: hotplug: Move out the Single function check qemu: hotplug: Implement multifunction device unplug src/conf/device_conf.h | 7 src/conf/domain_addr.c | 127 ++++++- src/conf/domain_addr.h | 41 +- src/conf/domain_conf.c | 194 +++++++++- src/conf/domain_conf.h | 39 ++ src/libvirt_private.syms | 14 + src/node_device/node_device_udev.c | 2 src/qemu/qemu_capabilities.c | 5 src/qemu/qemu_domain.c | 72 ++++ src/qemu/qemu_domain.h | 19 + src/qemu/qemu_domain_address.c | 375 ++++++++++++++++++- src/qemu/qemu_domain_address.h | 15 + src/qemu/qemu_driver.c | 197 +++++++--- src/qemu/qemu_hostdev.c | 70 ---- src/qemu/qemu_hostdev.h | 3 src/qemu/qemu_hotplug.c | 389 ++++++++++++++++---- src/qemu/qemu_hotplug.h | 14 + src/util/virhostdev.c | 96 +++++ src/util/virhostdev.h | 11 + src/util/virpci.c | 22 + src/util/virpci.h | 8 src/util/virprocess.h | 2 tests/Makefile.am | 7 tests/qemuargv2xmldata/hostdev-pci-address.args | 2 tests/qemuargv2xmldata/hostdev-pci-address.xml | 2 tests/qemuargv2xmltest.c | 18 + tests/qemuhotplugtest.c | 98 ++++- .../qemuhotplug-hostdev-pci.xml | 6 .../qemuhotplug-multifunction-hostdev-pci-2.xml | 14 + .../qemuhotplug-multifunction-hostdev-pci.xml | 20 + .../qemuhotplug-base-live+hostdev-pci.xml | 60 +++ ...hotplug-base-live+multifunction-hostdev-pci.xml | 76 ++++ .../qemuhotplug-pseries-base-live+hostdev-pci.xml | 53 +++ ...eries-base-live+multifunction-hostdev-pci-2.xml | 61 +++ ...pseries-base-live+multifunction-hostdev-pci.xml | 69 ++++ .../qemuhotplug-pseries-base-live.xml | 45 ++ .../hostdev-pci-address-device.args | 2 .../hostdev-pci-address-device.xml | 2 tests/qemuxml2argvdata/hostdev-pci-address.args | 2 tests/qemuxml2argvdata/hostdev-pci-address.xml | 2 .../hostdev-pci-multifunction.args | 31 ++ .../qemuxml2argvdata/hostdev-pci-multifunction.xml | 59 +++ .../hostdev-pci-no-primary-function.xml | 23 + tests/qemuxml2argvdata/hostdev-pci-validate.args | 25 + tests/qemuxml2argvdata/hostdev-pci-validate.xml | 29 + .../qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 .../qemuxml2argvdata/hostdev-vfio-multidomain.xml | 2 tests/qemuxml2argvdata/hostdev-vfio.args | 2 tests/qemuxml2argvdata/hostdev-vfio.xml | 2 tests/qemuxml2argvdata/net-hostdev-fail.xml | 2 .../qemuxml2argvdata/net-hostdev-multidomain.args | 2 tests/qemuxml2argvdata/net-hostdev-multidomain.xml | 2 tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 tests/qemuxml2argvdata/net-hostdev-vfio.xml | 2 tests/qemuxml2argvdata/net-hostdev.args | 2 tests/qemuxml2argvdata/net-hostdev.xml | 2 tests/qemuxml2argvdata/pci-rom.args | 4 tests/qemuxml2argvdata/pci-rom.xml | 4 tests/qemuxml2argvdata/pseries-hostdevs-1.args | 5 tests/qemuxml2argvdata/pseries-hostdevs-3.args | 5 tests/qemuxml2argvtest.c | 17 + tests/qemuxml2xmloutdata/hostdev-pci-address.xml | 2 .../hostdev-pci-multifunction.xml | 79 ++++ tests/qemuxml2xmloutdata/hostdev-vfio.xml | 2 tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 2 tests/qemuxml2xmloutdata/net-hostdev.xml | 2 tests/qemuxml2xmloutdata/pci-rom.xml | 4 tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml | 4 tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml | 4 tests/qemuxml2xmltest.c | 1 tests/virhostdevtest.c | 39 -- tests/virpcimock.c | 199 +++++++++- tests/virpcitest.c | 12 - tests/virpcitestdata/0000-06-12.0.config | Bin tests/virpcitestdata/0000-06-12.1.config | Bin tests/virpcitestdata/0000-06-12.2.config | Bin tests/virpcitestdata/0005-90-01.1.config | Bin tests/virpcitestdata/0005-90-01.2.config | Bin tests/virpcitestdata/0005-90-01.3.config | Bin tests/virprocessmock.c | 28 + 80 files changed, 2463 insertions(+), 400 deletions(-) create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-multifunction-hostdev-pci-2.xml create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-multifunction-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+multifunction-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+multifunction-hostdev-pci-2.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+multifunction-hostdev-pci.xml create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-multifunction.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-no-primary-function.xml create mode 100644 tests/qemuxml2argvdata/hostdev-pci-validate.args create mode 100644 tests/qemuxml2argvdata/hostdev-pci-validate.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml create mode 100644 tests/virpcitestdata/0000-06-12.0.config create mode 100644 tests/virpcitestdata/0000-06-12.1.config create mode 100644 tests/virpcitestdata/0000-06-12.2.config create mode 100644 tests/virpcitestdata/0005-90-01.3.config create mode 100644 tests/virprocessmock.c -- Signature

4 39

[libvirt] [PATCH] docs: Fix apibuild.py syntax
by John Ferlan 15 Mar '18

15 Mar '18

Commit id '477502de3' altered the entry to add one too many closing parenthesis ')' and that propagated into commit id '9176b42bd'. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as a build breaker: GEN news.html File "./apibuild.py", line 481 line.split()))) ^ SyntaxError: invalid syntax docs/apibuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index ba359c98c..67b7eed1e 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -478,7 +478,7 @@ class CLexer: if line[0] == '#': self.tokens = list(map((lambda x: ('preproc', x)), - line.split()))) + line.split())) # We might have whitespace between the '#' and preproc # macro name, so instead of having a single token element -- 2.13.6

1 0

[libvirt] [PATCH v2 0/8] Introduce partial Python 3 support
by Andrea Bolognani 15 Mar '18

15 Mar '18

This series takes care of all the trivial stuff, paving the way for someone with good Python knowledge to jump in and finish porting. Changes since [v1]: * the build system no longer needs tweaks; * patches are organized by type of change for easier review. [v1] https://www.redhat.com/archives/libvir-list/2018-March/msg00687.html Andrea Bolognani (8): python3: Use the print() function python3: Use the repr() function python3: Use the 'in' keyword python3: Remove uses of string.*() functions python3: Call list() explicitly as needed python3: Replace keys() + sort() with sorted() python3: Open files in text instead of binary mode python3: Fix sort function docs/apibuild.py | 372 ++++++++++++++++++------------------- src/esx/esx_vi_generator.py | 27 ++- src/hyperv/hyperv_wmi_generator.py | 17 +- 3 files changed, 200 insertions(+), 216 deletions(-) -- 2.14.3

2 18

[libvirt] [PATCH] travis: Don't install xz on macOS
by Andrea Bolognani 15 Mar '18

15 Mar '18

It's already being dragged in by Python. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1f09f9cad..d071c98634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: - brew update - brew unlink python - brew upgrade - - brew install rpcgen yajl xz + - brew install rpcgen yajl script: # We can't run make distcheck/syntax-check because they # fail on macOS, but doing 'install' and 'dist' gives us -- 2.14.3

2 1

[libvirt] [PATCH] rpm: depend on python2, not bare python
by Daniel P. Berrangé 15 Mar '18

15 Mar '18

Fedora requires packages to depend on "python2" RPM, not the unversioned "python" name. Fortunately even though RHEL-6 ships a "python" RPM, it has a virtual Provides for the "python2" name, so we don't need to conditionalize this. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 2 +- mingw-libvirt.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8e9836ebbd..bc8257f34b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -305,7 +305,7 @@ BuildRequires: perl-interpreter %else BuildRequires: perl %endif -BuildRequires: python +BuildRequires: python2 %if %{with_systemd} BuildRequires: systemd-units %endif diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dc18d055ba..5e12bb1cae 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -61,7 +61,7 @@ BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext BuildRequires: libxslt -BuildRequires: python +BuildRequires: python2 %if 0%{?fedora} >= 27 BuildRequires: perl-interpreter %else -- 2.14.3

2 1

[libvirt] [PATCH 0/2] travis: fix macOS build
by Daniel P. Berrangé 15 Mar '18

15 Mar '18

You can see the "working" build here: https://travis-ci.org/berrange/libvirt/builds/353816421 Yeah it still failed, but it got past the brew bit that was failing before, and now fails for genuine code problems :-) Daniel P. Berrangé (2): travis: move macOS before_install tasks into osx matrix entry travis: unlink python package before upgrading brew packages .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.14.3

2 5

[libvirt] [PATCH] conf: nodedev: Update capabilities from within virNodeDeviceObjHasCap
by Erik Skultety 15 Mar '18

15 Mar '18

Commit d18feadc0c put this into virNodeDeviceMatch, but this should have rather been part of virNodeDeviceObjHasCap from the beginning, since virNodeDeviceObjHasCap is the last helper to be called (in the calltree) whereas virNodeDeviceMatch is called from a single place only - virNodeDeviceObjListExportCallback. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- src/conf/virnodedeviceobj.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index ad0f27ee4..0417664ad 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -644,6 +644,10 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj, { virNodeDevCapsDefPtr cap = NULL; + /* Refresh the capabilities first, e.g. due to a driver change */ + if (virNodeDeviceUpdateCaps(obj->def) < 0) + return false; + for (cap = obj->def->caps; cap; cap = cap->next) { if (type == cap->data.type) return true; @@ -811,10 +815,6 @@ static bool virNodeDeviceMatch(virNodeDeviceObjPtr obj, unsigned int flags) { - /* Refresh the capabilities first, e.g. due to a driver change */ - if (virNodeDeviceUpdateCaps(obj->def) < 0) - return false; - /* filter by cap type */ if (flags & VIR_CONNECT_LIST_NODE_DEVICES_FILTERS_CAP) { if (!(MATCH(SYSTEM) || -- 2.13.6

2 3

[libvirt] [PATCH] travis: Temporarily disable 'brew upgrade'
by Andrea Bolognani 15 Mar '18

15 Mar '18

There are a lot of changes happening in the homebrew ecosystem around Python, and as a consequence 'brew upgrade' hasn't been able to complete successfully for several days. Temporarily disable upgrading the system before building: this will need to be reverted once the upgrade issues have been sorted out. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 79f30f3090..c891ef419c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,7 +100,7 @@ env: - VIR_TEST_DEBUG=1 before_install: - - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew upgrade && brew install rpcgen yajl xz && brew link --force python@2; fi + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update && brew install rpcgen yajl xz && brew link --force python@2; fi before_script: - ./autogen.sh --prefix=$(pwd)/install-root -- 2.14.3

2 1

[libvirt] libvirt build failure with --disable-shared
by Rahul Sharma 15 Mar '18

15 Mar '18

Hi, I am facing an error with libvirt build where it fails if I try to disable shared libraries. Though I opened up the issue on gitlab, not sure if that was the right place to open one. Kindly do let me know if this should be opened up at some other place. Build failure with libvirt-4.1.0 using the command: CFLAGS="-fPIC" ./configure --enable-static --disable-shared --prefix=/home/ubuntu/libvirt-4.1.0/out https://gitlab.com/libvirt/libvirt/issues/1 - Rahul

3 2

[libvirt] [jenkins-ci PATCH] guests: Stop installing polkit-devel
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of libvirt commit 9cd42e725f42 only the runtime package is needed, even during build. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- guests/vars/mappings.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index e3781b9..190013e 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -546,9 +546,8 @@ mappings: Ubuntu12: pkg-config polkit: + default: polkit deb: policykit-1 - pkg: polkit - rpm: polkit-devel python2: default: python -- 2.14.3

2 1

[libvirt] [PATCH v2] spec: Drop polkit-devel from BuildRequires
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of 2499d1a09508 we don't link against libpolkit anymore, so we only need the polkit package to be available during build. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5e05d706f8..8e9836ebbd 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -358,11 +358,9 @@ BuildRequires: ebtables BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %if 0%{?fedora} || 0%{?rhel} >= 7 -# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck BuildRequires: polkit >= 0.112 -BuildRequires: polkit-devel >= 0.112 %else -BuildRequires: polkit-devel >= 0.93 +BuildRequires: polkit >= 0.93 %endif # For mount/umount in FS driver BuildRequires: util-linux -- 2.14.3

2 1

[libvirt] [PATCH] spec: Drop polkit from {,Build}Requires:
by Andrea Bolognani 15 Mar '18

15 Mar '18

As of 2499d1a09508 we don't link against libpolkit or look for the pkcheck command anymore, so these package relationships are no longer necessary and can be safely dropped. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 5e05d706f8..e70cc02dc8 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -357,13 +357,6 @@ BuildRequires: radvd BuildRequires: ebtables BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel -%if 0%{?fedora} || 0%{?rhel} >= 7 -# F22 polkit-devel doesn't pull in polkit anymore, which we need for pkcheck -BuildRequires: polkit >= 0.112 -BuildRequires: polkit-devel >= 0.112 -%else -BuildRequires: polkit-devel >= 0.93 -%endif # For mount/umount in FS driver BuildRequires: util-linux %if %{with_qemu} @@ -489,11 +482,6 @@ Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute Requires: avahi-libs -%if 0%{?fedora} || 0%{?rhel} >= 7 -Requires: polkit >= 0.112 -%else -Requires: polkit >= 0.93 -%endif %if %{with_cgconfig} Requires: libcgroup %endif -- 2.14.3

2 3

[libvirt] [PATCH v2] qemu: hotplug: Clean up memory backing files after failed memory hotplug
by Peter Krempa 15 Mar '18

15 Mar '18

Libvirt provides full path to the backing file since commit fec8f9c49afb479f6. This made qemu create the backend object but did not delete it. This was fixed for unplug case in 4d83a6722f but not in case of failure to hotplug the frontend. We'd leave the files behind which would make memory unusable in case of hugepages. https://bugzilla.redhat.com/show_bug.cgi?id=1553085 Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Differences to v1: - dropped mostly unhelpful comment - moved the call slightly earlier so that the error of the original hotplug operation is preserved src/qemu/qemu_hotplug.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e0a5300f08..49af4d4ff0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2212,6 +2212,10 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, ignore_value(qemuMonitorDelObject(priv->mon, objalias)); if (qemuDomainObjExitMonitor(driver, vm) < 0) mem = NULL; + + if (objAdded && mem) + ignore_value(qemuProcessDestroyMemoryBackingPath(driver, vm, mem)); + virErrorRestore(&orig_err); if (!mem) goto audit; -- 2.16.2

2 1

[libvirt] [PATCH 0/3] Couple of user alias fixes
by Michal Privoznik 15 Mar '18

15 Mar '18

The deeper into the rabbit hole we go the more I think it was a mistake to let users specify device aliases. Michal Privoznik (3): virDomainDeviceValidateAliasForHotplug: Use correct domain defintion conf: Check for user aliases duplicates only qemu: Forbid user aliases for USB controllers src/conf/domain_conf.c | 6 +++--- src/qemu/qemu_domain.c | 20 +++++++++++++++++++- tests/qemuxml2argvdata/user-aliases-usb.xml | 19 +++++++++++++++++++ tests/qemuxml2argvdata/user-aliases.xml | 1 - tests/qemuxml2argvtest.c | 1 + 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.xml -- 2.16.1

2 8

[libvirt] [PATCH 0/2] Improve qemuDomainObjPrivateXMLParseJob
by Jiri Denemark 15 Mar '18

15 Mar '18

This is a follow-up to the Peter's work pushed yesterday. Jiri Denemark (2): qemu: Parse all job related private XML in dedicated function qemu: Switch context for job related private XML parsing src/qemu/qemu_domain.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) -- 2.16.2

2 4

[libvirt] [PATCH] lockd: fix typo in virtlockd-admin.socket
by Jim Fehlig 15 Mar '18

15 Mar '18

Commit ce7ae55ea1 introduced a typo in virtlockd-admin socket file /usr/lib/systemd/system/virtlockd-admin.socket:7: Unknown lvalue 'Server' in section 'Socket' Change 'Server' to 'Service'. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/locking/virtlockd-admin.socket.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locking/virtlockd-admin.socket.in b/src/locking/virtlockd-admin.socket.in index 1fa0a3dc3..2a7500f3d 100644 --- a/src/locking/virtlockd-admin.socket.in +++ b/src/locking/virtlockd-admin.socket.in @@ -4,7 +4,7 @@ Before=libvirtd.service [Socket] ListenStream=@localstatedir@/run/libvirt/virtlockd-admin-sock -Server=virtlockd.service +Service=virtlockd.service [Install] WantedBy=sockets.target -- 2.16.2

2 1

[libvirt] [PATCH 00/10] conf: Make disk source parsing cleaner and reusable
by Peter Krempa 15 Mar '18

15 Mar '18

Fixup and cleanup the disk source parsing code and make it usable in other parts of the code by exporting it. Peter Krempa (10): conf: Remove unnecessary condition from virDomainDiskSourceFormatInternal conf: Refactor seclabel formatting in virDomainDiskSourceFormatInternal conf: Remove virDomainDiskSourceDefFormatSeclabel conf: Refactor formatting of startupPolicy in virDomainDiskSourceFormatInternal conf: disk: Separate virStorageSource formatting conf: Validate disk source configuration also for the backing store conf: Separate seclabel validation from parsing conf: Parse and validate disk source seclabels together with the source conf: Extract parsing of storage source related data conf: Add and export wrapper for parsing storage source XML src/conf/domain_conf.c | 402 ++++++++++++++++++++++++++++------------------- src/conf/domain_conf.h | 13 ++ src/libvirt_private.syms | 2 + 3 files changed, 254 insertions(+), 163 deletions(-) -- 2.16.2

2 14

[libvirt] [PATCH] daemonStreamHandleWriteData: Preserve error when aborting stream
by Michal Privoznik 14 Mar '18

14 Mar '18

The daemonStreamHandleWriteData() function is called whenever server side of stream is able to receive some data. Nevertheless, it calls virStreamSend() (to pass data down to virFDStream) and depending on its return value it may abort the stream. However, the functions it called when doing so are public APIs and as such reset any error set previously. Therefore, if there was any error in writing data to stream (i.e. repored in virStreamSend) it is reset before virNetServerProgramSendReplyError() can get to it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/remote/remote_daemon_stream.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 4dd3af9e0..532afd856 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -549,8 +549,9 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, } else if (ret == -2) { /* Blocking, so indicate we have more todo later */ return 1; - } else { + } else if (ret < 0) { virNetMessageError rerr; + virErrorPtr err = virSaveLastError(); memset(&rerr, 0, sizeof(rerr)); @@ -558,7 +559,10 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, stream->closed = true; virStreamEventRemoveCallback(stream->st); virStreamAbort(stream->st); - + if (err) { + virSetError(err); + virFreeError(err); + } return virNetServerProgramSendReplyError(stream->prog, client, msg, -- 2.16.1

2 1

[libvirt] [PATCH] virsysinfo: Use more virSkipSpacesBackwards()
by Michal Privoznik 14 Mar '18

14 Mar '18

Some fields reported by dmidecode have plenty of useless spaces (in fact some have nothing but spaces). To deal with this we have introduced virSkipSpacesBackwards() and use it in virSysinfoParseX86Processor() and virSysinfoParseX86Memory(). However, other functions (e.g. virSysinfoParseX86Chassis()) don't use it at all and thus we are reporting nonsense: <sysinfo type='smbios'> <chassis> <entry name='manufacturer'>FUJITSU</entry> <entry name='version'> </entry> <entry name='serial'> </entry> <entry name='asset'> </entry> <entry name='sku'>Default string</entry> </chassis> </sysinfo> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virsysinfo.c | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 43a4c8835..5795d90c7 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -644,7 +644,8 @@ static int virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoBIOSDefPtr def; if ((cur = strstr(base, "BIOS Information")) == NULL) @@ -657,24 +658,28 @@ virSysinfoParseBIOS(const char *base, virSysinfoBIOSDefPtr *bios) if ((cur = strstr(base, "Vendor: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->vendor, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Release Date: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->date, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "BIOS Revision: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->release, cur, eol - cur) < 0) goto cleanup; } @@ -697,7 +702,8 @@ static int virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoSystemDefPtr def; if ((cur = strstr(base, "System Information")) == NULL) @@ -710,42 +716,49 @@ virSysinfoParseX86System(const char *base, virSysinfoSystemDefPtr *sysdef) if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Product Name: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->product, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "UUID: ")) != NULL) { cur += 6; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->uuid, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "SKU Number: ")) != NULL) { cur += 12; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->sku, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Family: ")) != NULL) { cur += 8; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->family, cur, eol - cur) < 0) goto cleanup; } @@ -770,7 +783,8 @@ virSysinfoParseX86BaseBoard(const char *base, size_t *nbaseBoard) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoBaseBoardDefPtr boards = NULL; size_t nboards = 0; char *board_type = NULL; @@ -787,36 +801,42 @@ virSysinfoParseX86BaseBoard(const char *base, if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Product Name: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->product, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Asset Tag: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->asset, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Location In Chassis: ")) != NULL) { cur += 21; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->location, cur, eol - cur) < 0) goto cleanup; } @@ -848,7 +868,8 @@ virSysinfoParseX86Chassis(const char *base, virSysinfoChassisDefPtr *chassisdef) { int ret = -1; - const char *cur, *eol = NULL; + const char *cur; + char *eol = NULL; virSysinfoChassisDefPtr def; if ((cur = strstr(base, "Chassis Information")) == NULL) @@ -861,30 +882,35 @@ virSysinfoParseX86Chassis(const char *base, if ((cur = strstr(base, "Manufacturer: ")) != NULL) { cur += 14; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->manufacturer, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Version: ")) != NULL) { cur += 9; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->version, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Serial Number: ")) != NULL) { cur += 15; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->serial, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "Asset Tag: ")) != NULL) { cur += 11; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->asset, cur, eol - cur) < 0) goto cleanup; } if ((cur = strstr(base, "SKU Number: ")) != NULL) { cur += 12; eol = strchr(cur, '\n'); + virSkipSpacesBackwards(cur, &eol); if (eol && VIR_STRNDUP(def->sku, cur, eol - cur) < 0) goto cleanup; } -- 2.16.1

2 2

[libvirt] [PATCH] m4: Fix xenstore detection
by Andrea Bolognani 14 Mar '18

14 Mar '18

Commit 596fc3e3897e introduced the ability to detect xenstore using pkg-config for systems with Xen 4.9, but accidentally broke detection for all other systems. Fix the logic so that it works in all cases. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- m4/virt-driver-xen.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4 index 52d4f51626..1d0acfa363 100644 --- a/m4/virt-driver-xen.m4 +++ b/m4/virt-driver-xen.m4 @@ -42,7 +42,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "no" ; then PKG_CHECK_MODULES([XEN], [xenstore], [ - fail=0 with_xen=yes ], [ fail=1 @@ -52,8 +51,8 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ if test "$xen_path_provided" = "yes" || test "$fail" = 1 ; then CFLAGS="$CFLAGS $XEN_CFLAGS" LIBS="$LIBS $XEN_LIBS" + fail=0 AC_CHECK_LIB([xenstore], [xs_read], [ - fail=0 with_xen=yes XEN_LIBS="$XEN_LIBS -lxenstore" ],[ -- 2.14.3

2 1

[libvirt] libvirt cannot boot windows-uefi-guest with virtio disk
by Иван Иванов 14 Mar '18

14 Mar '18

I am using libvirt 3.6 version on Ubuntu 17.10 and create domain with command: virt-install --name dc02 --memory 1024,maxmemory=2048 --vcpus 1 --cpu host --boot uefi,hd,network --disk /var/lib/libvirt/images/dc02.qcow2,bus=virtio --network bridge=br.27,model=virtio --video=qxl --memballoon virtio --hvm --controller usb3 --machine=q35 --graphics spice,listen=192.168.69.108 Domain boot failed with BSOD message "Unaccesible boot device", but when i change virtio-drive to sata-drive, its successfuly boot ps -ef output for virtio-drive look like: libvirt+ 39726 1 45 19:59 ? 00:00:06 qemu-system-x86_64 -enable-kvm -name guest=dc02,debug-threads=on -S -object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain-11-dc02/master-key.aes -machine pc-q35-2.10,accel=kvm,usb=off,vmport=off,dump-guest-core=off -cpu SandyBridge,vme=on,ss=on,vmx=on,pcid=on,hypervisor=on,arat=on,tsc_adjust=on,xsaveopt=on,pdpe1gb=on -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on -drive file=/var/lib/libvirt/qemu/nvram/dc02_VARS.fd,if=pflash,format=raw,unit=1 -m 2048 -realtime mlock=off -smp 1,sockets=1,cores=1,threads=1 -uuid fab3a566-46ad-4b2c-9e65-26cb685af33a -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/domain-11-dc02/monitor.sock,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc,driftfix=slew -global kvm-pit.lost_tick_policy=delay -no-hpet -no-shutdown -global ICH9-LPC.disable_s3=1 -global ICH9-LPC.disable_s4=1 -boot strict=on -device pcie-root-port,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 -device i82801b11-bridge,id=pci.2,bus=pcie.0,addr=0x1e -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.2,addr=0x0 -device pcie-root-port,port=0x11,chassis=4,id=pci.4,bus=pcie.0,addr=0x2.0x1 -device pcie-root-port,port=0x12,chassis=5,id=pci.5,bus=pcie.0,addr=0x2.0x2 -device pcie-root-port,port=0x13,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x3 -device pcie-root-port,port=0x14,chassis=7,id=pci.7,bus=pcie.0,addr=0x2.0x4 -device pcie-root-port,port=0x15,chassis=8,id=pci.8,bus=pcie.0,addr=0x2.0x5 -device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 -device virtio-serial-pci,id=virtio-serial0,bus=pci.5,addr=0x0 -drive file=/var/lib/libvirt/images/dc02.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 -device virtio-blk-pci,scsi=off,bus=pci.6,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=29 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:16:88:b3,bus=pci.1,addr=0x0,bootindex=2 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -spice port=5900,addr=192.168.69.108,disable-ticketing,image-compression=off,seamless-migration=on -device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,vram64_size_mb=0,vgamem_mb=16,max_outputs=1,bus=pcie.0,addr=0x1 -device intel-hda,id=sound0,bus=pci.3,addr=0x1 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -chardev spicevmc,id=charredir0,name=usbredir -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=1 -chardev spicevmc,id=charredir1,name=usbredir -device usb-redir,chardev=charredir1,id=redir1,bus=usb.0,port=2 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x0 -msg timestamp=on But when i run this domain with qemu-system its succsessfuly boot and work. Cmd looks like: qemu-system-x86_64 -machine type=pc-q35-2.8 -accel kvm -cpu host \ -cdrom /var/lib/libvirt/images/virtio-win-0.1.141.iso \ --bios /usr/share/OVMF/OVMF_CODE.fd \ -m 2048 -smp 2 -drive file=/var/lib/libvirt/images/dc02.qcow2,index=0,media=disk,if=virtio -boot menu=on \ -spice addr=192.168.69.108,port=5910,disable-ticketing I cannot fugire out where i went wrong

2 1

[libvirt] [GSoC]: Help in setup
by Sukrit Bhatnagar 14 Mar '18

14 Mar '18

Hi, I am Sukrit, currently pursuing Masters in Computer Science and Engineering from Indian Institute of Technology Bombay, India. I am interested in applying for a few projects listed on the ideas page. But, I am not able to connect to IRC channel (missing key problem). Also, I am not able to run `autogen.sh` successfully from the git repo clone as there is some error related to gnulib git repo's URL. Can someone help me out please? Thanks, Sukrit Bhatnagar

6 6

[libvirt] [PATCH 00/11] Make some virsh.pod adjustments for vol-* commands
by John Ferlan 14 Mar '18

14 Mar '18

Been reviewing documentation lately - ran into the virsh vol-* commands and their "inconsistency" with the expected ordering of the command options. Also the commands were largely a mash of sentences without regard for any sort of readability. John Ferlan (11): virsh: Clean up formatting of the vol-create* commands virsh: Fix man page argument ordering for vol-clone command virsh: Fix man page argument ordering for vol-delete command virsh: Fix man page argument ordering for vol-upload command virsh: Fix man page argument ordering for vol-download command virsh: Fix man page argument ordering for vol-wipe command virsh: Fix man page argument ordering for vol-dumpxml command virsh: Fix man page argument ordering for vol-info command virsh: Clean up man page formatting for vol-list and vol-pool virsh: Fix man page argument ordering for vol-{path|name|key} commands tools: Clean up the vol-resize man page tools/virsh.pod | 238 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 168 insertions(+), 70 deletions(-) -- 2.13.6

2 12

[libvirt] [PATCH] qemu: avoid denial of service reading from QEMU guest agent (CVE-2018-1064)
by Daniel P. Berrangé 14 Mar '18

14 Mar '18

We read from the agent until seeing a \r\n pair to indicate a completed reply or event. To avoid memory denial-of-service though, we must have a size limit on amount of data we buffer. 10 MB is large enough that it ought to cope with normal agent replies, and small enough that we're not consuming unreasonable mem. This is identical to the flaw we had reading from the QEMU monitor as CVE-2018-5748, so rather embarrassing that we forgot to fix the agent code at the same time. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a security patch pre-reviewed via the libvirt-security list src/qemu/qemu_agent.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0f36054a61..89183c3f76 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -53,6 +53,15 @@ VIR_LOG_INIT("qemu.qemu_agent"); #define DEBUG_IO 0 #define DEBUG_RAW_IO 0 +/* We read from QEMU until seeing a \r\n pair to indicate a + * completed reply or event. To avoid memory denial-of-service + * though, we must have a size limit on amount of data we + * buffer. 10 MB is large enough that it ought to cope with + * normal QEMU replies, and small enough that we're not + * consuming unreasonable mem. + */ +#define QEMU_AGENT_MAX_RESPONSE (10 * 1024 * 1024) + /* When you are the first to uncomment this, * don't forget to uncomment the corresponding * part in qemuAgentIOProcessEvent as well. @@ -535,6 +544,12 @@ qemuAgentIORead(qemuAgentPtr mon) int ret = 0; if (avail < 1024) { + if (mon->bufferLength >= QEMU_AGENT_MAX_RESPONSE) { + virReportSystemError(ERANGE, + _("No complete agent response found in %d bytes"), + QEMU_AGENT_MAX_RESPONSE); + return -1; + } if (VIR_REALLOC_N(mon->buffer, mon->bufferLength + 1024) < 0) return -1; -- 2.14.3

1 0

[libvirt] [PATCH 0/5] Partially successful attempt at Python 3 compatibility
by Andrea Bolognani 14 Mar '18

14 Mar '18

We use Python in out build system: more specifically, we're stuck with Python 2 even though Python 3's been out for a decade and some major Linux distributions have gone Python 3-only recently. This series tries to solve the issue, but falls quite short. Maybe someone who actually knows Python should have tried instead of me? The good news is that, once the first two patches have been merged, anyone will be able to give it a shot by running PYTHON=$(which python3) ./autogen.sh or similar. Let's get the ball rolling! Andrea Bolognani (5): NEWS: Move generation to the docs/ directory docs: Call reformat-news.py with $(PYTHON) esx: Port esx_vi_generator.py to Python 3 hyperv: Port hyperv_wmi_generator.py to Python 3 docs: Port apibuild.py to Python 3 .gitignore | 1 + Makefile.am | 24 +-- docs/Makefile.am | 24 +++ docs/apibuild.py | 379 ++++++++++++++++++------------------- src/esx/esx_vi_generator.py | 30 ++- src/hyperv/hyperv_wmi_generator.py | 17 +- 6 files changed, 233 insertions(+), 242 deletions(-) -- 2.14.3

2 10

[libvirt] [PATCH 0/2] qemu: Remove memory backing files on failed memory hotplug
by Peter Krempa 14 Mar '18

14 Mar '18

see 2/2 Peter Krempa (2): REPRODUCER -- DO NOT PUSH qemu: hotplug: Clean up memory backing files after failed memory hotplug dom.xml | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ mem.xml | 6 +++ src/qemu/qemu_hotplug.c | 7 +++ 3 files changed, 123 insertions(+) create mode 100644 dom.xml create mode 100644 mem.xml -- 2.16.2

3 6

[libvirt] [PATCH] m4: use pkgconfig to detect xenstore
by Olaf Hering 14 Mar '18

14 Mar '18

Since Xen 4.9 a pkgconfig file exists to gather info about building against libxenstore.so. Use it if available. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- m4/virt-driver-xen.m4 | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/m4/virt-driver-xen.m4 b/m4/virt-driver-xen.m4 index 2a26863ca..52d4f5162 100644 --- a/m4/virt-driver-xen.m4 +++ b/m4/virt-driver-xen.m4 @@ -27,25 +27,42 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_XEN], [ old_CFLAGS="$CFLAGS" XEN_LIBS="" XEN_CFLAGS="" + fail=0 dnl search for the Xen store library + dnl Either use the provided path, or make use of pkgconfig + dnl Xen versions prior 4.9 had no pkgconfig file if test "$with_xen" != "no" ; then + xen_path_provided="no" if test "$with_xen" != "yes" && test "$with_xen" != "check" ; then XEN_CFLAGS="-I$with_xen/include" XEN_LIBS="-L$with_xen/lib64 -L$with_xen/lib" + xen_path_provided="yes" + fi + + if test "$xen_path_provided" = "no" ; then + PKG_CHECK_MODULES([XEN], [xenstore], [ + fail=0 + with_xen=yes + ], [ + fail=1 + ]) + fi + dnl manual check if either path was provided or pkgconfig does not exist + if test "$xen_path_provided" = "yes" || test "$fail" = 1 ; then + CFLAGS="$CFLAGS $XEN_CFLAGS" + LIBS="$LIBS $XEN_LIBS" + AC_CHECK_LIB([xenstore], [xs_read], [ + fail=0 + with_xen=yes + XEN_LIBS="$XEN_LIBS -lxenstore" + ],[ + if test "$with_xen" = "yes"; then + fail=1 + fi + with_xen=no + ]) fi - fail=0 - CFLAGS="$CFLAGS $XEN_CFLAGS" - LIBS="$LIBS $XEN_LIBS" - AC_CHECK_LIB([xenstore], [xs_read], [ - with_xen=yes - XEN_LIBS="$XEN_LIBS -lxenstore" - ],[ - if test "$with_xen" = "yes"; then - fail=1 - fi - with_xen=no - ]) fi if test "$with_xen" != "no" ; then

2 2

[libvirt] [PATCH] bugfix: add lock in ClientClose to avoid data race
by xinhua.Cao 13 Mar '18

13 Mar '18

From: l00425170 <liujunjie23(a)huawei.com> When libvirt client registers callback function, remoteDispatchConnectDomainEventCallbackRegisterAny is called, then virInsertElementsN will be called to add new callback for struct daemonClientPrivate *priv. But at the same time, if the corresponding socket is closed (one way is to kill the client process), the close callback remoteClientCloseFunc is called, then remoteFreePrivCallbacks(priv) is called to free priv. So there exists data race to cause libvirtd coredump. More details, in add callback, when memset for ptrptr (that is priv) is done in virExpandN at the process of virInsertElementsN. At this time point, priv can be free to be 0x0 when close client. So when the procedure goes to memcpy in virInsertElementsN, the libvirtd will coredump. And the stack are as follows: Thread 1 (Thread 0x7feadf7fe700 (LWP 8978)): #0 0x00007feb7b77f314 in __memcpy_ssse3_back() from /usr/lib64/libc.so.6 #1 0x00007feb7e769a82 in memcpy (__len=8, __src=0x7feadf7fdb58, __dest=<optimized out>) at /usr/include/bits/string3.h:51 #2 virInsertElementsN (ptrptr=ptrptr@entry=0x558e9c36fae8, size=size@entry=8, at=<optimized out>, at@entry=18446744073709551615, countptr=countptr@entry=0x558e9c36faf0, add=add@entry=1, newelems=newelems@entry=0x7feadf7fdb58, clearOriginal=clearOriginal@entry=true, inPlace=inPlace@entry=false, report=report@entry=true, domcode=domcode@entry=7, filename=filename@entry=0x558e9af16107 "remote.c", funcname=funcname@entry=0x558e9af24600 <__FUNCTION__.48097> "remoteDispatchConnectDomainEventCallbackRegisterAny", linenr=linenr@entry=4424) at util/viralloc.c:454 #3 0x0000558e9aed7001 in remoteDispatchConnectDomainEventCallbackRegisterAny (server=<optimized out>, msg=<optimized out>, ret=0x7feab805e6f0, args=0x7feab806aa40, rerr=0x7feadf7fdc90, client=<optimized out>) at remote.c:4422 #4 remoteDispatchConnectDomainEventCallbackRegisterAnyHelper (server=<optimized out>, client=<optimized out>, msg=<optimized out>, rerr=0x7feadf7fdc90, args=0x7feab806aa40, ret=0x7feab805e6f0) at remote_dispatch.h:424 #5 0x0000558e9af0ca48 in virNetServerProgramDispatchCall (msg=0x558e9c3925c0, client=0x558e9c36f970, server=0x558e9c351570, prog=0x558e9c367d50) at rpc/virnetserverprogram.c:474 #6 virNetServerProgramDispatch (prog=0x558e9c367d50, server=server@entry=0x558e9c351570, client=0x558e9c36f970, msg=0x558e9c3925c0) at rpc/virnetserverprogram.c:311 #7 0x0000558e9af085ed in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x558e9c351570) at rpc/virnetserver.c:148 #8 virNetServerHandleJob (jobOpaque=<optimized out>, opaque=0x558e9c351570) at rpc/virnetserver.c:169 #9 0x00007feb7e7f1861 in virThreadPoolWorker (opaque=opaque@entry=0x558e9c36b5f0) at util/virthreadpool.c:167 #10 0x00007feb7e7f0b78 in virThreadHelper (data=<optimized out>) at util/virthread.c:219 #11 0x00007feb7b9fcdc5 in start_thread () from /usr/lib64/libpthread.so.0 #12 0x00007feb7b72b75d in clone () from /usr/lib64/libc.so.6 Signed-off-by: l00425170 <liujunjie23(a)huawei.com> --- src/remote/remote_daemon.h | 2 ++ src/remote/remote_daemon_dispatch.c | 46 ++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 4467f71..8accafc 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -76,6 +76,8 @@ struct daemonClientPrivate { virConnectPtr conn; daemonClientStreamPtr streams; + + bool clientClosed; }; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c index fdb0a36..59e69e6 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1752,8 +1752,12 @@ static void remoteClientCloseFunc(virNetServerClientPtr client) daemonRemoveAllClientStreams(priv->streams); /* Deregister event delivery callback */ - if (priv->conn) + if (priv->conn) { + virMutexLock(&priv->lock); remoteClientFreePrivateCallbacks(priv); + priv->clientClosed = true; + virMutexUnlock(&priv->lock); + } } @@ -3889,6 +3893,11 @@ remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_UNUSED virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* If we call register first, we could append a complete callback * to our array, but on OOM append failure, we'd have to then hope * deregister works to undo our register. So instead we append an @@ -4116,6 +4125,11 @@ remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + /* We intentionally do not use VIR_DOMAIN_EVENT_ID_LAST here; any * new domain events added after this point should only use the * modern callback style of RPC. */ @@ -4192,6 +4206,11 @@ remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server ATTRI virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; @@ -5702,6 +5721,11 @@ remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIBUTE_UN virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->net && !(net = get_nonnull_network(priv->conn, *args->net))) goto cleanup; @@ -5824,6 +5848,11 @@ remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server ATTRIBUT virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->pool && !(pool = get_nonnull_storage_pool(priv->conn, *args->pool))) goto cleanup; @@ -5945,6 +5974,11 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATTRIBUTE virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dev && !(dev = get_nonnull_node_device(priv->conn, *args->dev))) goto cleanup; @@ -6066,6 +6100,11 @@ remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBUTE_UNU virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->secret && !(secret = get_nonnull_secret(priv->conn, *args->secret))) goto cleanup; @@ -6188,6 +6227,11 @@ qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRIBUTE_U virMutexLock(&priv->lock); + if (priv->clientClosed) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("connection want close")); + goto cleanup; + } + if (args->dom && !(dom = get_nonnull_domain(priv->conn, *args->dom))) goto cleanup; -- 2.13.3.windows.1

2 1

[libvirt] [PATCH] qemu: hotplug: fail when net device detach times out
by Jonathan Davies 13 Mar '18

13 Mar '18

qemuDomainDetachNetDevice should not treat a timeout in a call to qemuDomainWaitForDeviceRemoval as success. Instead, it should treat it as failure -- this is the intention behind having a timeout. If qemuDomainWaitForDeviceRemoval times out, it returns 0. In this instance, if qemuDomainDetachNetDevice returns 0, virsh detach-interface reports: Interface detached successfully with a zero exit status. But with a negative return value from qemuDomainDetachNetDevice, virsh detach-interface reports: error: Failed to detach interface error: An error occurred, but the cause is unknown with a non-zero exit status, which is more appropriate. Signed-off-by: Jonathan Davies <jonathan.davies(a)nutanix.com> --- src/qemu/qemu_hotplug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 4be0f546c..d9a2f2d4d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -5082,8 +5082,13 @@ qemuDomainDetachNetDevice(virQEMUDriverPtr driver, if (qemuDomainObjExitMonitor(driver, vm) < 0) goto cleanup; - if ((ret = qemuDomainWaitForDeviceRemoval(vm)) == 1) + ret = qemuDomainWaitForDeviceRemoval(vm); + if (ret == 1) { ret = qemuDomainRemoveNetDevice(driver, vm, detach); + } else if (ret == 0) { + VIR_WARN("Detach of device %s timed out; treating as a failure", detach->ifname); + ret = -1; + } cleanup: qemuDomainResetDeviceRemoval(vm); -- 2.14.1

5 7

[libvirt] [PATCH security-notice 0/4] Add missing security notices
by Daniel P. Berrangé 13 Mar '18

13 Mar '18

This provides the security notices we've had so far in 2018 and a script to make future ones easier to create. Daniel P. Berrangé (4): LSN-2018-0001 / CVE-2017-5715 - Spectre variant 2 branch target injection LSN-2018-0002 / CVE-2018-5748 - QEMU monitor denial of service LSN-2018-0003 / CVE-2018-6764 - Insecure usage of NSS modules during container startup Add a script for generating a list of vulnerable tags & branches notices/2018/0001.xml | 276 ++++++++++++++++++++++++++++++++++++++ notices/2018/0002.xml | 274 +++++++++++++++++++++++++++++++++++++ notices/2018/0003.xml | 269 +++++++++++++++++++++++++++++++++++++ scripts/report-vulnerable-tags.pl | 108 +++++++++++++++ 4 files changed, 927 insertions(+) create mode 100644 notices/2018/0001.xml create mode 100644 notices/2018/0002.xml create mode 100644 notices/2018/0003.xml create mode 100644 scripts/report-vulnerable-tags.pl -- 2.14.3

1 4

[libvirt] [PATCH] tests: Fix path to status XML test directory in makefile
by Peter Krempa 13 Mar '18

13 Mar '18

Commit 99e30acfdce added 'qemustatusxml2xmloutdata' to EXTRA_DIST but the directory added in the commit is called 'qemustatusxml2xmldata' Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the I-didn't-run-distcheck-when-messing-with-files-in-the-tree-and-broke-the-build-rule. tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 1f60ee0393..11a9b904ed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -128,7 +128,7 @@ EXTRA_DIST = \ qemumonitorjsondata \ qemuxml2argvdata \ qemuxml2xmloutdata \ - qemustatusxml2xmloutdata \ + qemustatusxml2xmldata \ qemumemlockdata \ secretxml2xmlin \ securityselinuxhelperdata \ -- 2.16.2

1 0

[libvirt] [PATCH] tests: bhyvexml2xml: Fix call to testCompareDomXML2XMLFiles
by Peter Krempa 13 Mar '18

13 Mar '18

Commit 1b28038300b forgot to fix the arguments for this one caller. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- Pushed under the build-breaker rule. tests/bhyvexml2xmltest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/bhyvexml2xmltest.c b/tests/bhyvexml2xmltest.c index e483dac630..4d9c1681db 100644 --- a/tests/bhyvexml2xmltest.c +++ b/tests/bhyvexml2xmltest.c @@ -39,7 +39,7 @@ testCompareXMLToXMLHelper(const void *data) ret = testCompareDomXML2XMLFiles(driver.caps, driver.xmlopt, xml_in, is_different ? xml_out : xml_in, - false, NULL, NULL, 0, + false, 0, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS); if ((ret != 0) && (info->flags & FLAG_EXPECT_FAILURE)) { -- 2.16.2

1 0

[libvirt] [PATCH] build: Add srpm make target
by Jiri Denemark 13 Mar '18

13 Mar '18

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0d46c16c22..81c7f52d9c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,9 @@ EXTRA_DIST += \ rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.xz) +srpm: clean + @(unset CDPATH ; $(MAKE) dist && rpmbuild -ts $(distdir).tar.xz) + check-local: all tests check-access: -- 2.16.2

2 1

[libvirt] [PATCH 0/2] Two small memleak fixes
by Michal Privoznik 13 Mar '18

13 Mar '18

*** BLURB HERE *** Michal Privoznik (2): virSysinfoParseX86Chassis: Store asset tag into correct pointer virSecurityDACChownListFree: Don't leak list->items array src/security/security_dac.c | 1 + src/util/virsysinfo.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- 2.16.1

2 4

[libvirt] [PATCH] conf: allow more user friendly names for disk formats
by Daniel P. Berrangé 13 Mar '18

13 Mar '18

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/conf/domain_conf.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04a6ee77af..007b73a84d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9152,6 +9152,12 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def, if (STREQ(tmp, "aio")) { /* Xen back-compat */ def->src->format = VIR_STORAGE_FILE_RAW; + } else if (STREQ(tmp, "🐄")) { + def->src->format = VIR_STORAGE_FILE_COW; + } else if (STREQ(tmp, "q🐄")) { + def->src->format = VIR_STORAGE_FILE_QCOW; + } else if (STREQ(tmp, "q🐄2")) { + def->src->format = VIR_STORAGE_FILE_QCOW2; } else { if ((def->src->format = virStorageFileFormatTypeFromString(tmp)) <= 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 2.14.3

3 2

[libvirt] [PATCH] qemuAssignDeviceInputAlias: Be tolerant to pre-existent alias
by Michal Privoznik 13 Mar '18

13 Mar '18

This is missing in 6bc4a371cf and therefore we are effectively overwriting user provided aliases for <input/> devices. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_alias.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ae30f7df8..d0ca15bae 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -513,6 +513,9 @@ qemuAssignDeviceInputAlias(virDomainDefPtr def, virDomainInputDefPtr input, int idx) { + if (input->info.alias) + return 0; + if (idx == -1) { int thisidx; size_t i; -- 2.16.1

2 1

[libvirt] [dbus PATCH 00/18] rewrite to use libdbus and some other fixes
by Pavel Hrdina 13 Mar '18

13 Mar '18

The first 15 patches fixes some issues and bugs and cleanups the code. Patch 16 introduces support for libdbus and a lot of helper functions. Patch 17 switches the code to use libdbus instead of sd-bus and drops all sd-bus related code. Patch 18 introduces threading so every message is processed by separate thread. Pavel Hrdina (18): util: rename VIR_ATTR_UNUSED util: there is no need to mark cleanup functions as inline util: introduce VIRT_DBUS_ERROR_INTERFACE connect: introduce VIRT_DBUS_CONNECT_INTERFACE domain: introduce VIRT_DBUS_DOMAIN_INTERFACE events: fix signal message for TrayChange event events: fix function names for TrayChange and DiskChange events main: error out if signal handler is not registered main: fix error message spec: don't use hard-coded system_user maint: fix coding style maint: cleanup includes domain: ensure connection to libvirt connect: parse message arguments as first thing domain: create a helper function to get a domain object introduce support for libdbus library switch from sd-bus to libdbus main: introduce threads to process the dbus messages README | 2 +- configure.ac | 16 +- data/Makefile.am | 7 + data/org.libvirt.Connect.xml | 56 ++ data/org.libvirt.Domain.xml | 51 ++ libvirt-dbus.spec.in | 16 +- src/Makefile.am | 15 +- src/connect.c | 240 ++++----- src/connect.h | 44 +- src/dbus.c | 1226 ++++++++++++++++++++++++++++++++++++++++++ src/dbus.h | 158 ++++++ src/domain.c | 642 ++++++++++------------ src/domain.h | 5 +- src/events.c | 150 +++--- src/events.h | 3 - src/main.c | 208 ++++--- src/util.c | 310 ++++++++--- src/util.h | 82 ++- test/Makefile.am | 3 +- test/travis-run | 2 +- 20 files changed, 2446 insertions(+), 790 deletions(-) create mode 100644 data/org.libvirt.Connect.xml create mode 100644 data/org.libvirt.Domain.xml create mode 100644 src/dbus.c create mode 100644 src/dbus.h -- 2.14.3

2 37

[libvirt] [PATCH v2 00/10] Add proper testing of qemu status XML files
by Peter Krempa 13 Mar '18

13 Mar '18

Changes to v1: - added tests specifically for testing format probing (also formating of argv) - removed format probing from snapshot tests - added a synthetic test for <lockstate> - added <namespaces> to the 'modern' test (note that allowReboot is tested in one of the old tests which were preserved) This version also saves space by using symlinks in place of the output XML files since they are identical to the input ones in all cases added in this tests. Peter Krempa (10): tests: qemuxml2xml: Rename testInfoFree to testInfoClear tests: qemu: Explicitly add tests with format probing allowed tests: qemuxml2xml: Remove testing with allowed format detection tests: domainsnapshotxml2xml: Remove testing with allowed format detection tests: qemuxml2xml: Add proper domain status XML testing tests: qemuxml2xml: Add synthetic test for <lockstate> in status XML tests: qemuxml2xml: Remove fake status XML testing tests: util: Remove callback from testCompareDomXML2XMLFiles tests: qemuxml2xml: Add modern example of status XML to the test tests: qemuxml2xml: Add status XML with outgoing migration with NBD tests/Makefile.am | 1 + .../disk_snapshot_redefine.xml | 6 + .../external_vm_redefine.xml | 1 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmltest.c | 3 - tests/genericxml2xmltest.c | 2 +- tests/lxcxml2xmltest.c | 2 +- tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 97 +++++ .../qemustatusxml2xmldata/blockjob-mirror-out.xml | 1 + .../qemustatusxml2xmldata/migration-out-nbd-in.xml | 449 +++++++++++++++++++++ .../migration-out-nbd-out.xml | 1 + tests/qemustatusxml2xmldata/modern-in.xml | 448 ++++++++++++++++++++ tests/qemustatusxml2xmldata/modern-out.xml | 1 + tests/qemustatusxml2xmldata/vcpus-multi-in.xml | 343 ++++++++++++++++ tests/qemustatusxml2xmldata/vcpus-multi-out.xml | 1 + .../qemuxml2argvdata/disk-drive-detect-zeroes.xml | 2 +- .../qemuxml2argvdata/disk-many-format-probing.args | 29 ++ .../qemuxml2argvdata/disk-many-format-probing.xml | 48 +++ tests/qemuxml2argvdata/hugepages-memaccess.xml | 1 + tests/qemuxml2argvdata/hugepages-memaccess2.xml | 1 + tests/qemuxml2argvdata/hugepages-pages4.xml | 1 + tests/qemuxml2argvdata/hugepages-pages5.xml | 1 + tests/qemuxml2argvdata/hugepages-pages6.xml | 1 + .../memory-hotplug-nvdimm-access.xml | 1 + .../memory-hotplug-nvdimm-label.xml | 1 + tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml | 1 + .../serial-tcp-tlsx509-chardev-notls.xml | 1 + tests/qemuxml2argvtest.c | 6 + .../aarch64-aavmf-virtio-mmio.xml | 1 + .../aarch64-virtio-pci-default.xml | 1 + .../aarch64-virtio-pci-manual-addresses.xml | 1 + tests/qemuxml2xmloutdata/autoindex.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-auto.xml | 1 + tests/qemuxml2xmloutdata/balloon-device-period.xml | 1 + .../bios-nvram-os-interleave.xml | 1 + tests/qemuxml2xmloutdata/bios-nvram.xml | 1 + tests/qemuxml2xmloutdata/blkiotune-device.xml | 1 + tests/qemuxml2xmloutdata/blkiotune.xml | 1 + .../boot-menu-disable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-menu-disable.xml | 1 + .../boot-menu-enable-with-timeout.xml | 1 + tests/qemuxml2xmloutdata/boot-multi.xml | 1 + tests/qemuxml2xmloutdata/boot-order.xml | 2 + tests/qemuxml2xmloutdata/channel-guestfwd.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio-auto.xml | 1 + .../channel-virtio-state-active.xml | 1 + .../channel-virtio-state-inactive.xml | 1 + tests/qemuxml2xmloutdata/channel-virtio.xml | 1 + tests/qemuxml2xmloutdata/clock-catchup.xml | 1 + tests/qemuxml2xmloutdata/console-compat-auto.xml | 1 + tests/qemuxml2xmloutdata/console-virtio-many.xml | 1 + tests/qemuxml2xmloutdata/console-virtio.xml | 1 + .../cpu-host-passthrough-features.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreads.xml | 1 + .../cputune-iothreadsched-zeropriority.xml | 1 + tests/qemuxml2xmloutdata/cputune-iothreadsched.xml | 1 + tests/qemuxml2xmloutdata/cputune-zero-shares.xml | 1 + tests/qemuxml2xmloutdata/cputune.xml | 1 + .../qemuxml2xmloutdata/disk-drive-copy-on-read.xml | 2 +- tests/qemuxml2xmloutdata/disk-drive-discard.xml | 2 +- .../disk-many-format-probing.xml | 52 +++ tests/qemuxml2xmloutdata/disk-mirror-active.xml | 5 + tests/qemuxml2xmloutdata/disk-mirror-inactive.xml | 4 + .../disk-mirror-old-inactive.xml | 4 + tests/qemuxml2xmloutdata/disk-mirror-old.xml | 7 +- tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-device.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 2 + .../disk-scsi-lun-passthrough-sgio.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-megasas.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-mptsas1068.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-virtio-scsi.xml | 2 + tests/qemuxml2xmloutdata/disk-scsi-vscsi.xml | 2 + tests/qemuxml2xmloutdata/disk-serial.xml | 3 + tests/qemuxml2xmloutdata/disk-source-pool-mode.xml | 4 + tests/qemuxml2xmloutdata/disk-source-pool.xml | 2 + tests/qemuxml2xmloutdata/disk-usb-device.xml | 2 + .../disk-virtio-scsi-cmd_per_lun.xml | 1 + .../disk-virtio-scsi-ioeventfd.xml | 1 + .../disk-virtio-scsi-max_sectors.xml | 1 + .../disk-virtio-scsi-num_queues.xml | 1 + .../qemuxml2xmloutdata/graphics-listen-network.xml | 1 + .../graphics-listen-network2.xml | 1 + .../graphics-spice-compression.xml | 1 + .../qemuxml2xmloutdata/graphics-spice-qxl-vga.xml | 1 + tests/qemuxml2xmloutdata/graphics-spice.xml | 1 + .../hostdev-scsi-autogen-address.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-large-unit.xml | 1 + .../hostdev-scsi-lsi-iscsi-auth.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-lsi-iscsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-readonly.xml | 1 + tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml | 1 + .../qemuxml2xmloutdata/hostdev-scsi-shareable.xml | 1 + .../hostdev-scsi-vhost-scsi-ccw.xml | 1 + .../hostdev-scsi-vhost-scsi-pci.xml | 1 + .../hostdev-scsi-virtio-iscsi-auth.xml | 1 + .../hostdev-scsi-virtio-iscsi.xml | 1 + .../hostdev-scsi-virtio-scsi.xml | 1 + tests/qemuxml2xmloutdata/hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages2.xml | 1 + tests/qemuxml2xmloutdata/hugepages-pages3.xml | 1 + tests/qemuxml2xmloutdata/hugepages-shared.xml | 1 + tests/qemuxml2xmloutdata/hugepages.xml | 1 + tests/qemuxml2xmloutdata/lease.xml | 2 + .../machine-loadparm-multiple-disks-nets-s390.xml | 2 + tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml | 1 + tests/qemuxml2xmloutdata/memory-hotplug.xml | 1 + tests/qemuxml2xmloutdata/memtune-unlimited.xml | 1 + tests/qemuxml2xmloutdata/memtune.xml | 1 + tests/qemuxml2xmloutdata/metadata-duplicate.xml | 1 + tests/qemuxml2xmloutdata/metadata.xml | 1 + tests/qemuxml2xmloutdata/minimal.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev-vfio.xml | 1 + tests/qemuxml2xmloutdata/net-hostdev.xml | 1 + tests/qemuxml2xmloutdata/net-midonet.xml | 1 + tests/qemuxml2xmloutdata/net-openvswitch.xml | 1 + tests/qemuxml2xmloutdata/net-udp.xml | 1 + tests/qemuxml2xmloutdata/net-virtio-device.xml | 1 + .../net-virtio-disable-offloads.xml | 1 + .../net-virtio-network-portgroup.xml | 1 + .../net-virtio-rxtxqueuesize.xml | 1 + .../numad-auto-memory-vcpu-cpuset.xml | 1 + ...ad-auto-memory-vcpu-no-cpuset-and-placement.xml | 1 + .../numad-auto-vcpu-no-numatune.xml | 1 + .../numad-static-vcpu-no-numatune.xml | 1 + tests/qemuxml2xmloutdata/panic-isa.xml | 1 + tests/qemuxml2xmloutdata/panic-no-address.xml | 1 + tests/qemuxml2xmloutdata/panic.xml | 1 + tests/qemuxml2xmloutdata/pci-rom.xml | 1 + .../qemuxml2xmloutdata/pci-serial-dev-chardev.xml | 1 + tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 1 + tests/qemuxml2xmloutdata/pcie-root-port.xml | 1 + .../pcie-switch-downstream-port.xml | 1 + .../pcie-switch-upstream-port.xml | 1 + tests/qemuxml2xmloutdata/pcihole64-q35.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml | 1 + tests/qemuxml2xmloutdata/q35-pcie.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-multi.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2-reorder.xml | 1 + tests/qemuxml2xmloutdata/q35-usb2.xml | 1 + tests/qemuxml2xmloutdata/q35-virtio-pci.xml | 1 + tests/qemuxml2xmloutdata/q35.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dac-none.xml | 1 + .../seclabel-device-multiple.xml | 1 + .../seclabel-dynamic-baselabel.xml | 1 + .../seclabel-dynamic-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml | 1 + .../seclabel-dynamic-override.xml | 2 + .../seclabel-dynamic-relabel.xml | 1 + tests/qemuxml2xmloutdata/seclabel-none.xml | 1 + .../seclabel-static-labelskip.xml | 1 + tests/qemuxml2xmloutdata/seclabel-static.xml | 1 + .../serial-spiceport-nospice.xml | 1 + tests/qemuxml2xmloutdata/serial-spiceport.xml | 1 + .../qemuxml2xmloutdata/serial-target-port-auto.xml | 1 + .../serial-tcp-tlsx509-chardev.xml | 1 + tests/qemuxml2xmloutdata/smbios-multiple-type2.xml | 1 + tests/qemuxml2xmloutdata/smbios.xml | 1 + tests/qemuxml2xmloutdata/sound-device.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-heads.xml | 1 + tests/qemuxml2xmloutdata/video-qxl-noheads.xml | 1 + tests/qemuxml2xmloutdata/vmcoreinfo.xml | 1 + tests/qemuxml2xmltest.c | 288 ++++--------- tests/testutils.c | 8 +- tests/testutils.h | 5 - 169 files changed, 1754 insertions(+), 224 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-mirror-out.xml create mode 100644 tests/qemustatusxml2xmldata/migration-out-nbd-in.xml create mode 120000 tests/qemustatusxml2xmldata/migration-out-nbd-out.xml create mode 100644 tests/qemustatusxml2xmldata/modern-in.xml create mode 120000 tests/qemustatusxml2xmldata/modern-out.xml create mode 100644 tests/qemustatusxml2xmldata/vcpus-multi-in.xml create mode 120000 tests/qemustatusxml2xmldata/vcpus-multi-out.xml create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args create mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml create mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml -- 2.16.2

2 20

[libvirt] [PATCH 0/2] [pushed] Trivial followup fixes for a trivial patch
by Ján Tomko 13 Mar '18

13 Mar '18

I managed to push commit 1cdc9ece without incorporating Andrea's review feedback. These are the follow-up fixes I pushed as trivial before the commit police gets me. Ján Tomko (2): Adjust whitespace in virDomainDefHasUSB prototype qemuDomainUSBAddressAddHubs: use numeric comparison src/conf/domain_conf.h | 3 +-- src/qemu/qemu_domain_address.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.13.6

1 2

[libvirt] Two more libvirt GSOC ideas
by Erik Skultety 12 Mar '18

12 Mar '18

Hi, I'd like to add 2 more GSOC ideas to our wiki page, but I'd like to get some opinions whether you think these might even be appropriate GSOC project candidates. #1 PROJECT: Support wildcard with log filters SUMMARY: Enhance the log filters format to allow specifying a wildcard, i.e. <level>:* DESCRIPTION: Currently, libvirt admin interface allows (among other things) runtime tuning of daemon log settings with the exception of setting the global log priority. The main reason for not having an API to get/set the global log priority is that the same effect that setting global log level would have can be achieved with using log filters only which in terms of logging control provide us with more granularity. However, in order to achieve the same effect using filters only, one would end up with a filter similar to this: 1:access 1:daemon 1:conf 1:cpu 1:libvirt 1:locking 1:logging 1:network 1:nwfilter 1:util Therefore, we should enhance the format of a filter to allow us to simply use the following instead: 1:* other_filters #2 PROJECT: Extend node device driver's API set SUMMARY: Modify the existing set (adjust/add) of APIs for node device driver in order to provide similar functionality (conceptually) to other drivers. DESCRIPTION: The node device driver is responsible for host device management. In most cases, this means that we're simply just report device's capabilities and track its lifetime. This is enough for physical host devices, however, there are a few other virtualization features like NFV, NPIV, and MDEV where libvirt should also be able to create such virtual devices. Currently, libvirt is only able to create transient (temporary config) NPIV/vHBA devices, so besides having support for creating virtual functions and mediated devices on feature-capable physical device we also need to be able to store persistent configuration of such virtual devices. Besides extending the existing set of APIs, this will also require a certain amount of refactor of our current code base. Not all of the changes mentioned above are absolutely necessary to finish the project successfully. Thanks, Erik

2 2

[libvirt] [PATCH] bhyve: fix crash on missing interface model
by Roman Bogorodskiy 12 Mar '18

12 Mar '18

The bhyve driver crashes in bhyveBuildNetArgStr() when network interface model is not defined. As it has to be provided explicitly, add a check to report an error if it's missing. --- src/bhyve/bhyve_command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index ec5d24012..9413ae5c1 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -56,6 +56,12 @@ bhyveBuildNetArgStr(virConnectPtr conn, int ret = -1; virDomainNetType actualType = virDomainNetGetActualType(net); + if (net->model == NULL) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("NIC model must be specified")); + return -1; + } + if (STREQ(net->model, "virtio")) { if (VIR_STRDUP(nic_model, "virtio-net") < 0) return -1; -- 2.16.2

2 2

[libvirt] [PATCH] Fix build with clang 6.0.0
by Roman Bogorodskiy 12 Mar '18

12 Mar '18

Clang 6.0.0 complains when initializing structure with { NULL }: conf/domain_addr.c:1494:38: error: missing field 'type' initializer [-Werror,-Wmissing-field-initializers] virDomainDeviceInfo nfo = { NULL }; Use { 0 } instead to make it happy. --- src/conf/domain_addr.c | 2 +- tests/sysinfotest.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 5e875a3e6..0c914fe25 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1491,7 +1491,7 @@ virDomainVirtioSerialAddrAssign(virDomainDefPtr def, bool portOnly) { int ret = -1; - virDomainDeviceInfo nfo = { NULL }; + virDomainDeviceInfo nfo = { 0 }; virDomainDeviceInfoPtr ptr = allowZero ? &nfo : info; ptr->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_SERIAL; diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index a61da017c..53d5725fd 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -91,7 +91,7 @@ sysinfotest_run(const char *test, const char *cpuinfo, const char *expected) { - struct testSysinfoData testdata = { NULL }; + struct testSysinfoData testdata = { 0 }; int ret = EXIT_FAILURE; testdata.func = func; -- 2.16.2

2 2

[libvirt] [PATCH v2 0/9] x86: Secure Encrypted Virtualization (AMD)
by Brijesh Singh 12 Mar '18

12 Mar '18

This patch series provides support for launching an encrypted guest using AMD's new Secure Encrypted Virtualization (SEV) feature. SEV is an extension to the AMD-V architecture which supports running multiple VMs under the control of a hypervisor. When enabled, SEV feature allows the memory contents of a virtual machine (VM) to be transparently encrypted with a key unique to the guest VM. In order to launch SEV guest we need QEMU SEV patch [1]. [1] https://marc.info/?l=kvm&m=152051337301616&w=2 The patch series implements some of recommendation from Daniel [2] [2] https://www.redhat.com/archives/libvir-list/2017-September/msg00197.html At very high level the flow looks this: 1. mgmt tool calls virConnectGetDomainCapabilities. This returns an XML document that includes the following <feature> ... <sev supported='yes'> <cbitpos> </cbitpos> <reduced-phys-bits> </reduced-phys-bits> <pdh> </pdh> <cert-chain> </cert-chain> </feature> If <sev> is provided then we indicate that hypervisor is capable of launching SEV guest. 2. (optional) mgmt tool can provide the PDH and Cert-chain to guest owner in case if guest owner wish to establish a secure connection with SEV firmware to negotiate a key used for validating the measurement. 3. mgmt tool requests to start a guest calling virCreateXML(), passing VIR_DOMAIN_START_PAUSED. The xml would include <launch-security type='sev'> <cbitpos> </cbitpos> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <reduced-phys-bits> </reduced-phys-bits> /* the value is same as what is obtained via virConnectGetDomainCapabilities() <dh-cert> .. </dh> /* guest owners diffie-hellman key */ (optional) <session> ..</session> /* guest owners session blob */ (optional) <policy> ..</policy> /* guest policy */ (optional) 4. Libvirt generate the QEMU cli arg to enable the SEV feature, a typical args looks like this: # $QEMU .. -machine memory-encryption=sev0 \ -object sev-guest,id=sev0,dh-cert-file=<file>.... 5. Libvirt generates lifecycle VIR_DOMAIN_EVENT_SUSPENDED_PAUSED event 6. mgmt tool gets the VIR_DOMAIN_EVENT_SUSPENDED_PAUSED and calls virDomainGetLaunchSecretInfo() to retrieve the measurement of encrypted memory. 7. (optional) mgmt tool can provide the measurement value to guest owner, which can validate the measurement and gives GO/NO-GO answer. If mgmt tool gets GO then it resumes the guest otherwise it calls destroy() to kill the guest. 8. mgmt tool resumes the guest TODO: * SEV guest require to use DMA apis for the virtio devices. In order to use the DMA apis the virtio devices must have this tag <driver iommu=on ats=on> It is a bit unclear to me where these changes need to go. Do we need to modify the libvirt to automatically add these when SEV is enabled or we ask mgmt tool to make sure that it creates XML with right tag to enable the DMA APIs for virtio devices. I am looking for some suggestions. Using these patches we have succesfully booted and tested a guest both with and without SEV enabled. SEV Firmware API spec is available at: https://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf Changes since v1: * rename <sev> -> <launch-security> for domain * add more information about policy and other fields in domaincaps.html * split the domain_conf support in two patches * add virDomainGetLaunchInfo() to retrieve the SEV measurement * extend virsh command to show the domain's launch security information * add test cases to validate newly added <launch-security> element * fix issues reported with 'make check' and 'make syntax-check' The complete git tree is available at: https://github.com/codomania/libvirt/tree/v2 Brijesh Singh (8): qemu: provide support to query the SEV capability qemu: introduce SEV feature in hypervisor capabilities conf: introduce launch-security element in domain qemu: add support to launch SEV guest libvirt: add new public API to get launch security info remote: implement the remote protocol for launch security qemu_driver: add support to launch security info virsh: implement new command for launch security Xiaogang Chen (1): tests: extend tests to include sev specific tag parsing docs/formatdomain.html.in | 120 ++++++++++++++++++++++++++++++++++++ docs/formatdomaincaps.html.in | 40 ++++++++++++ docs/schemas/domaincaps.rng | 20 ++++++ docs/schemas/domaincommon.rng | 39 ++++++++++++ include/libvirt/libvirt-domain.h | 17 +++++ src/conf/domain_capabilities.c | 20 ++++++ src/conf/domain_capabilities.h | 14 +++++ src/conf/domain_conf.c | 111 +++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 27 ++++++++ src/driver-hypervisor.h | 7 +++ src/libvirt-domain.c | 50 +++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_capabilities.c | 45 ++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_capspriv.h | 4 ++ src/qemu/qemu_command.c | 33 ++++++++++ src/qemu/qemu_driver.c | 72 ++++++++++++++++++++++ src/qemu/qemu_monitor.c | 17 +++++ src/qemu/qemu_monitor.h | 6 ++ src/qemu/qemu_monitor_json.c | 105 +++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 5 ++ src/qemu/qemu_process.c | 91 +++++++++++++++++++++++++++ src/remote/remote_daemon_dispatch.c | 63 +++++++++++++++++++ src/remote/remote_driver.c | 52 +++++++++++++++- src/remote/remote_protocol.x | 22 ++++++- src/remote_protocol-structs | 13 ++++ tests/genericxml2xmlindata/sev.xml | 22 +++++++ tests/genericxml2xmloutdata/sev.xml | 22 +++++++ tests/genericxml2xmltest.c | 2 + tests/qemuxml2argvdata/sev.args | 25 ++++++++ tests/qemuxml2argvdata/sev.xml | 35 +++++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmloutdata/sev.xml | 39 ++++++++++++ tests/qemuxml2xmltest.c | 2 + tools/virsh-domain.c | 93 ++++++++++++++++++++++++++++ 35 files changed, 1239 insertions(+), 2 deletions(-) create mode 100644 tests/genericxml2xmlindata/sev.xml create mode 100644 tests/genericxml2xmloutdata/sev.xml create mode 100644 tests/qemuxml2argvdata/sev.args create mode 100644 tests/qemuxml2argvdata/sev.xml create mode 100644 tests/qemuxml2xmloutdata/sev.xml -- 2.14.3

3 21

[libvirt] [PATCH] keycodemapdb: Update submodule
by Andrea Bolognani 12 Mar '18

12 Mar '18

This time around it's not enough to just pick the latest commit, because with aed87bb2aa6ed83b49574eb982e3bdd4c36acf17 keycodemapdb renamed the 'rfb' keycode to 'qnum' and we need to accept the new name while maintaining backwards compatibility. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- include/libvirt/libvirt-domain.h | 9 ++++++++- src/keycodemapdb | 2 +- src/qemu/qemu_driver.c | 8 ++++---- src/util/Makefile.inc.am | 2 +- src/util/virkeycode.c | 8 ++++---- tests/virkeycodetest.c | 4 ++-- tools/virsh-domain.c | 5 +++++ tools/virsh.pod | 6 +++--- 8 files changed, 28 insertions(+), 16 deletions(-) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 4048acf38a..4128d55852 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2733,7 +2733,7 @@ typedef enum { VIR_KEYCODE_SET_XT_KBD = 6, VIR_KEYCODE_SET_USB = 7, VIR_KEYCODE_SET_WIN32 = 8, - VIR_KEYCODE_SET_RFB = 9, + VIR_KEYCODE_SET_QNUM = 9, # ifdef VIR_ENUM_SENTINELS VIR_KEYCODE_SET_LAST @@ -2745,6 +2745,13 @@ typedef enum { # endif } virKeycodeSet; +/** + * VIR_KEYCODE_SET_RFB: + * + * Compatibility alias for VIR_KEYCODE_SET_QNUM, which replaced it since 4.2.0. + */ +# define VIR_KEYCODE_SET_RFB VIR_KEYCODE_SET_QNUM + /** * VIR_DOMAIN_SEND_KEY_MAX_KEYS: * diff --git a/src/keycodemapdb b/src/keycodemapdb index 267157b96c..16e5b07876 160000 --- a/src/keycodemapdb +++ b/src/keycodemapdb @@ -1 +1 @@ -Subproject commit 267157b96c62b5445de9cddd21de42fcd943ffe6 +Subproject commit 16e5b0787687d8904dad2c026107409eb9bfcb95 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e13544f832..8c872c1f08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2580,17 +2580,17 @@ static int qemuDomainSendKey(virDomainPtr domain, virCheckFlags(0, -1); - /* translate the keycode to RFB for qemu driver */ - if (codeset != VIR_KEYCODE_SET_RFB) { + /* translate the keycode to QNUM for qemu driver */ + if (codeset != VIR_KEYCODE_SET_QNUM) { size_t i; int keycode; for (i = 0; i < nkeycodes; i++) { - keycode = virKeycodeValueTranslate(codeset, VIR_KEYCODE_SET_RFB, + keycode = virKeycodeValueTranslate(codeset, VIR_KEYCODE_SET_QNUM, keycodes[i]); if (keycode < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot translate keycode %u of %s codeset to rfb keycode"), + _("cannot translate keycode %u of %s codeset to qnum keycode"), keycodes[i], virKeycodeSetTypeToString(codeset)); return -1; diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index a91b30dca5..d0e1ec3625 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -214,7 +214,7 @@ EXTRA_DIST += \ $(NULL) -KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 rfb +KEYCODES = linux osx atset1 atset2 atset3 xtkbd usb win32 qnum KEYNAMES = linux osx win32 KEYTABLES = \ diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index eda263218c..8976bbf376 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -27,7 +27,7 @@ #include "virkeycodetable_atset3.h" #include "virkeycodetable_linux.h" #include "virkeycodetable_osx.h" -#include "virkeycodetable_rfb.h" +#include "virkeycodetable_qnum.h" #include "virkeycodetable_usb.h" #include "virkeycodetable_win32.h" #include "virkeycodetable_xtkbd.h" @@ -52,7 +52,7 @@ static const unsigned short *virKeymapValues[VIR_KEYCODE_SET_LAST] = { [VIR_KEYCODE_SET_XT_KBD] = virKeyCodeTable_xtkbd, [VIR_KEYCODE_SET_USB] = virKeyCodeTable_usb, [VIR_KEYCODE_SET_WIN32] = virKeyCodeTable_win32, - [VIR_KEYCODE_SET_RFB] = virKeyCodeTable_rfb, + [VIR_KEYCODE_SET_QNUM] = virKeyCodeTable_qnum, }; #define VIR_KEYMAP_ENTRY_MAX ARRAY_CARDINALITY(virKeyCodeTable_linux) @@ -64,7 +64,7 @@ verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_osx)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_xtkbd)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_usb)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_win32)); -verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_rfb)); +verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyCodeTable_qnum)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_linux)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_osx)); verify(VIR_KEYMAP_ENTRY_MAX == ARRAY_CARDINALITY(virKeyNameTable_win32)); @@ -79,7 +79,7 @@ VIR_ENUM_IMPL(virKeycodeSet, VIR_KEYCODE_SET_LAST, "xt_kbd", "usb", "win32", - "rfb", + "qnum", ); int virKeycodeValueFromString(virKeycodeSet codeset, diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 24887a36d4..399a13fcae 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -54,8 +54,8 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) TRANSLATE(LINUX, LINUX, 111, 111); TRANSLATE(LINUX, USB, 111, 76); - TRANSLATE(LINUX, RFB, 88, 88); - TRANSLATE(LINUX, RFB, 160, 163); + TRANSLATE(LINUX, QNUM, 88, 88); + TRANSLATE(LINUX, QNUM, 160, 163); TRANSLATE(ATSET2, ATSET3, 131, 55); TRANSLATE(OSX, WIN32, 90, 131); TRANSLATE(OSX, ATSET1, 90, 90); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c78cf7f219..2b775fc4cc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8688,6 +8688,11 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptUInt(ctl, cmd, "holdtime", &holdtime) < 0) goto cleanup; + /* The qnum codeset was originally called rfb, so we need to keep + * accepting the old name for backwards compatibility reasons */ + if (STREQ(codeset_option, "rfb")) + codeset_option = "qnum"; + codeset = virKeycodeSetTypeFromString(codeset_option); if (codeset < 0) { vshError(ctl, _("unknown codeset: '%s'"), codeset_option); diff --git a/tools/virsh.pod b/tools/virsh.pod index 8f0e8d74b0..378e26a20d 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2249,14 +2249,14 @@ for keyboard input. No symbolic names are provided See L<virkeycode-usb(7)> -=item B<rfb> +=item B<qnum> -The numeric values are those defined by the RFB extension for sending +The numeric values are those defined by the QNUM extension for sending raw keycodes. These are a variant on the XT codeset, but extended keycodes have the low bit of the second byte set, instead of the high bit of the first byte. No symbolic names are provided. -See L<virkeycode-rfb(7)> +See L<virkeycode-qnum(7)> =back -- 2.14.3

2 7

[libvirt] [PATCH] qemu: different declarations for the same method.
by Julio Faracco 12 Mar '18

12 Mar '18

Recently, this warning is appearing while libvirt is being compiled: Function 'qemuAssignDeviceDiskAlias' argument order different: declaration 'vmdef, def' definition 'def, disk' This commit change the default declaration for qemuAssignDeviceDiskAlias specified at src/qemu/qemu_alias.c. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/qemu/qemu_alias.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 2246e712f..8c744138c 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -38,8 +38,8 @@ int qemuAssignDeviceControllerAlias(virDomainDefPtr domainDef, virQEMUCapsPtr qemuCaps, virDomainControllerDefPtr controller); -int qemuAssignDeviceDiskAlias(virDomainDefPtr vmdef, - virDomainDiskDefPtr def); +int qemuAssignDeviceDiskAlias(virDomainDefPtr def, + virDomainDiskDefPtr disk); int qemuAssignDeviceHostdevAlias(virDomainDefPtr def, char **alias, -- 2.14.1

3 4

[libvirt] [PATCH] libvirtd: fix potential deadlock when reloading
by Jim Fehlig 12 Mar '18

12 Mar '18

It is possible to deadlock libvirtd when concurrently starting a domain and restarting the daemon. Threads involved in the deadlock are Thread 4 (Thread 0x7fc13b53e700 (LWP 64084)): #0 0x00007fc13fba10bf in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007fc14310213c in virCondWait (c=0x7fc110017fa8, m=0x7fc110017f80) at util/virthread.c:154 #2 0x00007fc1280244e9 in qemuMonitorSend (mon=0x7fc110017f70, msg=0x7fc13b53d240) at qemu/qemu_monitor.c:1083 #3 0x00007fc12803bf5a in qemuMonitorJSONCommandWithFd (mon=0x7fc110017f70, cmd=0x7fc110017700, scm_fd=-1, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:305 #4 0x00007fc12803c09c in qemuMonitorJSONCommand (mon=0x7fc110017f70, cmd=0x7fc110017700, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:335 #5 0x00007fc12803f116 in qemuMonitorJSONSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor_json.c:1298 #6 0x00007fc128026e14 in qemuMonitorSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor.c:1697 #7 0x00007fc127ffe250 in qemuProcessInitMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START) at qemu/qemu_process.c:1763 #8 0x00007fc127ffe564 in qemuConnectMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:1835 #9 0x00007fc127fff386 in qemuProcessWaitForMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:2180 #10 0x00007fc128009269 in qemuProcessLaunch (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START, incoming=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6111 #11 0x00007fc128009e85 in qemuProcessStart (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, updatedCPU=0x0, asyncJob=QEMU_ASYNC_JOB_START, migrateFrom=0x0, migrateFd=-1, migratePath=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6334 #12 0x00007fc1280552f1 in qemuDomainCreateXML (conn=0x7fc1100009a0, xml=0x7fc110000ed0 "<!--\nWARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE\nOVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n virsh edit testvv\nor other applicati"..., flags=0) at qemu/qemu_driver.c:1776 ... Thread 1 (Thread 0x7fc143c66880 (LWP 64081)): #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 #2 0x00007fc1431a394f in virNWFilterWriteLockFilterUpdates () at conf/nwfilter_conf.c:159 #3 0x00007fc12a5230a0 in nwfilterStateReload () at nwfilter/nwfilter_driver.c:299 #4 0x00007fc1433170c2 in virStateReload () at libvirt.c:829 #5 0x0000558c522d5686 in daemonReloadHandler (dmn=0x558c5328b230, sig=0x7ffe0a831e30, opaque=0x0) at remote/remote_daemon.c:724 #6 0x00007fc14321e3c7 in virNetDaemonSignalEvent (watch=2, fd=9, events=1, opaque=0x558c5328b230) at rpc/virnetdaemon.c:654 #7 0x00007fc143085cc7 in virEventPollDispatchHandles (nfds=11, fds=0x558c532cd930) at util/vireventpoll.c:508 #8 0x00007fc143086586 in virEventPollRunOnce () at util/vireventpoll.c:657 #9 0x00007fc143084312 in virEventRunDefaultImpl () at util/virevent.c:327 #10 0x00007fc14321ecb8 in virNetDaemonRun (dmn=0x558c5328b230) at rpc/virnetdaemon.c:858 #11 0x0000558c522d7add in main (argc=3, argv=0x7ffe0a832758) at remote/remote_daemon.c:1496 (gdb) thr 1 [Switching to thread 1 (Thread 0x7fc143c66880 (LWP 64081))] #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 (gdb) f 1 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 122 pthread_rwlock_wrlock(&m->lock); (gdb) p updateLock $1 = {lock = {__data = {__lock = 0, __nr_readers = 1, __readers_wakeup = 0, __writer_wakeup = 0, __nr_readers_queued = 0, __nr_writers_queued = 1, __writer = 0, __shared = 0, __rwelision = 0 '\000', __pad1 = "\000\000\000\000\000\000", __pad2 = 0, __flags = 0}, __size = "\000\000\000\000\001", '\000' <repeats 15 times>, "\001", '\000' <repeats 34 times>, __align = 4294967296}} Reloading of the nwfilter driver is stuck waiting for a write lock, which already has a reader (from qemuDomainCreateXML) in the critical section. Since the reload occurs in the context of the main event loop thread, libvirtd becomes deadlocked. The deadlock can be avoided by offloading the reload work to a thread. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Fix suggested by danpb https://www.redhat.com/archives/libvir-list/2018-March/msg00382.html src/remote/remote_daemon.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index f8082f62f..2146655b0 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -709,20 +709,32 @@ static void daemonShutdownHandler(virNetDaemonPtr dmn, virNetDaemonQuit(dmn); } +static void daemonReloadHandlerThread(void *opague ATTRIBUTE_UNUSED) +{ + VIR_INFO("Reloading configuration on SIGHUP"); + virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", + VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); + if (virStateReload() < 0) + VIR_WARN("Error while reloading drivers"); +} + static void daemonReloadHandler(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, siginfo_t *sig ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) { + virThread thr; + if (!driversInitialized) { VIR_WARN("Drivers are not initialized, reload ignored"); return; } - VIR_INFO("Reloading configuration on SIGHUP"); - virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", - VIR_HOOK_DAEMON_OP_RELOAD, SIGHUP, "SIGHUP", NULL, NULL); - if (virStateReload() < 0) - VIR_WARN("Error while reloading drivers"); + if (virThreadCreate(&thr, false, daemonReloadHandlerThread, NULL) < 0) { + /* + * Not much we can do on error here except log it. + */ + VIR_ERROR(_("Failed to create thread to handle daemon restart")); + } } static int daemonSetupSignals(virNetDaemonPtr dmn) -- 2.16.2

2 1

[libvirt] [PATCH] Update to latest gnulib
by Daniel P. Berrangé 12 Mar '18

12 Mar '18

GnuLib has now fixed the incompatibility with latest GLibC that was affecting builds on Fedora rawhide. We can thus update and drop our local workaround. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed to git since we don't review trivial gnulib updates. .gnulib | 2 +- bootstrap | 4 ++-- gnulib/local/lib/fflush.c.diff | 33 --------------------------------- gnulib/local/lib/fpurge.c.diff | 13 ------------- gnulib/local/lib/freading.c.diff | 13 ------------- gnulib/local/lib/fseeko.c.diff | 22 ---------------------- 6 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 gnulib/local/lib/fflush.c.diff delete mode 100644 gnulib/local/lib/fpurge.c.diff delete mode 100644 gnulib/local/lib/freading.c.diff delete mode 100644 gnulib/local/lib/fseeko.c.diff diff --git a/.gnulib b/.gnulib index 0404c9ae28..d6397dde2e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0404c9ae2845cbf93d71b295b67d6c8bd39382d8 +Subproject commit d6397dde2e127e246e3eeb5254a21f42cac783c8 diff --git a/bootstrap b/bootstrap index 25920e991c..92be11439a 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2017-09-19.08; # UTC +scriptversion=2018-03-07.03; # UTC # Bootstrap this package from checked-out sources. @@ -1020,7 +1020,7 @@ bootstrap_epilogue echo "$0: done. Now you can run './configure'." # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib/local/lib/fflush.c.diff b/gnulib/local/lib/fflush.c.diff deleted file mode 100644 index fa0e2431bd..0000000000 --- a/gnulib/local/lib/fflush.c.diff +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/lib/fflush.c b/lib/fflush.c -index 983ade0ff..5f617305a 100644 ---- a/lib/fflush.c -+++ b/lib/fflush.c -@@ -32,8 +32,8 @@ - - #undef fflush - -- --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#define _IO_IN_BACKUP 0x100 -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - - /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ - static void -@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp) - - #endif - --#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) -+#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */) - - # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT - /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream) - if (stream == NULL || ! freading (stream)) - return fflush (stream); - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - - clear_ungetc_buffer_preserving_position (stream); - diff --git a/gnulib/local/lib/fpurge.c.diff b/gnulib/local/lib/fpurge.c.diff deleted file mode 100644 index 1fd87d8bfa..0000000000 --- a/gnulib/local/lib/fpurge.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/fpurge.c b/lib/fpurge.c -index b1d417c7a..75cf34ca2 100644 ---- a/lib/fpurge.c -+++ b/lib/fpurge.c -@@ -62,7 +62,7 @@ fpurge (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/gnulib/local/lib/freading.c.diff b/gnulib/local/lib/freading.c.diff deleted file mode 100644 index c51e34dd6a..0000000000 --- a/gnulib/local/lib/freading.c.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib/freading.c b/lib/freading.c -index 73c28acdd..b1c397016 100644 ---- a/lib/freading.c -+++ b/lib/freading.c -@@ -31,7 +31,7 @@ freading (FILE *fp) - /* Most systems provide FILE as a struct and the necessary bitmask in - <stdio.h>, because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+# if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - return ((fp->_flags & _IO_NO_WRITES) != 0 - || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 - && fp->_IO_read_base != NULL)); diff --git a/gnulib/local/lib/fseeko.c.diff b/gnulib/local/lib/fseeko.c.diff deleted file mode 100644 index b2c061fc97..0000000000 --- a/gnulib/local/lib/fseeko.c.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/fseeko.c b/lib/fseeko.c -index 0101ab55f..542241bb2 100644 ---- a/lib/fseeko.c -+++ b/lib/fseeko.c -@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence) - #endif - - /* These tests are based on fpurge.c. */ --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - if (fp->_IO_read_end == fp->_IO_read_ptr - && fp->_IO_write_ptr == fp->_IO_write_base - && fp->_IO_save_base == NULL) -@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence) - return -1; - } - --#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ -+#if defined _IO_ftrylockfile || __GNU_LIBRARY__ /* GNU libc, BeOS, Haiku, Linux libc5 */ - fp->_flags &= ~_IO_EOF_SEEN; - fp->_offset = pos; - #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ -- 2.14.3

1 0

[libvirt] [PATCH go-xml] fix type tag for rdp and destkop graphics devices
by Ryan Goodfellow 12 Mar '18

12 Mar '18

The current behavior is to generate a type="vnc" tag in the <graphics> element generated from either a DomainGrapicRDP or DomainGraphicDesktop. The correct tags should be type="rdp" and type="desktop" respectively. This commit emits the correct tags and adds a test for correct graphics device tagging. --- domain.go | 4 ++-- domain_test.go | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/domain.go b/domain.go index ea53dfc..1de4ade 100644 --- a/domain.go +++ b/domain.go @@ -4226,12 +4226,12 @@ func (a *DomainGraphic) MarshalXML(e *xml.Encoder, start xml.StartElement) error return e.EncodeElement(a.VNC, start) } else if a.RDP != nil { start.Attr = append(start.Attr, xml.Attr{ - xml.Name{Local: "type"}, "vnc", + xml.Name{Local: "type"}, "rdp", }) return e.EncodeElement(a.RDP, start) } else if a.Desktop != nil { start.Attr = append(start.Attr, xml.Attr{ - xml.Name{Local: "type"}, "vnc", + xml.Name{Local: "type"}, "desktop", }) return e.EncodeElement(a.Desktop, start) } else if a.Spice != nil { diff --git a/domain_test.go b/domain_test.go index 7c9d3a2..1715e01 100644 --- a/domain_test.go +++ b/domain_test.go @@ -3782,6 +3782,32 @@ var domainTestData = []struct { `</domain>`, }, }, + { + Object: &Domain{ + Name: "demo", + Devices: &DomainDeviceList{ + Graphics: []DomainGraphic{ + DomainGraphic{SDL: &DomainGraphicSDL{}}, + DomainGraphic{VNC: &DomainGraphicVNC{}}, + DomainGraphic{RDP: &DomainGraphicRDP{}}, + DomainGraphic{Desktop: &DomainGraphicDesktop{}}, + DomainGraphic{Spice: &DomainGraphicSpice{}}, + }, + }, + }, + Expected: []string{ + `<domain>`, + ` <name>demo</name>`, + ` <devices>`, + ` <graphics type="sdl"></graphics>`, + ` <graphics type="vnc"></graphics>`, + ` <graphics type="rdp"></graphics>`, + ` <graphics type="desktop"></graphics>`, + ` <graphics type="spice"></graphics>`, + ` </devices>`, + `</domain>`, + }, + }, } func TestDomain(t *testing.T) { -- 2.14.3

2 3

[libvirt] [PATCH] util, remote: Fixing the sending of stream when length is defined.
by Julio Faracco 12 Mar '18

12 Mar '18

When a length of a file is defined, the responsible thread to send stream is finishing inappropriately. It is happening because there is wrong conditional which compares an offset with the length and because of that the code throws ENOSPC error. To test it: virsh# vol-upload ... --length N Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/remote/remote_daemon_stream.c | 24 ++++++++++++------------ src/util/virfdstream.c | 5 +---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c index 4dd3af9e0..998e82a83 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -549,21 +549,21 @@ daemonStreamHandleWriteData(virNetServerClientPtr client, } else if (ret == -2) { /* Blocking, so indicate we have more todo later */ return 1; - } else { - virNetMessageError rerr; + } else if (ret) { + virNetMessageError rerr; - memset(&rerr, 0, sizeof(rerr)); + memset(&rerr, 0, sizeof(rerr)); - VIR_INFO("Stream send failed"); - stream->closed = true; - virStreamEventRemoveCallback(stream->st); - virStreamAbort(stream->st); + VIR_INFO("Stream send failed"); + stream->closed = true; + virStreamEventRemoveCallback(stream->st); + virStreamAbort(stream->st); - return virNetServerProgramSendReplyError(stream->prog, - client, - msg, - &rerr, - &msg->header); + return virNetServerProgramSendReplyError(stream->prog, + client, + msg, + &rerr, + &msg->header); } return 0; diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index be40379a9..c3198c768 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -627,9 +627,6 @@ virFDStreamThread(void *opaque) if (got < 0) goto error; - if (got == 0) - break; - total += got; } @@ -783,7 +780,7 @@ static int virFDStreamWrite(virStreamPtr st, const char *bytes, size_t nbytes) virObjectLock(fdst); if (fdst->length) { - if (fdst->length == fdst->offset) { + if (fdst->offset > fdst->length) { virReportSystemError(ENOSPC, "%s", _("cannot write to stream")); virObjectUnlock(fdst); -- 2.14.1

3 3

[libvirt] [PATCH] libvirt:spec: Require gcc for build
by Michal Privoznik 12 Mar '18

12 Mar '18

According to latest discussion on fedora devel list [1] gcc will be removed from default buildroot and packages requiring it must have explicit build dependency, 1: https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedorapr… Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8f46f58b5..5e05d706f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -298,6 +298,7 @@ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: /usr/bin/pod2man %endif +BuildRequires: gcc BuildRequires: git %if 0%{?fedora} >= 27 || 0%{?rhel} > 7 BuildRequires: perl-interpreter -- 2.16.1

2 1

[libvirt] [PATCH 0/3] Update the virsh pool define/create for vHBA/NPIV
by John Ferlan 12 Mar '18

12 Mar '18

Looks like when adding support in commit 78be2e8b (and the 3 just before it), I neglected to update the virsh command allow command line usage of the fields. This series updates virsh in order to allow adding the fields (as ugly as they are) to make it easier to define/create the pool with the fields. John Ferlan (3): tools: Add the wwnn/wwpn to the man page for storage pool fields tools: Update the help description of the adapter-parent field tools: Add support for additional adapter parent options tools/virsh-pool.c | 29 ++++++++++++++++++++++++++--- tools/virsh.pod | 17 ++++++++++++----- 2 files changed, 38 insertions(+), 8 deletions(-) -- 2.13.6

2 4

[libvirt] [PATCH] qemu: Add qemu functions for storage source private data handling
by Peter Krempa 12 Mar '18

12 Mar '18

The qemu driver registered the helpers from util code, but it will be necessary to format also some qemu-specific data. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- This patch conflicts with Michal's persistent reservations series. I'll need the code in the place this patch places it later so I'm sending this to avoid having to move this again very soon. src/qemu/qemu_domain.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b55013de6a..9802dcdbc6 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1951,6 +1951,28 @@ qemuDomainObjPrivateFree(void *data) } +static int +qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt, + virStorageSourcePtr src) +{ + if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) + return -1; + + return 0; +} + + +static int +qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, + virBufferPtr buf) +{ + if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) + return -1; + + return 0; +} + + static void qemuDomainObjPrivateXMLFormatVcpus(virBufferPtr buf, virDomainDefPtr def) @@ -2538,8 +2560,8 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks = { .chrSourceNew = qemuDomainChrSourcePrivateNew, .parse = qemuDomainObjPrivateXMLParse, .format = qemuDomainObjPrivateXMLFormat, - .storageParse = virStorageSourcePrivateDataParseRelPath, - .storageFormat = virStorageSourcePrivateDataFormatRelPath, + .storageParse = qemuStorageSourcePrivateDataParse, + .storageFormat = qemuStorageSourcePrivateDataFormat, }; -- 2.16.2

2 1

[libvirt] libvirt-snmp status
by Michael Corcoran 12 Mar '18

12 Mar '18

Hi All, I'd like to enquire about the status of libvirt-snmp. It hasn't had any commits for a couple of years and no longer compiles against recent versions of net-snmp. As I understand it, upstream net-snmp deprecated and then removed the C type "U64" as it conflicts with Perl. Fortunately this is the only issue and the patch required to get libvirt-snmp building again simply replaces the C type "U64" with the type "struct counter64" in a few places. I tried to submit a patch but was unable to configure authentication/encryption correctly for git send-email and I'm unwilling to spend more time on it. Is there any way to accept patches directly from Github (or anywhere else I can push a commit)? My second enquiry relates to the org OID used in the LIBVIRT-MIB. It currently uses a (presumably) placeholder of 12345. I check the OID register[1] and found an entry for libvirt (see end of email). I am guessing that registration didn't go through until after libvirt-snmp maintenance stopped. I'd like to submit a patch to replace the placeholder with this org id also. BR, Michael Corcoran [1] https://www.iana.org/assignments/enterprise-numbers/enterprise-numb ers 36957 libvirt Daniel Veillard daniel&veillard.com

2 1

[libvirt] [libvirt-snmp] Project status
by Michael Corcoran 10 Mar '18

10 Mar '18

Hi All, I'd like to enquire about the status of libvirt-snmp. It hasn't had any commits for a couple of years and no longer compiles against recent versions of net-snmp. As I understand it, upstream net-snmp deprecated and then removed the C type "U64" as it conflicts with Perl. Fortunately this is the only issue and the patch required to get libvirt-snmp building again simply replaces the C type "U64" with the type "struct counter64" in a few places. I tried to submit a patch but was unable to configure authentication/encryption correctly for git send-email and I'm unwilling to spend more time on it. Is there any way to accept patches directly from Github (or anywhere else I can push a commit)? My second enquiry relates to the org OID used in the LIBVIRT-MIB. It currently uses a (presumably) placeholder of 12345. I check the OID register[1] and found an entry for libvirt (see end of email). I am guessing that registration didn't go through until after libvirt-snmp maintenance stopped. I'd like to submit a patch to replace the placeholder with this org id also. BR, Michael Corcoran [1] https://www.iana.org/assignments/enterprise-numbers/enterprise-numb ers 36957 libvirt Daniel Veillard daniel&veillard.com

1 0

[libvirt] [PATCH v7 00/11] qemu: Validate PCI controller options
by Andrea Bolognani 09 Mar '18

09 Mar '18

Applies cleanly on top of b932ed69f6664f42e211bdde84c8ab04e1f19033. Patches 2/11 and 4/11 are the only ones missing R-bs, everything else hasn't been significantly altered since [v5]. Changes from [v6]: * don't special-case the default PHB when checking capabilities. Changes from [v5]: * patch 1 has been pushed; * add virReportController*() functions to cut down on redundant error reporting, as suggested by laine; * report index and modelName along with model in error messages. Changes from [v4]: * patch 1/12 is new; * use virReportEnumRangeError(), as suggested by laine. Changes from [v3]: * don't introduce new test cases that won't be able to provide full test coverage anyway, as suggested by laine. Changes from [v2]: * replace the old implementation bit by bit using a clever trick suggested by pkrempa; * don't move QEMU capability validation; * add a default: label to all switch statements as recommended by danpb. Changes from [v1]: * error out instead of silently accept invalid options; * shave quite a lot of yaks. [v6] https://www.redhat.com/archives/libvir-list/2018-March/msg00203.html [v5] https://www.redhat.com/archives/libvir-list/2018-March/msg00096.html [v4] https://www.redhat.com/archives/libvir-list/2018-February/msg01232.html [v3] https://www.redhat.com/archives/libvir-list/2018-February/msg00996.html [v2] https://www.redhat.com/archives/libvir-list/2018-February/msg00813.html [v1] https://www.redhat.com/archives/libvir-list/2018-February/msg00244.html Andrea Bolognani (11): qemu: Create new qemuDomainDeviceDefValidateControllerPCI() qemu: Validate PCI controller options (modelName) qemu: Validate PCI controller options (index) qemu: Validate PCI controller options (targetIndex) qemu: Validate PCI controller options (pcihole64) qemu: Validate PCI controller options (busNr) qemu: Validate PCI controller options (numaNode) qemu: Validate PCI controller options (chassisNr) qemu: Validate PCI controller options (chassis and port) qemu: Validate PCI controllers (QEMU capabilities) qemu: Remove old qemuDomainDeviceDefValidateControllerPCI() src/qemu/qemu_domain.c | 531 +++++++++++++++++-------- tests/qemuxml2argvdata/pcie-expander-bus.xml | 3 - tests/qemuxml2argvtest.c | 38 +- tests/qemuxml2xmloutdata/pcie-expander-bus.xml | 4 +- tests/qemuxml2xmltest.c | 31 +- 5 files changed, 432 insertions(+), 175 deletions(-) -- 2.14.3

2 14

[libvirt] [PATCH v2 00/12] Basic implementation of persistent reservations
by Michal Privoznik 09 Mar '18

09 Mar '18

v2 of: https://www.redhat.com/archives/libvir-list/2018-January/msg00584.html diff to v1: - Dropped the hash table and stayed with simple pid_t in vm->privateData - Couple of small fixes (basically to address Peter's review) What is still missing: - Event from qemu when the helper process dies (in my testing, qemu process dies as soon as it tries to do PR). - <hostdev/> support, which surprisingly works even without these patches. I mean, if I add the following hostdev the guest is already able to do PR even with plain origin/master: <hostdev mode='subsystem' type='scsi' managed='no' rawio='no'> <source> <adapter name='scsi_host7'/> <address bus='0' target='0' unit='0'/> </source> <address type='drive' controller='0' bus='0' target='0' unit='4'/> </hostdev> where host7 is an iSCSI device: /sys/bus/scsi/devices/7\:0\:0\:0/block/sdd/ and the part of generated cmd line: -drive file=/dev/sg3,if=none,id=drive-hostdev0 \ -device scsi-generic,bus=scsi0.0,channel=0,scsi-id=0,lun=4,drive=drive-hostdev0,id=hostdev0 However, the qemu is running under my regular user nor it has any special capabilities: # grep -e "^Name" -e "^Uid" -e "^Gid" -e "^Cap" /proc/$(pgrep qemu)/status Name: qemu-system-x86 Uid: 1000 1000 1000 1000 Gid: 1000 1000 1000 1000 CapInh: 0000000000000000 CapPrm: 0000000000000000 CapEff: 0000000000000000 CapBnd: 0000003fffffffff CapAmb: 0000000000000000 As usual, you can find the patches on my github too: https://github.com/zippy2/libvirt/tree/pr_v2 Michal Privoznik (12): virstoragefile: Introduce virStoragePRDef qemuDomainDiskChangeSupported: Deny changing reservations qemu: Introduce pr-manager-helper capability qemu: Generate alias and socket path for pr-helper qemu: Store pr runtime data in status XML qemu: Generate cmd line at startup qemu: Introduce pr_helper to qemu.conf qemu_domain: Track pr-helper PID in status XML qemu: Start PR daemons on domain startup qemu_hotplug: Hotplug of reservations qemu_hotplug: Hotunplug of reservations qemu: Detect pr-manager-helper capability docs/formatdomain.html.in | 25 ++- docs/schemas/domaincommon.rng | 34 +--- docs/schemas/storagecommon.rng | 50 +++++ m4/virt-driver-qemu.m4 | 5 + src/conf/domain_conf.c | 36 ++++ src/libvirt_private.syms | 6 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 40 ++++ src/qemu/qemu_conf.c | 7 +- src/qemu/qemu_conf.h | 1 + src/qemu/qemu_domain.c | 213 ++++++++++++++++++++- src/qemu/qemu_domain.h | 15 ++ src/qemu/qemu_hotplug.c | 94 +++++++++ src/qemu/qemu_process.c | 188 ++++++++++++++++++ src/qemu/qemu_process.h | 7 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/virstoragefile.c | 181 +++++++++++++++++ src/util/virstoragefile.h | 19 ++ .../disk-virtio-scsi-reservations-not-managed.args | 28 +++ .../disk-virtio-scsi-reservations-not-managed.xml | 40 ++++ .../disk-virtio-scsi-reservations.args | 29 +++ .../disk-virtio-scsi-reservations.xml | 38 ++++ tests/qemuxml2argvtest.c | 8 + .../disk-virtio-scsi-reservations-not-managed.xml | 1 + .../disk-virtio-scsi-reservations.xml | 1 + tests/qemuxml2xmltest.c | 4 + 29 files changed, 1042 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml -- 2.16.1

4 42

[libvirt] [PATCH] fflush: be more paranoid about libio.h change
by Paul Eggert 09 Mar '18

09 Mar '18

Suggested by Eli Zaretskii in: https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html * lib/fbufmode.c (fbufmode): * lib/fflush.c (clear_ungetc_buffer_preserving_position) (disable_seek_optimization, rpl_fflush): * lib/fpending.c (__fpending): * lib/fpurge.c (fpurge): * lib/freadable.c (freadable): * lib/freadahead.c (freadahead): * lib/freading.c (freading): * lib/freadptr.c (freadptr): * lib/freadseek.c (freadptrinc): * lib/fseeko.c (fseeko): * lib/fseterr.c (fseterr): * lib/fwritable.c (fwritable): * lib/fwriting.c (fwriting): Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. --- ChangeLog | 21 +++++++++++++++++++++ lib/fbufmode.c | 3 ++- lib/fflush.c | 9 ++++++--- lib/fpending.c | 3 ++- lib/fpurge.c | 3 ++- lib/freadable.c | 3 ++- lib/freadahead.c | 3 ++- lib/freading.c | 3 ++- lib/freadptr.c | 3 ++- lib/freadseek.c | 3 ++- lib/fseeko.c | 6 ++++-- lib/fseterr.c | 3 ++- lib/fwritable.c | 3 ++- lib/fwriting.c | 3 ++- 14 files changed, 53 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index e858e18fb..a9cd4aed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2018-03-08 Paul Eggert <eggert(a)cs.ucla.edu> + + fflush: be more paranoid about libio.h change + Suggested by Eli Zaretskii in: + https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html + * lib/fbufmode.c (fbufmode): + * lib/fflush.c (clear_ungetc_buffer_preserving_position) + (disable_seek_optimization, rpl_fflush): + * lib/fpending.c (__fpending): + * lib/fpurge.c (fpurge): + * lib/freadable.c (freadable): + * lib/freadahead.c (freadahead): + * lib/freading.c (freading): + * lib/freadptr.c (freadptr): + * lib/freadseek.c (freadptrinc): + * lib/fseeko.c (fseeko): + * lib/fseterr.c (fseterr): + * lib/fwritable.c (fwritable): + * lib/fwriting.c (fwriting): + Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN. + 2018-03-07 Paul Eggert <eggert(a)cs.ucla.edu> maint: write-file-hooks -> before-save-hook diff --git a/lib/fbufmode.c b/lib/fbufmode.c index f711fdfb7..73c64f348 100644 --- a/lib/fbufmode.c +++ b/lib/fbufmode.c @@ -31,7 +31,8 @@ fbufmode (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ # if HAVE___FLBF /* glibc >= 2.2 */ if (__flbf (fp)) return _IOLBF; diff --git a/lib/fflush.c b/lib/fflush.c index a6edfa105..a140b7ad9 100644 --- a/lib/fflush.c +++ b/lib/fflush.c @@ -33,7 +33,8 @@ #undef fflush -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 +/* GNU libc, BeOS, Haiku, Linux libc5 */ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */ static void @@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp) #endif -#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */) +#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1) +/* GNU libc, BeOS, Haiku, Linux libc5 */ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ @@ -148,7 +150,8 @@ rpl_fflush (FILE *stream) if (stream == NULL || ! freading (stream)) return fflush (stream); -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ clear_ungetc_buffer_preserving_position (stream); diff --git a/lib/fpending.c b/lib/fpending.c index 789f50e4e..7bc235ded 100644 --- a/lib/fpending.c +++ b/lib/fpending.c @@ -32,7 +32,8 @@ __fpending (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return fp->_IO_write_ptr - fp->_IO_write_base; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/fpurge.c b/lib/fpurge.c index 3aedcc373..554790b56 100644 --- a/lib/fpurge.c +++ b/lib/fpurge.c @@ -62,7 +62,8 @@ fpurge (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_IO_read_end = fp->_IO_read_ptr; fp->_IO_write_ptr = fp->_IO_write_base; /* Avoid memory leak when there is an active ungetc buffer. */ diff --git a/lib/freadable.c b/lib/freadable.c index c4ca0b86e..53cdbee08 100644 --- a/lib/freadable.c +++ b/lib/freadable.c @@ -31,7 +31,8 @@ freadable (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return (fp->_flags & _IO_NO_READS) == 0; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/freadahead.c b/lib/freadahead.c index 23ec76ee5..ed3dd0ebd 100644 --- a/lib/freadahead.c +++ b/lib/freadahead.c @@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *); size_t freadahead (FILE *fp) { -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_write_ptr > fp->_IO_write_base) return 0; return (fp->_IO_read_end - fp->_IO_read_ptr) diff --git a/lib/freading.c b/lib/freading.c index c24d0c88a..790f92ca3 100644 --- a/lib/freading.c +++ b/lib/freading.c @@ -31,7 +31,8 @@ freading (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return ((fp->_flags & _IO_NO_WRITES) != 0 || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0 && fp->_IO_read_base != NULL)); diff --git a/lib/freadptr.c b/lib/freadptr.c index ffb801039..3afa62149 100644 --- a/lib/freadptr.c +++ b/lib/freadptr.c @@ -29,7 +29,8 @@ freadptr (FILE *fp, size_t *sizep) size_t size; /* Keep this code in sync with freadahead! */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_write_ptr > fp->_IO_write_base) return NULL; size = fp->_IO_read_end - fp->_IO_read_ptr; diff --git a/lib/freadseek.c b/lib/freadseek.c index 5fd2dd7ca..b11845cd5 100644 --- a/lib/freadseek.c +++ b/lib/freadseek.c @@ -36,7 +36,8 @@ freadptrinc (FILE *fp, size_t increment) /* Keep this code in sync with freadptr! */ #if HAVE___FREADPTRINC /* musl libc */ __freadptrinc (fp, increment); -#elif defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#elif defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_IO_read_ptr += increment; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/fseeko.c b/lib/fseeko.c index 193f4e8ce..e5c5172e7 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence) #endif /* These tests are based on fpurge.c. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ if (fp->_IO_read_end == fp->_IO_read_ptr && fp->_IO_write_ptr == fp->_IO_write_base && fp->_IO_save_base == NULL) @@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence) return -1; } -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags &= ~_IO_EOF_SEEN; fp->_offset = pos; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ diff --git a/lib/fseterr.c b/lib/fseterr.c index adb637256..fd9da6338 100644 --- a/lib/fseterr.c +++ b/lib/fseterr.c @@ -29,7 +29,8 @@ fseterr (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ fp->_flags |= _IO_ERR_SEEN; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/fwritable.c b/lib/fwritable.c index 3b1a380ec..24a148aee 100644 --- a/lib/fwritable.c +++ b/lib/fwritable.c @@ -31,7 +31,8 @@ fwritable (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return (fp->_flags & _IO_NO_WRITES) == 0; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ diff --git a/lib/fwriting.c b/lib/fwriting.c index 4a3d9c8d4..9be6fb220 100644 --- a/lib/fwriting.c +++ b/lib/fwriting.c @@ -27,7 +27,8 @@ fwriting (FILE *fp) /* Most systems provide FILE as a struct and the necessary bitmask in <stdio.h>, because they need it for implementing getc() and putc() as fast macros. */ -#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ +#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 + /* GNU libc, BeOS, Haiku, Linux libc5 */ return (fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) != 0; #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */ -- 2.14.3

1 0

[libvirt] [PATCH] Add kubevirt blog to planet virttools
by Fabian Deutsch 08 Mar '18

08 Mar '18

Signed-off-by: Fabian Deutsch <fabiand(a)fedoraproject.org> --- updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index ff1bff3..4b55c6c 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -179,3 +179,6 @@ name = Marcin Juszkiewicz [https://dummdida.tumblr.com/tagged/virtualization/rss] name = Fabian Deutsch + +[http://blog.kubevirt.io/rss/] +name = KubeVirt Blog -- 2.13.6

2 2

[libvirt] [PATCH] Add Fabian Deutsch to Planet virttools
by Fabian Deutsch 08 Mar '18

08 Mar '18

… who is occasionally writing about KubeVirt Signed-off-by: Fabian Deutsch <fabiand(a)fedoraproject.org> --- updater/virt-tools/config.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/updater/virt-tools/config.ini b/updater/virt-tools/config.ini index a56d3b7..ff1bff3 100644 --- a/updater/virt-tools/config.ini +++ b/updater/virt-tools/config.ini @@ -176,3 +176,6 @@ faceheight = 80 [https://marcin.juszkiewicz.com.pl/tag/virtualization/feed/] name = Marcin Juszkiewicz + +[https://dummdida.tumblr.com/tagged/virtualization/rss] +name = Fabian Deutsch -- 2.13.6

2 2

[libvirt] [PATCH] apparmor: add ro rule for sasl GSSAPI plugin on /etc/gss/mech.d/
by Christian Ehrhardt 08 Mar '18

08 Mar '18

If a system has sasl GSSAPI plugin available qemu with sasl support will try to read /etc/gss/mech.d/. It is required to allow that to let the modules fully work and it should be safe to do so as it only registers/configures plugins but has no secrets. Signed-off-by: Christian Ehrhardt <christian.ehrhardt(a)canonical.com> --- examples/apparmor/libvirt-qemu | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/apparmor/libvirt-qemu b/examples/apparmor/libvirt-qemu index 950b042..2c47652 100644 --- a/examples/apparmor/libvirt-qemu +++ b/examples/apparmor/libvirt-qemu @@ -192,3 +192,7 @@ # silence refusals to open lttng files (see LP: #1432644) deny /dev/shm/lttng-ust-wait-* r, deny /run/shm/lttng-ust-wait-* r, + + # required for sasl GSSAPI plugin + /etc/gss/mech.d/ r, + /etc/gss/mech.d/* r, -- 2.7.4

3 3

[libvirt] Libvirt and Vmware support
by Egoitz Aurrekoetxea 08 Mar '18

08 Mar '18

Good morning, I had the intention to integrate Libvirt with Xen, Vmware and KVM. We are in process of migrating to KVM but needed to integrate for some time VMware mainly. Does it support or are plans to, support Vmware ESX/Vcenter 6.X?. Best regards, -- sarenet *Egoitz Aurrekoetxea* Departamento de sistemas 944 209 470 Parque Tecnológico. Edificio 103 48170 Zamudio (Bizkaia) egoitz(a)sarenet.es <mailto:egoitz@sarenet.es> www.sarenet.es <https://www.sarenet.es> Antes de imprimir este correo electrónico piense si es necesario hacerlo.

2 1

[libvirt] [PATCH 0/4] travis: Various improvements
by Andrea Bolognani 08 Mar '18

08 Mar '18

Basically my own spin on https://www.redhat.com/archives/libvir-list/2018-February/msg01106.html Patch 3/4 is actually carried over unchanged from that series. The upstart bit is missing because I'm not too sure about how to deal with it, but it can be solved as a follow-up anyway. Andrea Bolognani (3): travis: Drop precise travis: Run 'make distcheck' during build travis: Run 'make install' during build Daniel P. Berrangé (1): travis: make all builds use VPATH .travis.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.14.3

2 8

[libvirt] [PATCH 0/3] qemu: Misc capabilities cleanups
by Andrea Bolognani 08 Mar '18

08 Mar '18

Please take a deep breath, concentrate and try to visualize a blurb right below this sentence. ... Did it work? Andrea Bolognani (3): qemu: Take full advantage of conditional device property probing qemu: Ignore subsequent attempts to probe device properties qemu: Remove virQEMUCapsProcessProps() src/qemu/qemu_capabilities.c | 115 +++++++-------------- .../qemucapabilitiesdata/caps_1.2.2.x86_64.replies | 102 +++++------------- tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.3.1.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.4.2.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 90 ++++++---------- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 2 +- .../caps_2.10.0-gicv2.aarch64.replies | 100 ++++++------------ .../caps_2.10.0-gicv2.aarch64.xml | 2 +- .../caps_2.10.0-gicv3.aarch64.replies | 100 ++++++------------ .../caps_2.10.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 100 ++++++------------ tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.10.0.s390x.replies | 108 +++++-------------- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 2 +- .../caps_2.10.0.x86_64.replies | 90 +++++++--------- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.11.0.s390x.replies | 108 +++++-------------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 80 ++++++-------- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 82 ++++++--------- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 2 +- .../caps_2.6.0-gicv2.aarch64.replies | 100 ++++++------------ .../caps_2.6.0-gicv2.aarch64.xml | 2 +- .../caps_2.6.0-gicv3.aarch64.replies | 100 ++++++------------ .../caps_2.6.0-gicv3.aarch64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 100 ++++++------------ tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 82 ++++++--------- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.s390x.replies | 104 +++++-------------- tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 82 ++++++--------- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.s390x.replies | 108 +++++-------------- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 82 ++++++--------- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 100 ++++++------------ tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.s390x.replies | 108 +++++-------------- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 +- .../qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 90 +++++++--------- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 2 +- 53 files changed, 838 insertions(+), 1795 deletions(-) -- 2.14.3

2 4

[libvirt] [PATCH 0/6] Fix overly complex parsing of storage encryption/authentication
by Peter Krempa 08 Mar '18

08 Mar '18

Peter Krempa (6): util: storage: Simplify error handling in virStorageAuthDefParseXML util: storage: Sanitize parsing of disk auth XMLs conf: Replace virDomainDiskSourceAuthParse by an XPath query util: storageencryption: Refactor cleanup section in virStorageEncryptionParseXML util: storage: Sanitize parsing of disk encryption XMLs conf: Replace virDomainDiskSourceEncryptionParse by an XPath query src/conf/domain_conf.c | 69 +++++++++-------------------------------- src/conf/storage_conf.c | 5 ++- src/util/virstorageencryption.c | 67 +++++++++++++-------------------------- src/util/virstorageencryption.h | 4 +-- src/util/virstoragefile.c | 53 ++++++++++--------------------- src/util/virstoragefile.h | 3 +- 6 files changed, 59 insertions(+), 142 deletions(-) -- 2.16.2

2 7

[libvirt] [PATCH 0/5] Fix virtlockd loosing locks
by Daniel P. Berrangé 08 Mar '18

08 Mar '18

This is a workaround for the bizarre behaviour whereby the kernel throws away all fcntl() locks on execve()... if any threads are running. We simply make virtlockd & virlogd single threaded instead. Daniel P. Berrangé (5): rpc: push ref acquisition into RPC dispatch function rpc: simplify calling convention of virNetServerClientDispatchFunc rpc: invoke the message dispatch callback with client unlocked rpc: avoid crashing in pre-exec if no workers are present rpc: switch virtlockd and virtlogd to use single-threaded dispatch src/locking/lock_daemon.c | 4 +-- src/logging/log_daemon.c | 4 +-- src/rpc/virnetserver.c | 29 ++++++++++------ src/rpc/virnetserverclient.c | 81 ++++++++++++++++++++++++++++++-------------- src/rpc/virnetserverclient.h | 9 +++-- 5 files changed, 83 insertions(+), 44 deletions(-) -- 2.14.3

3 22

[libvirt] RFC regarding libvirtd deadlock
by Jim Fehlig 08 Mar '18

08 Mar '18

Doing something foolish like # while true; do killall -HUP libvirtd; sleep 1; done # virsh create vm.xml can deadlock libvirtd. Threads of interest are Thread 4 (Thread 0x7fc13b53e700 (LWP 64084)): #0 0x00007fc13fba10bf in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0 #1 0x00007fc14310213c in virCondWait (c=0x7fc110017fa8, m=0x7fc110017f80) at util/virthread.c:154 #2 0x00007fc1280244e9 in qemuMonitorSend (mon=0x7fc110017f70, msg=0x7fc13b53d240) at qemu/qemu_monitor.c:1083 #3 0x00007fc12803bf5a in qemuMonitorJSONCommandWithFd (mon=0x7fc110017f70, cmd=0x7fc110017700, scm_fd=-1, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:305 #4 0x00007fc12803c09c in qemuMonitorJSONCommand (mon=0x7fc110017f70, cmd=0x7fc110017700, reply=0x7fc13b53d318) at qemu/qemu_monitor_json.c:335 ---Type <return> to continue, or q <return> to quit--- #5 0x00007fc12803f116 in qemuMonitorJSONSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor_json.c:1298 #6 0x00007fc128026e14 in qemuMonitorSetCapabilities (mon=0x7fc110017f70) at qemu/qemu_monitor.c:1697 #7 0x00007fc127ffe250 in qemuProcessInitMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START) at qemu/qemu_process.c:1763 #8 0x00007fc127ffe564 in qemuConnectMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:1835 #9 0x00007fc127fff386 in qemuProcessWaitForMonitor (driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=6, logCtxt=0x7fc1100089c0) at qemu/qemu_process.c:2180 #10 0x00007fc128009269 in qemuProcessLaunch (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, asyncJob=QEMU_ASYNC_JOB_START, incoming=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6111 #11 0x00007fc128009e85 in qemuProcessStart (conn=0x7fc1100009a0, driver=0x7fc12004e1e0, vm=0x7fc110003d00, updatedCPU=0x0, asyncJob=QEMU_ASYNC_JOB_START, migrateFrom=0x0, migrateFd=-1, migratePath=0x0, snapshot=0x0, vmop=VIR_NETDEV_VPORT_PROFILE_OP_CREATE, flags=17) at qemu/qemu_process.c:6334 #12 0x00007fc1280552f1 in qemuDomainCreateXML (conn=0x7fc1100009a0, xml=0x7fc110000ed0 "<!--\nWARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE\nOVERWRITTEN AND LOST. Changes to this xml configuration should be made using:\n virsh edit sles12sp2-kvm\nor other applicati"..., flags=0) at qemu/qemu_driver.c:1776 ... Thread 1 (Thread 0x7fc143c66880 (LWP 64081)): #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 #2 0x00007fc1431a394f in virNWFilterWriteLockFilterUpdates () at conf/nwfilter_conf.c:159 #3 0x00007fc12a5230a0 in nwfilterStateReload () at nwfilter/nwfilter_driver.c:299 #4 0x00007fc1433170c2 in virStateReload () at libvirt.c:829 #5 0x0000558c522d5686 in daemonReloadHandler (dmn=0x558c5328b230, sig=0x7ffe0a831e30, opaque=0x0) at remote/remote_daemon.c:724 #6 0x00007fc14321e3c7 in virNetDaemonSignalEvent (watch=2, fd=9, events=1, opaque=0x558c5328b230) at rpc/virnetdaemon.c:654 #7 0x00007fc143085cc7 in virEventPollDispatchHandles (nfds=11, fds=0x558c532cd930) at util/vireventpoll.c:508 #8 0x00007fc143086586 in virEventPollRunOnce () at util/vireventpoll.c:657 #9 0x00007fc143084312 in virEventRunDefaultImpl () at util/virevent.c:327 #10 0x00007fc14321ecb8 in virNetDaemonRun (dmn=0x558c5328b230) at rpc/virnetdaemon.c:858 #11 0x0000558c522d7add in main (argc=3, argv=0x7ffe0a832758) at remote/remote_daemon.c:1496 (gdb) thr 1 [Switching to thread 1 (Thread 0x7fc143c66880 (LWP 64081))] #0 0x00007fc13fb9aac8 in __pthread_rwlock_wrlock_slow () from /lib64/libpthread.so.0 (gdb) f 1 #1 0x00007fc143101ffa in virRWLockWrite (m=0x7fc143678cc0 <updateLock>) at util/virthread.c:122 122 pthread_rwlock_wrlock(&m->lock); (gdb) p updateLock $1 = {lock = {__data = {__lock = 0, __nr_readers = 1, __readers_wakeup = 0, __writer_wakeup = 0, __nr_readers_queued = 0, __nr_writers_queued = 1, __writer = 0, __shared = 0, __rwelision = 0 '\000', __pad1 = "\000\000\000\000\000\000", __pad2 = 0, __flags = 0}, __size = "\000\000\000\000\001", '\000' <repeats 15 times>, "\001", '\000' <repeats 34 times>, __align = 4294967296}} Reloading of the nwfilter driver is stuck waiting for a write lock, which already has a reader (from qemuDomainCreateXML) in the critical section. I'm not really sure how to best fix this deadlock. One hack that avoids the deadlock is to load the nwfilter driver after the hypervisor drivers, as the below patch does. This is obviously problematic if loading a hypervisor driver requires the nwfilter one. Any suggestions on better fixes for this issue? Regards, Jim diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index f8082f62f..7a6655a23 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -327,9 +327,6 @@ static void daemonInitialize(void) #ifdef WITH_SECRETS VIR_DAEMON_LOAD_MODULE(secretRegister, "secret"); #endif -#ifdef WITH_NWFILTER - VIR_DAEMON_LOAD_MODULE(nwfilterRegister, "nwfilter"); -#endif #ifdef WITH_XEN VIR_DAEMON_LOAD_MODULE(xenRegister, "xen"); #endif @@ -354,6 +351,9 @@ static void daemonInitialize(void) #ifdef WITH_VZ VIR_DAEMON_LOAD_MODULE(vzRegister, "vz"); #endif +#ifdef WITH_NWFILTER + VIR_DAEMON_LOAD_MODULE(nwfilterRegister, "nwfilter"); +#endif } #undef VIR_DAEMON_LOAD_MODULE

2 1