- Devel - libvirt List Archives

[libvirt] [PATCH] spec: Enable the iscsi-direct storage driver conditionally
by Andrea Bolognani 14 Aug '18

14 Aug '18

Most distributions we build RPMs on don't ship a recent enough version of libiscsi, so we can't enable the driver unconditionally. Add an explicit dependency on the runtime package while at it. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 63834767dd..883c8a49e7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -71,6 +71,13 @@ %define with_storage_zfs 0 %endif +# We need a recent enough libiscsi (>= 1.18.0) +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 + %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1} +%else + %define with_storage_iscsi_direct 0 +%endif + # A few optional bits off by default, we enable later %define with_fuse 0%{!?_without_fuse:0} %define with_sanlock 0%{!?_without_sanlock:0} @@ -319,8 +326,10 @@ BuildRequires: /usr/bin/qemu-img BuildRequires: lvm2 # For pool type=iscsi BuildRequires: iscsi-initiator-utils +%if %{with_storage_iscsi_direct} # For pool type=iscsi-direct BuildRequires: libiscsi-devel +%endif # For disk driver BuildRequires: parted-devel # For Multipath support @@ -593,14 +602,17 @@ The storage driver backend adding implementation of the storage APIs for iscsi volumes using the host iscsi stack. +%if %{with_storage_iscsi_direct} %package daemon-driver-storage-iscsi-direct Summary: Storage driver plugin for iscsi-direct Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} +Requires: libiscsi %description daemon-driver-storage-iscsi-direct The storage driver backend adding implementation of the storage APIs for iscsi volumes using libiscsi direct connection. +%endif %package daemon-driver-storage-mpath @@ -679,8 +691,10 @@ Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} -Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} +%if %{with_storage_iscsi_direct} +Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} +%endif %if %{with_storage_gluster} Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} %endif @@ -1134,6 +1148,12 @@ exit 1 %define arg_wireshark --without-wireshark-dissector %endif +%if %{with_storage_iscsi_direct} + %define arg_storage_iscsi_direct --with-storage-iscsi-direct +%else + %define arg_storage_iscsi_direct --without-storage-iscsi-direct +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1185,7 +1205,7 @@ rm -f po/stamp-po --with-storage-fs \ --with-storage-lvm \ --with-storage-iscsi \ - --with-storage-iscsi-direct \ + %{?arg_storage_iscsi_direct} \ --with-storage-scsi \ --with-storage-disk \ --with-storage-mpath \ @@ -1651,8 +1671,10 @@ exit 0 %files daemon-driver-storage-iscsi %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%if %{with_storage_iscsi_direct} %files daemon-driver-storage-iscsi-direct %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so +%endif %files daemon-driver-storage-mpath %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so -- 2.17.1

2 1

[libvirt] [PATCH] spec: Require libiscsi-devel instead of libiscsi
by Andrea Bolognani 14 Aug '18

14 Aug '18

Commit 34a6962c41b4 added a BuildRequires for the iscsi-direct backend, but we need the headers rather than the runtime package to be available in order to link against the library. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 788483cdd4..63834767dd 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -320,7 +320,7 @@ BuildRequires: lvm2 # For pool type=iscsi BuildRequires: iscsi-initiator-utils # For pool type=iscsi-direct -BuildRequires: libiscsi +BuildRequires: libiscsi-devel # For disk driver BuildRequires: parted-devel # For Multipath support -- 2.17.1

3 3

[libvirt] [PATCH v3 00/11] use GNU C's cleanup attribute in src/util (batch III)
by Sukrit Bhatnagar 14 Aug '18

14 Aug '18

This third series of patches also modifies a few files in src/util to use VIR_AUTOFREE and VIR_AUTOPTR for automatic freeing of memory and get rid of some VIR_FREE macro invocations and *Free function calls. This is meant as a follow-up of the v1 series [1] of the same batch, and contains those patches which were not (completely) pushed upstream. [1] https://www.redhat.com/archives/libvir-list/2018-July/msg01947.html Sukrit Bhatnagar (11): util: iscsi: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netlink: define cleanup function using VIR_DEFINE_AUTOPTR_FUNC util: netlink: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netlink: use VIR_AUTOPTR for aggregate types util: netdevbridge: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdevbridge: use VIR_AUTOPTR for aggregate types util: netdev: use VIR_AUTOFREE instead of VIR_FREE for scalar types util: netdev: use VIR_AUTOPTR for aggregate types util: netdevip: use VIR_AUTOPTR for aggregate types util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types util: qemu: use VIR_AUTOPTR for aggregate types src/util/viriscsi.c | 22 +- src/util/virnetdev.c | 592 ++++++++++++++++------------------------ src/util/virnetdevbridge.c | 81 ++---- src/util/virnetdevip.c | 130 ++++----- src/util/virnetdevopenvswitch.c | 80 ++---- src/util/virnetlink.c | 112 ++++---- src/util/virnetlink.h | 5 + src/util/virqemu.c | 1 + 8 files changed, 397 insertions(+), 626 deletions(-) -- 1.8.3.1

3 28

[libvirt] [PATCH] bhyve: fix process reconnect
by Roman Bogorodskiy 14 Aug '18

14 Aug '18

