- Devel - libvirt List Archives

[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 17 Mar '18

17 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