To reconnect to the bhyve process after deamon restart, a process VM's pid points to is checked to have proctitle equal to 'bhyve: $vmname'. However, there could be a bug in bhyve(8) which prevents it from setting proctitle, so process arguments will look like: ['/usr/sbin/bhyve', ..., 'vmname', NULL] Fall back to checking this format if proctitle doesn't match as a workaround for this bug. --- src/bhyve/bhyve_process.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 9276d7d364..78d6ff1389 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -416,18 +416,28 @@ virBhyveProcessReconnect(virDomainObjPtr vm, if (proc_argv && proc_argv[0]) { if (STREQ(expected_proctitle, proc_argv[0])) { ret = 0; - priv->mon = bhyveMonitorOpen(vm, data->driver); - if (vm->def->ngraphics == 1 && - vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - int vnc_port = vm->def->graphics[0]->data.vnc.port; - if (virPortAllocatorSetUsed(vnc_port) < 0) { - VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", - vnc_port, vm->def->name); - } + } else { + if (STREQ(BHYVE, proc_argv[0])) { + int i = 0; + for (; proc_argv[i+1]; i++); + if ((i != 0) && (STREQ(vm->def->name, proc_argv[i]))) + ret = 0; } } } + if (ret == 0) { + priv->mon = bhyveMonitorOpen(vm, data->driver); + if (vm->def->ngraphics == 1 && + vm->def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { + int vnc_port = vm->def->graphics[0]->data.vnc.port; + if (virPortAllocatorSetUsed(vnc_port) < 0) { + VIR_WARN("Failed to mark VNC port '%d' as used by '%s'", + vnc_port, vm->def->name); + } + } + } + cleanup: if (ret < 0) { /* If VM is reported to be in active state, but we cannot find -- 2.18.0

3 2

[libvirt] [dockerfiles PATCH] Refresh after switch from jansson to yajl
by Andrea Bolognani 14 Aug '18

14 Aug '18

The corresponding libvirt-jenkins-ci commit is f188ff6a7ceb. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed under the Dockerfile refresh rule. buildenv-centos-7.Dockerfile | 4 ++-- buildenv-debian-8.Dockerfile | 2 +- buildenv-debian-9.Dockerfile | 2 +- buildenv-debian-sid.Dockerfile | 2 +- buildenv-fedora-27.Dockerfile | 2 +- buildenv-fedora-28.Dockerfile | 2 +- buildenv-fedora-rawhide.Dockerfile | 2 +- buildenv-ubuntu-16.Dockerfile | 2 +- buildenv-ubuntu-18.Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildenv-centos-7.Dockerfile b/buildenv-centos-7.Dockerfile index 896bf68..cce63fc 100644 --- a/buildenv-centos-7.Dockerfile +++ b/buildenv-centos-7.Dockerfile @@ -23,7 +23,6 @@ ENV PACKAGES audit-libs-devel \ gnutls-devel \ iproute \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -64,7 +63,8 @@ ENV PACKAGES audit-libs-devel \ scrub \ sudo \ systemtap-sdt-devel \ - vim + vim \ + yajl-devel RUN yum update -y && \ yum install -y ${PACKAGES} && \ yum autoremove -y && \ diff --git a/buildenv-debian-8.Dockerfile b/buildenv-debian-8.Dockerfile index 8877528..cdf38d3 100644 --- a/buildenv-debian-8.Dockerfile +++ b/buildenv-debian-8.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-9.Dockerfile b/buildenv-debian-9.Dockerfile index 0592c97..ff8de7c 100644 --- a/buildenv-debian-9.Dockerfile +++ b/buildenv-debian-9.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-debian-sid.Dockerfile b/buildenv-debian-sid.Dockerfile index 2d0310d..d06c1e0 100644 --- a/buildenv-debian-sid.Dockerfile +++ b/buildenv-debian-sid.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -51,6 +50,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-fedora-27.Dockerfile b/buildenv-fedora-27.Dockerfile index 09ec721..9953e1c 100644 --- a/buildenv-fedora-27.Dockerfile +++ b/buildenv-fedora-27.Dockerfile @@ -27,7 +27,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-fedora-28.Dockerfile b/buildenv-fedora-28.Dockerfile index 60afba5..6e3587f 100644 --- a/buildenv-fedora-28.Dockerfile +++ b/buildenv-fedora-28.Dockerfile @@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -72,6 +71,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-fedora-rawhide.Dockerfile b/buildenv-fedora-rawhide.Dockerfile index 33b47e1..e7d1fd3 100644 --- a/buildenv-fedora-rawhide.Dockerfile +++ b/buildenv-fedora-rawhide.Dockerfile @@ -26,7 +26,6 @@ ENV PACKAGES audit-libs-devel \ iproute \ iproute-tc \ iscsi-initiator-utils \ - jansson-devel \ libacl-devel \ libattr-devel \ libblkid-devel \ @@ -96,6 +95,7 @@ ENV PACKAGES audit-libs-devel \ vim \ wireshark-devel \ xen-devel \ + yajl-devel \ zfs-fuse RUN yum update -y && \ yum install -y ${PACKAGES} && \ diff --git a/buildenv-ubuntu-16.Dockerfile b/buildenv-ubuntu-16.Dockerfile index c904c6e..d28b9aa 100644 --- a/buildenv-ubuntu-16.Dockerfile +++ b/buildenv-ubuntu-16.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ diff --git a/buildenv-ubuntu-18.Dockerfile b/buildenv-ubuntu-18.Dockerfile index bbd32c1..14abd98 100644 --- a/buildenv-ubuntu-18.Dockerfile +++ b/buildenv-ubuntu-18.Dockerfile @@ -29,7 +29,6 @@ ENV PACKAGES augeas-tools \ libdevmapper-dev \ libfuse-dev \ libgnutls28-dev \ - libjansson-dev \ libnetcf-dev \ libnl-3-dev \ libnl-route-3-dev \ @@ -52,6 +51,7 @@ ENV PACKAGES augeas-tools \ libxen-dev \ libxml2-dev \ libxml2-utils \ + libyajl-dev \ lvm2 \ make \ nfs-common \ -- 2.17.1

1 0

[libvirt] [jenkins-ci PATCH 0/4] Switch back from jansson to yajl
by Andrea Bolognani 14 Aug '18

14 Aug '18

A straighforward revert of e1575b08511f..d2bbe1eee61a. Andrea Bolognani (4): guests: Re-introduce yajl kludge guests: Add yajl mapping guests: Install yajl for libvirt guests: Don't install jansson for libvirt guests/playbooks/update/tasks/kludges.yml | 2 ++ guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) -- 2.17.1

2 5

[libvirt] [PATCH] Fix build on non-linux platforms after another VIR_AUTOPTR patches
by Erik Skultety 14 Aug '18

14 Aug '18

Caused by commit f7d0663d49. The problem is missing libnl library on these platforms, so the VIR_DEFINE_AUTOPTR_FUNC has to be compiled in conditionally. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Checked with Travis CI, local fedora with MinGW and FreeBSD, thus pushed under the build breaker rule. src/util/virnetlink.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 136b42b995..1e1e616b41 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -36,6 +36,9 @@ # undef inline # endif +typedef struct nl_msg virNetlinkMsg; +VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free) + # else struct nl_msg; @@ -45,8 +48,6 @@ struct nlmsghdr; # endif /* __linux__ */ -typedef struct nl_msg virNetlinkMsg; - int virNetlinkStartup(void); void virNetlinkShutdown(void); @@ -126,6 +127,4 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, unsigned int protocol); -VIR_DEFINE_AUTOPTR_FUNC(virNetlinkMsg, nlmsg_free) - #endif /* __VIR_NETLINK_H__ */ -- 2.14.4

1 0

[libvirt] [PATCH v2 0/3] conf: standardize naming
by Anya Harter 14 Aug '18

14 Aug '18

on vir*ObjListExport call stack Anya Harter (3): conf: rename structs used by Export function conf: rename Export Callback functions conf: rename Match functions src/conf/virinterfaceobj.c | 16 +++++++++------- src/conf/virnetworkobj.c | 24 ++++++++++++----------- src/conf/virnodedeviceobj.c | 14 ++++++++------ src/conf/virsecretobj.c | 14 ++++++++------ src/conf/virstorageobj.c | 38 ++++++++++++++++++++----------------- 5 files changed, 59 insertions(+), 47 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH 0/4] Extend apparmor rules for libvirt 4.6
by Christian Ehrhardt 14 Aug '18

14 Aug '18

Hi, this is a summary of things I had to touch recently when working on 4.6. The first two patches are re-submissions and modifications of last year which were never totally challenged, but also not pushed yet (I had no permissions yet back then). The first was lost in a discussion about virt-aa-helper, whicih eventually turned out to be clear that it could not help in that case. - https://www.redhat.com/archives/libvir-list/2017-February/msg01598.html - https://www.redhat.com/archives/libvir-list/2017-March/msg00052.html The second even got a few Acks, but neither made it into upstream yet. Parts of it where introduced already, in 7edcbd02 apparmor: allow libvirt to send term signal to unconfined b482925c apparmor: support ptrace checks But there are still signals blocked with those rules, so I resubmit the remaining bit. Also I added the Acks to the resubmission. The third change came in recently via various bug reports which I finally wanted to adress - e.g. for ceph lib or smb. If we later on spot more cases that have predictable safe paths under /tmp we can add those. Finally the forth change was triggered by me testing libvirt 4.6 in various conditions. Some of them were in containers, and the new libvirt behavior to carry more mount points into the qemu namespace triggers the need to rewrite the existing mount-moving rules that we added last year. Christian Ehrhardt (4): apparmor: allow openGraphicsFD for virt manager >1.4 apparmor: add mediation rules for unconfined guests apparmor: allow expected /tmp access patterns apparmor: allow to preserve /dev mountpoints into qemu namespaces examples/apparmor/libvirt-qemu | 13 +++++++++++++ examples/apparmor/usr.sbin.libvirtd | 24 +++++++++++++----------- 2 files changed, 26 insertions(+), 11 deletions(-) -- 2.17.1

2 11

[libvirt] [PATCH v2 RESEND 00/17] Introduce RDT memory bandwidth allocation support
by bing.niu＠intel.com 14 Aug '18

14 Aug '18

From: Bing Niu <bing.niu(a)intel.com> This series is to introduce RDT memory bandwidth allocation support by extending current virresctrl implementation. The Memory Bandwidth Allocation (MBA) feature provides indirect and approximate control over memory bandwidth available per-core. This feature provides a method to control applications which may be over-utilizing bandwidth relative to their priority in environments such as the data-center. The details can be found in Intel's SDM 17.19.7. Kernel supports MBA through resctrl file system same as CAT. Each resctrl group have a MB parameter to control how much memory bandwidth it can utilize in unit of percentage. In this series, MBA is enabled by enhancing existing virresctrl implementation. The policy employed for MBA is similar with CAT: The sum of each MBA group's bandwidth dose not exceed 100%. The enhancement of virresctrl include two main parts: Part 1: Add two new structures virResctrlInfoMemMB and virResctrlAllocMemBW for collecting host system MBA capability and domain memory bandwidth allocation. Those two structures are the extension of existing virResctrlInfo and virResctrlAlloc. With them, virresctrl framework can support MBA and CAT concurrently. Each virResctrlAlloc represent a resource allocation including CAT, or MBA, or CAT&MBA. The policy of MBA is that: total memory bandwidth of each resctrl group, created by virresctrl, does not exceed to 100%. Part 2: On XML part, add new elements to host capabilities query and domain allocation to support memory bandwidth allocation. --------------------------------------------------------------------------------------------- For host capabilities XML, new XML format like below example, <host> ..... <memory_bandwidth> <node id='0' cpus='0-19'> <control granularity='10' min ='10' maxAllocs='8'/> </node> </memory_bandwidth> </host> granularity --- memory bandwidth granularity min --- minimum memory bandwidth allowed maxAllocs --- maximum concurrent memory bandwidth allocation allowed. --------------------------------------------------------------------------------------------- For domain XML, new format as below example <domain type='kvm' id='2'> ...... <cputune> ...... <shares>1024</shares> <memorytune vcpus='0-1'> <node id='0' bandwidth='20'/> </memorytune> </cputune> ...... </domain> id --- node where memory bandwidth allocation will happen bandwidth --- bandwidth allocated in percentage ---------------------------------------------------------------------------------------------- With this extension of the virresctrl, the overall working follow of CAT and MBA is described by below picture. XML parser will aggregate MBA and CAT configuration and represents it in one virresctrl object. The methods of virresctrl class will manipulate resctrl interface to allocate corresponding resources. <memorytune cpus='0-3'> +---------+ | <cachetune vcpus='0-3'> XML | + parser +-----------+ | | +------------------------------+ | | internal object +------v--------------+ virResctrlAlloc | backing object | +------+--------------+ | | +------------------------------+ | +--v-------+ | | | schemata | /sys/fs/resctrl | tasks | | . | | . | | | +----------+ --------------------------------------------------------------------- previous versions and discussion can be found at v1: https://www.redhat.com/archives/libvir-list/2018-July/msg01144.html RFC v2: https://www.redhat.com/archives/libvir-list/2018-June/msg01268.html RFC v1: https://www.redhat.com/archives/libvir-list/2018-May/msg02101.html Changelog: v1 -> this: John's comment: 1. Split calculation of number of memory bandwidth control to one patch. 2. Split virResctrlAllocMemBW relating methods to 5 patch, each provides one kind of function, eg: schemata processing, memory bandwidth calculation..... 3. Use resctrl to replace cachetune in domain conf. 4. Split refactor virDomainCachetuneDefParse into 3 patches. And adjust some logic, eg: use %s format error log, renaming functions..... 5. Complete doc description. eg: update cachetune part about vcpus overlapping with memorytune, update libvirt version info for memory bandwidth control availability. 6. Some coding style fix. RFC_v2->v1: John's comment: 1. use name MemBW to replace MB for a more clear description. 2. split rename patch and put refactor function part separately. 3. split virResctrlInfoMemMB and virResctrlAllocMemBW to different patches. 4. add docs/schemas/*.rng for XML related patches. 5. some cleanup for coding conventions. RFC_ v1->RFC_v2: Jano's comment: 1. put renaming parts into separated patches. 2. set the initial return value as -1. 3. using full name in structure definition. 4. do not use VIR_CACHE_TYPE_LAST for memory bandwidth allocation formatting. Pavel's comment: 1. add host capabilities XML for memory bandwidth allocation. 2. do not mix use cachetune section in XML for memory bandwidth allocation in domain XML. define a dedicated one for memory bandwidth allocation. Bing Niu (17): util: Rename some functions of virresctrl util: Refactor virResctrlGetInfo in virresctrl util: Refactor virResctrlAllocFormat of virresctrl util: Add MBA capability information query to resctrl util: Add MBA check to virResctrlInfoGetCache util: Add MBA allocation to virresctrl util: Add MBA schemata parse and format methods util: Add support to calculate MBA utilization util: Introduce virResctrlAllocForeachMemory util: Introduce virResctrlAllocSetMemoryBandwidth conf: Rename cachetune to resctrl conf: Factor out vcpus parsing part from virDomainCachetuneDefParse conf: Factor out vcpus overlapping from virDomainCachetuneDefParse conf: Factor out virDomainResctrlDef update from virDomainCachetuneDefParse conf: Add support for memorytune XML processing for resctrl MBA conf: Add return value check to virResctrlAllocForeachCache conf: Add memory bandwidth allocation capability of host docs/formatdomain.html.in | 39 +- docs/schemas/capability.rng | 33 ++ docs/schemas/domaincommon.rng | 17 + src/conf/capabilities.c | 107 ++++ src/conf/capabilities.h | 11 + src/conf/domain_conf.c | 428 ++++++++++++--- src/conf/domain_conf.h | 10 +- src/libvirt_private.syms | 6 +- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_process.c | 18 +- src/util/virresctrl.c | 611 +++++++++++++++++++-- src/util/virresctrl.h | 55 +- .../memorytune-colliding-allocs.xml | 30 + .../memorytune-colliding-cachetune.xml | 32 ++ tests/genericxml2xmlindata/memorytune.xml | 33 ++ tests/genericxml2xmltest.c | 5 + .../linux-resctrl/resctrl/info/MB/bandwidth_gran | 1 + .../linux-resctrl/resctrl/info/MB/min_bandwidth | 1 + .../linux-resctrl/resctrl/info/MB/num_closids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 8 + tests/virresctrldata/resctrl.schemata | 1 + 21 files changed, 1280 insertions(+), 169 deletions(-) create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-allocs.xml create mode 100644 tests/genericxml2xmlindata/memorytune-colliding-cachetune.xml create mode 100644 tests/genericxml2xmlindata/memorytune.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/bandwidth_gran create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/min_bandwidth create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/MB/num_closids -- 2.7.4

3 26

[libvirt] [PATCH 0/1] bhyve: Make LPC slot number configurable
by Ivan Mishonov 13 Aug '18

13 Aug '18

Windows UEFI guests didn't have working keyboard input through VNC when LPC is on slot 1. The FreeBSD Handbook examples use slot 31 for UEFI guests. Borrowed most of the code from the qemu:commandline implementation and made LPC slot number configurable e.g. <domain type='bhyve' xmlns:bhyve='http://libvirt.org/schemas/domain/bhyve/1.0'> <bhyve:lpcslotnumber value='31'/> Ivan Mishonov (1): bhyve: Make LPC slot number configurable docs/schemas/domaincommon.rng | 15 ++++++ src/bhyve/bhyve_command.c | 7 ++- src/bhyve/bhyve_conf.c | 12 +++++ src/bhyve/bhyve_conf.h | 9 ++++ src/bhyve/bhyve_device.c | 16 ++++--- src/bhyve/bhyve_domain.c | 86 ++++++++++++++++++++++++++++++++++- src/bhyve/bhyve_domain.h | 1 + 7 files changed, 138 insertions(+), 8 deletions(-) -- 2.17.1

4 17

[libvirt] [PATCH] esx: Fix build when libcurl debug is enabled
by Marcos Paulo de Souza 13 Aug '18

13 Aug '18

When building libvirt with libcurl debug enabled (with ESX_VI__CURL__ENABLE_DEBUG_OUTPUT set), the message bellow pops up: make[3]: Entering directory '/mnt/data/gitroot/libvirt/src' CC esx/libvirt_driver_esx_la-esx_vi.lo esx/esx_vi.c: In function 'esxVI_CURL_Debug': esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_SSL_DATA_IN' not handled in switch [-Werror=switch-enum] switch (type) { ^~~~~~ esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_SSL_DATA_OUT' not handled in switch [-Werror=switch-enum] esx/esx_vi.c:191:5: error: enumeration value 'CURLINFO_END' not handled in switch [-Werror=switch-enum] Our build requires at least libcurl 7.18.0, which is pretty stable since it was release in 2008. Fix this problem by handling the mentioned enums in the code. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- src/esx/esx_vi.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index a816c3a4f9..588670e137 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -163,7 +163,7 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) return 0; } -#define ESX_VI__CURL__ENABLE_DEBUG_OUTPUT 0 +#define ESX_VI__CURL__ENABLE_DEBUG_OUTPUT 1 #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT static int @@ -205,13 +205,19 @@ esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, break; case CURLINFO_DATA_IN: + case CURLINFO_SSL_DATA_IN: VIR_DEBUG("CURLINFO_DATA_IN [[[[%s]]]]", buffer); break; case CURLINFO_DATA_OUT: + case CURLINFO_SSL_DATA_OUT: VIR_DEBUG("CURLINFO_DATA_OUT [[[[%s]]]]", buffer); break; + case CURLINFO_END: + VIR_DEBUG("CURLINFO_END [[[[%s]]]]", buffer); + break; + default: VIR_DEBUG("unknown"); break; -- 2.17.1

2 3

[libvirt] [PATCH] rpm: simplify applying of patches
by Daniel P. Berrangé 13 Aug '18

13 Aug '18

The distros we support for RPM builds all have %autosetup support so we can ditch the convoluted code for running git manually and use the RPM defaults. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- libvirt.spec.in | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 19ae55cdaf..a2f3112a0b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -993,43 +993,7 @@ Libvirt plugin for NSS for translating domain names into IP addresses. %prep -%setup -q - -# Patches have to be stored in a temporary file because RPM has -# a limit on the length of the result of any macro expansion; -# if the string is longer, it's silently cropped -%{lua: - tmp = os.tmpname(); - f = io.open(tmp, "w+"); - count = 0; - for i, p in ipairs(patches) do - f:write(p.."\n"); - count = count + 1; - end; - f:close(); - print("PATCHCOUNT="..count.."\n") - print("PATCHLIST="..tmp.."\n") -} - -git init -q -git config user.name rpm-build -git config user.email rpm-build -git config gc.auto 0 -git add . -git commit -q -a --author 'rpm-build <rpm-build>' \ - -m '%{name}-%{version} base' - -COUNT=$(grep '\.patch$' $PATCHLIST | wc -l) -if [ $COUNT -ne $PATCHCOUNT ]; then - echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT" - exit 1 -fi -if [ $COUNT -gt 0 ]; then - xargs git am <$PATCHLIST || exit 1 -fi -echo "Applied $COUNT patches" -rm -f $PATCHLIST -rm -rf .git +%autosetup -S git_am %build %if ! %{supported_platform} -- 2.17.1

3 3

[libvirt] [PATCH] qemu_migration: Avoid writing to freed memory
by Jiri Denemark 13 Aug '18

13 Aug '18

When a domain is killed on the source host while it is being migrated and libvirtd is waiting for the migration to finish (waiting for the domain condition in qemuMigrationSrcWaitForCompletion), the run-time state including priv->job.current may already be freed once virDomainObjWait returns with -1. Thus the priv->job.current pointer cached in jobInfo is no longer valid and setting jobInfo->status may crash the daemon. https://bugzilla.redhat.com/show_bug.cgi?id=1593137 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 435cd174af..825a9d399b 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1584,7 +1584,8 @@ qemuMigrationSrcWaitForCompletion(virQEMUDriverPtr driver, if (events) { if (virDomainObjWait(vm) < 0) { - jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED; + if (virDomainObjIsActive(vm)) + jobInfo->status = QEMU_DOMAIN_JOB_STATUS_FAILED; return -2; } } else { -- 2.18.0

3 2

[libvirt] [PATCH] spec: Use %make_install
by Cole Robinson 13 Aug '18

13 Aug '18

It's on RHEL7, saves a bit of typing, and lets us drop the comment Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- There's also a %make_build macro which handles smp_mflags, but it uses make -O which makes build output noisier at least libvirt.spec.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4113579e47..01f4e07b1c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1255,10 +1255,7 @@ rm -fr %{buildroot} export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) -# Avoid using makeinstall macro as it changes prefixes rather than setting -# DESTDIR. Newer make_install macro would be better but it's not available -# on RHEL 5, thus we need to expand it here. -make %{?_smp_mflags} install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} V=1 +%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1 make %{?_smp_mflags} -C examples distclean V=1 -- 2.17.1

3 2

[libvirt] [PATCH] vircgroup: fix MinGW build
by Pavel Hrdina 13 Aug '18

13 Aug '18

Broken by commit <901d2b9c87>. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. src/util/vircgroup.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0ed83932ac..df38bb77e0 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -4335,6 +4335,21 @@ virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED, } +int +virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED, + unsigned long long *cache ATTRIBUTE_UNUSED, + unsigned long long *activeAnon ATTRIBUTE_UNUSED, + unsigned long long *inactiveAnon ATTRIBUTE_UNUSED, + unsigned long long *activeFile ATTRIBUTE_UNUSED, + unsigned long long *inactiveFile ATTRIBUTE_UNUSED, + unsigned long long *unevictable ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + + int virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED, unsigned long *kb ATTRIBUTE_UNUSED) -- 2.17.1

1 0

[libvirt] [PATCH 00/16] Revert Jansson usage
by Ján Tomko 13 Aug '18

13 Aug '18

For QEMU, we need a JSON parser that is able to handle its non-compliant JSON usage: https://bugzilla.redhat.com/show_bug.cgi?id=1614569 Unfortunately, this does not seem to be possible with Jansson. Revert back to using yajl, which also lets us get rid of the 'dlopen' hacks and their bugfixes. (The QEMU default changes are not strictly required, but the patches specifically use JANSSON) Also available on: git://repo.or.cz/libvirt/jtomko.git revert Ján Tomko (16): Revert "src: Move DLOPEN_LIBS to libraries introducing the dependency" Revert "Fix link errors in tools/nss and tests" Revert "remote: daemon: Make sure that JSON symbols are properly loaded at startup" Revert "util: jsoncompat: Stub out virJSONInitialize when compiling without jansson" Revert "tests: qemucapsprobe: Fix output after switching to jansson" Revert "util: avoid symbol clash between json libraries" Revert "tests: also skip qemuagenttest with old jansson" Revert "m4: Introduce STABLE_ORDERING_JANSSON" Revert "build: require Jansson if QEMU driver is enabled" Revert "build: switch --with-qemu default from yes to check" Revert "Remove virJSONValueNewStringLen" Revert "build: remove references to WITH_YAJL for SETUID_RPC_CLIENT" Revert "Remove functions using yajl" Revert "Switch from yajl to Jansson" Revert "build: undef WITH_JANSSON for SETUID_RPC_CLIENT" Revert "build: add --with-jansson" config-post.h | 3 +- configure.ac | 3 - libvirt.spec.in | 6 +- m4/virt-driver-qemu.m4 | 9 +- m4/virt-jansson.m4 | 32 -- m4/virt-nss.m4 | 4 +- m4/virt-yajl.m4 | 27 +- src/Makefile.am | 14 +- src/libvirt_private.syms | 5 +- src/qemu/qemu_driver.c | 2 +- src/remote/remote_daemon.c | 4 - src/util/Makefile.inc.am | 6 +- src/util/virjson.c | 617 ++++++++++++++++++++++++------- src/util/virjson.h | 1 + src/util/virjsoncompat.c | 285 -------------- src/util/virjsoncompat.h | 88 ----- tests/Makefile.am | 12 +- tests/cputest.c | 16 +- tests/libxlxml2domconfigtest.c | 4 +- tests/qemuagenttest.c | 4 +- tests/qemublocktest.c | 6 - tests/qemucapabilitiestest.c | 7 +- tests/qemucaps2xmltest.c | 2 +- tests/qemucapsprobemock.c | 2 - tests/qemucommandutiltest.c | 7 +- tests/qemuhotplugtest.c | 7 +- tests/qemumigparamsdata/empty.json | 4 +- tests/qemumigparamsdata/unsupported.json | 4 +- tests/qemumigparamstest.c | 7 +- tests/qemumonitorjsontest.c | 7 +- tests/virjsontest.c | 5 - tests/virmacmaptest.c | 5 - tests/virmacmaptestdata/empty.json | 4 +- tests/virmocklibxl.c | 4 +- tests/virnetdaemontest.c | 7 +- tests/virstoragetest.c | 4 +- tools/Makefile.am | 6 +- 37 files changed, 557 insertions(+), 673 deletions(-) delete mode 100644 m4/virt-jansson.m4 delete mode 100644 src/util/virjsoncompat.c delete mode 100644 src/util/virjsoncompat.h -- 2.16.1

3 20

[libvirt] [PATCH] qemu: Prefer nvdimmPath over hugepages for memory-backend-file
by Michal Privoznik 13 Aug '18

13 Aug '18

If a domain has hugepages configured and we're currently building memory-backend-file for a nvdimm device that domain has we will put hugepages path onto the command line. It should have been nvdimm path configured in the XML. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_command.c | 10 ++-- .../hugepages-nvdimm.x86_64-latest.args | 38 ++++++++++++++ tests/qemuxml2argvdata/hugepages-nvdimm.xml | 59 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmloutdata/hugepages-nvdimm.xml | 1 + tests/qemuxml2xmltest.c | 1 + 6 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/hugepages-nvdimm.xml create mode 120000 tests/qemuxml2xmloutdata/hugepages-nvdimm.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a3fadc505d..ddb90895e0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3148,14 +3148,14 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps, if (useHugepage || mem->nvdimmPath || memAccess || def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) { - if (useHugepage) { - if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) - goto cleanup; - prealloc = true; - } else if (mem->nvdimmPath) { + if (mem->nvdimmPath) { if (VIR_STRDUP(memPath, mem->nvdimmPath) < 0) goto cleanup; prealloc = true; + } else if (useHugepage) { + if (qemuGetDomainHupageMemPath(def, cfg, pagesize, &memPath) < 0) + goto cleanup; + prealloc = true; } else { /* We can have both pagesize and mem source. If that's the case, * prefer hugepages as those are more specific. */ diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args new file mode 100644 index 0000000000..3a6dd364da --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.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-i686 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \ +-m size=1048576k,slots=16,maxmem=1099511627776k \ +-realtime mlock=off \ +-smp 2,sockets=2,cores=1,threads=1 \ +-object memory-backend-file,id=ram-node0,prealloc=yes,\ +mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=yes,size=1073741824 \ +-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ +-object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\ +share=yes,size=536870912 \ +-device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ +-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml new file mode 100644 index 0000000000..cdc409ff32 --- /dev/null +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml @@ -0,0 +1,59 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory> + <memory unit='KiB'>1267710</memory> + <currentMemory unit='KiB'>1267710</currentMemory> + <memoryBacking> + <hugepages> + <page size='2048' unit='KiB'/> + </hugepages> + <access mode='shared'/> + </memoryBacking> + <vcpu placement='static' cpuset='0-1'>2</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu> + <topology sockets='2' cores='1' threads='1'/> + <numa> + <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/> + </numa> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-i686</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <controller type='usb' index='0'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> + </controller> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <memballoon model='virtio'> + <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> + </memballoon> + <memory model='nvdimm'> + <source> + <path>/tmp/nvdimm</path> + </source> + <target> + <size unit='KiB'>523264</size> + <node>0</node> + </target> + <address type='dimm' slot='0'/> + </memory> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 96482a84a1..8a7b82a1f2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -994,6 +994,7 @@ mymain(void) DO_TEST_FAILURE("hugepages-memaccess3", QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); DO_TEST("disk-cdrom", NONE); DO_TEST_CAPS_LATEST("disk-cdrom"); diff --git a/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml new file mode 120000 index 0000000000..8288d3c58f --- /dev/null +++ b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/hugepages-nvdimm.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7fe5043519..8e58c7b844 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -339,6 +339,7 @@ mymain(void) DO_TEST("hugepages-shared", NONE); DO_TEST("hugepages-memaccess", NONE); DO_TEST("hugepages-memaccess2", NONE); + DO_TEST("hugepages-nvdimm", NONE); DO_TEST("nosharepages", NONE); DO_TEST("restore-v2", NONE); DO_TEST("migrate", NONE); -- 2.16.4

2 1

[libvirt] [PATCH] virsh: Add missed fields to pool-define-as item entry
by John Ferlan 13 Aug '18

13 Aug '18

Commit id d45bee449 updated the pool-define-as qualifier descriptions to add some new fields, but neglected to modify the command item list in order to add those fields as well. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Discovered by QE while validating bz1601377. tools/virsh.pod | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index a5e02c62cd..4e118851f8 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3831,7 +3831,9 @@ just I<--build> is provided, then B<pool-build> is called with no flags. [I<--auth-type authtype> I<--auth-username username> [I<--secret-usage usage> | I<--secret-uuid uuid>]] [[I<--adapter-name name>] | [I<--adapter-wwnn> wwnn I<--adapter-wwpn> wwpn] -[I<--adapter-parent parent>]] +[I<--adapter-parent parent> | + I<--adapter-parent-wwnn parent_wwnn> I<adapter-parent-wwpn parent_wwpn> | + I<--adapter-parent-fabric-wwn parent_fabric_wwn>]] [I<--build>] [[I<--overwrite>] | [I<--no-overwrite>]] [I<--print-xml>] -- 2.17.1

2 1

[libvirt] [PATCH] esx: Fix nodeGetInfo so cpu model fits inside nodeinfo->model
by Marcos Paulo de Souza 13 Aug '18

13 Aug '18

Commit 6c0d0210cbcd5d647f0d882c07f077d444bc707d changed the behavior of virStr*cpy* functions, so now the nodeGetInfo call fails. Version 4.1.0 (default for Fedora 28) works: Model: Intel Core i7-4500U CPU @ 1.80G Current master tries to write "Intel Core i7-4500U CPU @ 1.80GHz", but the string is bigger than nodeinfo->model (which is a char[32]). So this patch "cuts" the string, and presents the same output from 4.1.0. Signed-off-by: Marcos Paulo de Souza <marcos.souza.org(a)gmail.com> --- When testing both qemu and lxc drivers, both return "x86_64", as both call virCapabilitiesGetNodeInfo in order the get all info the "node", but they are a Linux machine. When it comes to ESX, it returns a string from the ESX server, which is same info that I can find in /proc/cpuinfo of my machine (but without the () parts): model name : Intel(R) Core(TM) i7-4500U CPU @ 1.80GHz The question is: should libvirt increase the model size, or just find a better way for ESX to present this info? src/esx/esx_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index c2154799fa..03a84d7630 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1317,6 +1317,8 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) ++ptr; } + /* Make sure the string fits in mode */ + dynamicProperty->val->string[sizeof(nodeinfo->model) - 1] = '\0'; if (virStrcpyStatic(nodeinfo->model, dynamicProperty->val->string) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("CPU Model %s too long for destination"), -- 2.17.1

2 1

[libvirt] [PATCH] spec: Add libvirt-daemon-driver-storage-iscsi-direct
by Cole Robinson 13 Aug '18

13 Aug '18

Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- libvirt.spec.in | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 3edb60d2d2..09e69a9309 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -317,8 +317,10 @@ BuildRequires: /usr/bin/qemu-img %endif # For LVM drivers BuildRequires: lvm2 -# For ISCSI driver +# For pool type=iscsi BuildRequires: iscsi-initiator-utils +# For pool type=iscsi-direct +BuildRequires: libiscsi # For disk driver BuildRequires: parted-devel # For Multipath support @@ -591,6 +593,16 @@ The storage driver backend adding implementation of the storage APIs for iscsi volumes using the host iscsi stack. +%package daemon-driver-storage-iscsi-direct +Summary: Storage driver plugin for iscsi-direct +Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} +Requires: libvirt-libs = %{version}-%{release} + +%description daemon-driver-storage-iscsi-direct +The storage driver backend adding implementation of the storage APIs for iscsi +volumes using libiscsi direct connection. + + %package daemon-driver-storage-mpath Summary: Storage driver plugin for multipath volumes Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} @@ -667,6 +679,7 @@ Requires: libvirt-daemon-driver-storage-disk = %{version}-%{release} Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release} Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release} Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release} +Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release} Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release} %if %{with_storage_gluster} Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} @@ -1174,6 +1187,7 @@ rm -f po/stamp-po --with-storage-fs \ --with-storage-lvm \ --with-storage-iscsi \ + --with-storage-iscsi-direct \ --with-storage-scsi \ --with-storage-disk \ --with-storage-mpath \ @@ -1639,6 +1653,9 @@ exit 0 %files daemon-driver-storage-iscsi %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so +%files daemon-driver-storage-iscsi-direct +%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so + %files daemon-driver-storage-mpath %{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so -- 2.17.1

2 1

[libvirt] [PATCH 1/2] Add API for printing tables.
by Simon Kobyda 13 Aug '18

13 Aug '18

It solves problems with alignment of columns. Width of each column is calculated by its biggest cell. Should solve unicode bug. In future, it may be implemented in virsh, virt-admin... This API has 5 public functions: - vshTableNew - adds new table and defines its header - vshTableRowAppend - appends new row (for same number of columns as in header) - vshTablePrintToStdout - vshTablePrintToString - vshTableFree https://bugzilla.redhat.com/show_bug.cgi?id=1574624 https://bugzilla.redhat.com/show_bug.cgi?id=1584630 Signed-off-by: Simon Kobyda <skobyda(a)redhat.com> --- tools/Makefile.am | 4 +- tools/vsh-table.c | 367 ++++++++++++++++++++++++++++++++++++++++++++++ tools/vsh-table.h | 42 ++++++ 3 files changed, 412 insertions(+), 1 deletion(-) create mode 100644 tools/vsh-table.c create mode 100644 tools/vsh-table.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 26c887649e..ed23575aa7 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -144,7 +144,9 @@ libvirt_shell_la_LIBADD = \ $(READLINE_LIBS) \ ../gnulib/lib/libgnu.la \ $(NULL) -libvirt_shell_la_SOURCES = vsh.c vsh.h +libvirt_shell_la_SOURCES = \ + vsh.c vsh.h \ + vsh-table.c vsh-table.h virt_host_validate_SOURCES = \ virt-host-validate.c \ diff --git a/tools/vsh-table.c b/tools/vsh-table.c new file mode 100644 index 0000000000..11dc807ba9 --- /dev/null +++ b/tools/vsh-table.c @@ -0,0 +1,367 @@ +/* + * vsh-table.c: table printing helper + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Simon Kobyda <skobyda(a)redhat.com> + * + */ + +#include <config.h> +#include "vsh-table.h" +#include "virsh-util.h" + +#include <string.h> +#include <stdarg.h> +#include <stddef.h> + +#include "viralloc.h" +#include "virbuffer.h" +#include "virstring.h" + +typedef void (*vshPrintCB)(vshControl *ctl, const char *fmt, ...); + +struct _vshTableRow { + char **cells; + size_t ncells; +}; + +struct _vshTable { + vshTableRowPtr *rows; + size_t nrows; +}; + +static void +vshTableRowFree(vshTableRowPtr row) +{ + size_t i; + + if (!row) + return; + + for (i = 0; i < row->ncells; i++) + VIR_FREE(row->cells[i]); + + VIR_FREE(row->cells); + VIR_FREE(row); +} + +void +vshTableFree(vshTablePtr table) +{ + size_t i; + + if (!table) + return; + + for (i = 0; i < table->nrows; i++) + vshTableRowFree(table->rows[i]); + VIR_FREE(table->rows); + VIR_FREE(table); +} + +/** + * vshTableRowNew: + * @size: expected number of cells in row. + * @arg: the first argument. + * @ap: list of variadic arguments + * + * Creates a new row in the table. Each argument passed + * represents a cell in the row. If the number of cells is not + * equal to @size, then NULL is returned. However, if @size is + * equal to 0, the aforementioned check is suppressed. + * + * Returns: pointer to vshTableRowPtr row or NULL. + */ +static vshTableRowPtr +vshTableRowNew(size_t size, const char *arg, va_list ap) +{ + vshTableRowPtr row = NULL; + char *tmp = NULL; + + if (!arg) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Table row cannot be empty")); + goto error; + } + + if (VIR_ALLOC(row) < 0) + goto error; + + while (arg) { + if (VIR_STRDUP(tmp, arg) < 0) + goto error; + + if (VIR_APPEND_ELEMENT(row->cells, row->ncells, tmp) < 0) + goto error; + + arg = va_arg(ap, const char *); + } + + if (size && row->ncells != size) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Incorrect number of cells in a table row")); + goto error; + } + + return row; + + error: + vshTableRowFree(row); + return NULL; +} + +/** + * vshTableNew: + * @arg: List of column names (NULL terminated) + * + * Creates a new table. + * + * Returns: pointer to table or NULL. + */ +vshTablePtr +vshTableNew(const char *arg, ...) +{ + vshTablePtr table; + vshTableRowPtr header = NULL; + va_list ap; + + if (VIR_ALLOC(table) < 0) + goto error; + + va_start(ap, arg); + header = vshTableRowNew(0, arg, ap); + va_end(ap); + + if (!header) + goto error; + + if (VIR_APPEND_ELEMENT(table->rows, table->nrows, header) < 0) + goto error; + + return table; + error: + vshTableRowFree(header); + vshTableFree(table); + return NULL; +} + +/** + * vshTableRowAppend: + * @table: table to append to + * @arg: cells of the row (NULL terminated) + * + * Appends new row into the @table. The number of cells in the row has + * to be equal to the number of cells in the table header. + * + * Returns: 0 if succeeded, -1 if failed. + */ +int +vshTableRowAppend(vshTablePtr table, const char *arg, ...) +{ + vshTableRowPtr row = NULL; + size_t ncolumns = table->rows[0]->ncells; + va_list ap; + int ret = -1; + + va_start(ap, arg); + row = vshTableRowNew(ncolumns, arg, ap); + va_end(ap); + + if (!row) + goto cleanup; + + if (VIR_APPEND_ELEMENT(table->rows, table->nrows, row) < 0) + goto cleanup; + + ret = 0; + cleanup: + vshTableRowFree(row); + return ret; +} + +/** + * vshTableGetColumnsWidths: + * @table: table + * @maxwidths: maximum count of characters for each columns + * @widths: count of characters for each cell in the table + * + * Fills passed @maxwidths and @widths arrays with maximum number + * of characters for columns and number of character per each + * table cell, respectively. + * + * Tries to handle unicode strings. + */ +static void +vshTableGetColumnsWidths(vshTablePtr table, + size_t **maxwidths, + size_t ***widths) +{ + size_t i; + size_t j; + + for (i = 0; i < table->nrows; i++) { + vshTableRowPtr row = table->rows[i]; + + for (j = 0; j < row->ncells; j++) { + size_t len; + + len = mbstowcs(NULL, row->cells[j], 0); + + if (len == (size_t) -1) + len = strlen(row->cells[j]); + + (*widths)[i][j] = len; + if (len > (*maxwidths)[j]) + (*maxwidths)[j] = len; + } + } +} + +/** + * vshTableRowPrint: + * @ctl virtshell control structure + * @row: table to append to + * @maxwidths: maximum count of characters for each columns + * @widths: count of character for each cell in this row + * @printCB function for priting table + * @buf: buffer to store table (only if @toStdout == true) + * @toStdout: whetever print table to Stdout or return in buffer + */ +static void +vshTableRowPrint(vshControl *ctl, + vshTableRowPtr row, + size_t *maxwidths, + size_t *widths, + vshPrintCB printCB, + virBufferPtr buf, + bool toStdout) +{ + size_t i; + size_t j; + + if (toStdout) { + for (i = 0; i < row->ncells; i++) { + printCB(ctl, " %s", row->cells[i]); + + for (j = 0; j < maxwidths[i] - widths[i] + 2; j++) + printCB(ctl, " "); + } + printCB(ctl, "\n"); + } else { + for (i = 0; i < row->ncells; i++) { + virBufferAsprintf(buf, " %s", row->cells[i]); + + for (j = 0; j < maxwidths[i] - widths[i] + 2; j++) + virBufferAddStr(buf, " "); + } + virBufferAddStr(buf, "\n"); + } + +} + +/** + * vshTablePrint: + * @ctl virtshell control structure + * @table: table to print + * @toStdout: whetever to print to stdout (true) or return in string (false) + * + * Prints table. To get an alignment of columns right, function + * fills 2d array @widths with count of characters in each cell and + * array @maxwidths maximum count of character in each column. + * Function then prints tables header and content. + * + * Returns string containing table, or NULL if table was printed to + * stdout + */ +static char * +vshTablePrint(vshControl *ctl, vshTablePtr table, bool toStdout) +{ + size_t i; + size_t j; + size_t *maxwidths; + size_t **widths; + virBuffer buf = VIR_BUFFER_INITIALIZER; + char *ret = NULL; + + if (VIR_ALLOC_N(maxwidths, table->rows[0]->ncells)) + goto cleanup; + + if (VIR_ALLOC_N(widths, table->nrows)) + goto cleanup; + + /* retrieve widths of columns */ + for (i = 0; i < table->nrows; i++) { + if (VIR_ALLOC_N(widths[i], table->rows[0]->ncells)) + goto cleanup; + } + + vshTableGetColumnsWidths(table, &maxwidths, &widths); + + /* print header */ + VIR_WARNINGS_NO_PRINTF + vshTableRowPrint(ctl, table->rows[0], maxwidths, widths[0], + vshPrintExtra, &buf, toStdout); + VIR_WARNINGS_RESET + + /* print dividing line */ + if (toStdout) { + for (i = 0; i < table->rows[0]->ncells; i++) { + for (j = 0; j < maxwidths[i] + 3; j++) + vshPrintExtra(ctl, "-"); + } + vshPrintExtra(ctl, "\n"); + } else { + for (i = 0; i < table->rows[0]->ncells; i++) { + for (j = 0; j < maxwidths[i] + 3; j++) + virBufferAddStr(&buf, "-"); + } + virBufferAddStr(&buf, "\n"); + } + + /* print content */ + for (i = 1; i < table->nrows; i++) { + VIR_WARNINGS_NO_PRINTF + vshTableRowPrint(ctl, table->rows[i], maxwidths, widths[0], + vshPrintExtra, &buf, toStdout); + VIR_WARNINGS_RESET + } + + if (!toStdout) + ret = virBufferContentAndReset(&buf); + + cleanup: + VIR_FREE(maxwidths); + for (i = 0; i < table->nrows; i++) + VIR_FREE(widths[i]); + VIR_FREE(widths); + return ret; +} + + +void +vshTablePrintToStdout(vshControl *ctl, vshTablePtr table) +{ + vshTablePrint(ctl, table, true); +} + +char * +vshTablePrintToString(vshControl *ctl, vshTablePtr table) +{ + return vshTablePrint(ctl, table, false); +} diff --git a/tools/vsh-table.h b/tools/vsh-table.h new file mode 100644 index 0000000000..41600fe06f --- /dev/null +++ b/tools/vsh-table.h @@ -0,0 +1,42 @@ +/* + * vsh-table.h: table printing helper + * + * Copyright (C) 2018 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Simon Kobyda <skobyda(a)redhat.com> + * + */ + +#ifndef VSH_TABLE_H +# define VSH_TABLE_H + +# include "vsh.h" + +/* forward declarations */ +typedef struct _vshTable vshTable; +typedef struct _vshTableRow vshTableRow; +typedef vshTable *vshTablePtr; +typedef vshTableRow *vshTableRowPtr; + +void vshTableFree(vshTablePtr table); +vshTablePtr vshTableNew(const char *format, ...); +int vshTableRowAppend(vshTablePtr table, const char *arg, ...); +void vshTablePrintToStdout(vshControl *ctl, vshTablePtr table); +char *vshTablePrintToString(vshControl *ctl, vshTablePtr table); + +#endif /* VSH_TABLE_H */ -- 2.17.1

3 6

[libvirt] [jenkins-ci PATCH 0/2] Don't build libvirt-dbus on Debian 8
by Andrea Bolognani 13 Aug '18

13 Aug '18

I thought that it would work, but I was clearly mistaken :/ Andrea Bolognani (2): projects: Don't build libvirt-dbus on Debian 8 guests: Don't prepare Debian 8 for libvirt-dbus guests/host_vars/libvirt-debian-8/main.yml | 1 - projects/libvirt-dbus.yaml | 1 - 2 files changed, 2 deletions(-) -- 2.17.1

2 3

[libvirt] [RFC 0/2] util: introduce timeout mode in virCommandRun/Async and virKModLoad
by Shi Lei 13 Aug '18

13 Aug '18

Hi, everyone! It's possible that the running-time of a command is long than its caller expected. Perhaps, it's useful to provide timeout mode for virCommandRun or virCommandRunAsync + virCommandWait. And The caller can restrict the running time of the command if necessary. I introduce a new function virCommandSetTimeout for that. And then, virKModLoad will get a default timeout of 3 seconds. I hope it could solve the problem of "strange delay" as John mentioned. Thanks! Shi Lei (2): introduce timeout mode in virCommandRun/Async introduce timeout mode in virKModLoad docs/internals/command.html.in | 68 +++++++ src/Makefile.am | 4 +- src/libvirt_private.syms | 2 + src/util/vircommand.c | 110 ++++++++++- src/util/vircommand.h | 4 + src/util/virkmod.c | 43 ++++- src/util/virprocess.c | 107 ++++++++--- src/util/virprocess.h | 4 + src/virt-command.conf | 10 + tests/commandtest.c | 411 ++++++++++++++++++++++++++++++++++++++--- 10 files changed, 706 insertions(+), 57 deletions(-) create mode 100644 src/virt-command.conf -- 2.7.4

3 5

[libvirt] [PATCH 0/2] Couple of almost trivial memleak fixes
by Michal Privoznik 13 Aug '18

13 Aug '18

*** NOT PUSHED. PLEASE REVIEW *** Michal Prívozník (2): virnetdevip: Free data.devices in virNetDevIPCheckIPv6Forwarding() too networkStartNetworkVirtual: Don't leak macmap object src/network/bridge_driver.c | 2 ++ src/util/virnetdevip.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.16.4

2 4