- Devel - libvirt List Archives

[libvirt] [PATCH] conf: Move more PCI functions out of device_conf
by Andrea Bolognani 15 Sep '18

15 Sep '18

Functions that deal with virPCIDeviceAddress exclusively belong to util/virpci. Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- src/conf/device_conf.c | 66 ---------------------------------------- src/conf/device_conf.h | 7 ----- src/libvirt_private.syms | 6 ++-- src/util/virpci.c | 65 +++++++++++++++++++++++++++++++++++++++ src/util/virpci.h | 7 +++++ 5 files changed, 75 insertions(+), 76 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index cbdfbf6ef4..98a419f40f 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -160,59 +160,6 @@ virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, return true; } -bool -virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report) -{ - if (addr->domain > 0xFFFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address domain='0x%x', " - "must be <= 0xFFFF"), - addr->domain); - return false; - } - if (addr->bus > 0xFF) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address bus='0x%x', " - "must be <= 0xFF"), - addr->bus); - return false; - } - if (addr->slot > 0x1F) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address slot='0x%x', " - "must be <= 0x1F"), - addr->slot); - return false; - } - if (addr->function > 7) { - if (report) - virReportError(VIR_ERR_XML_ERROR, - _("Invalid PCI address function=0x%x, " - "must be <= 7"), - addr->function); - return false; - } - if (virPCIDeviceAddressIsEmpty(addr)) { - if (report) - virReportError(VIR_ERR_XML_ERROR, "%s", - _("Invalid PCI address 0000:00:00, at least " - "one of domain, bus, or slot must be > 0")); - return false; - } - return true; -} - - -bool -virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) -{ - return !(addr->domain || addr->bus || addr->slot); -} - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info) { @@ -309,19 +256,6 @@ virPCIDeviceAddressFormat(virBufferPtr buf, return 0; } -bool -virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2) -{ - if (addr1->domain == addr2->domain && - addr1->bus == addr2->bus && - addr1->slot == addr2->slot && - addr1->function == addr2->function) { - return true; - } - return false; -} - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 9f51118e29..407956bd02 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -191,10 +191,6 @@ bool virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, bool virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); -bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, - bool report); -bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); - bool virDeviceInfoPCIAddressIsWanted(const virDomainDeviceInfo *info); bool virDeviceInfoPCIAddressIsPresent(const virDomainDeviceInfo *info); @@ -205,9 +201,6 @@ int virPCIDeviceAddressFormat(virBufferPtr buf, virPCIDeviceAddress addr, bool includeTypeInAddr); -bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, - virPCIDeviceAddress *addr2); - bool virDomainDeviceCCWAddressIsValid(virDomainDeviceCCWAddressPtr addr); int virDomainDeviceCCWAddressParseXML(xmlNodePtr node, virDomainDeviceCCWAddressPtr addr); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a0d229a79f..d6662d691d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -108,10 +108,7 @@ virDomainDeviceUSBAddressParseXML; virDomainDeviceVirtioSerialAddressParseXML; virInterfaceLinkFormat; virInterfaceLinkParseXML; -virPCIDeviceAddressEqual; virPCIDeviceAddressFormat; -virPCIDeviceAddressIsEmpty; -virPCIDeviceAddressIsValid; virPCIDeviceAddressParseXML; @@ -2498,10 +2495,13 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressAsString; +virPCIDeviceAddressEqual; virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetSysfsFile; virPCIDeviceAddressIOMMUGroupIterate; +virPCIDeviceAddressIsEmpty; +virPCIDeviceAddressIsValid; virPCIDeviceAddressParse; virPCIDeviceCopy; virPCIDeviceDetach; diff --git a/src/util/virpci.c b/src/util/virpci.c index 1730d888f7..fb3f04fac3 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -1668,6 +1668,71 @@ virPCIDeviceReadID(virPCIDevicePtr dev, const char *id_name) return id_str; } +bool +virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report) +{ + if (addr->domain > 0xFFFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address domain='0x%x', " + "must be <= 0xFFFF"), + addr->domain); + return false; + } + if (addr->bus > 0xFF) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address bus='0x%x', " + "must be <= 0xFF"), + addr->bus); + return false; + } + if (addr->slot > 0x1F) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address slot='0x%x', " + "must be <= 0x1F"), + addr->slot); + return false; + } + if (addr->function > 7) { + if (report) + virReportError(VIR_ERR_XML_ERROR, + _("Invalid PCI address function=0x%x, " + "must be <= 7"), + addr->function); + return false; + } + if (virPCIDeviceAddressIsEmpty(addr)) { + if (report) + virReportError(VIR_ERR_XML_ERROR, "%s", + _("Invalid PCI address 0000:00:00, at least " + "one of domain, bus, or slot must be > 0")); + return false; + } + return true; +} + +bool +virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr) +{ + return !(addr->domain || addr->bus || addr->slot); +} + +bool +virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2) +{ + if (addr1->domain == addr2->domain && + addr1->bus == addr2->bus && + addr1->slot == addr2->slot && + addr1->function == addr2->function) { + return true; + } + return false; +} + char * virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) { diff --git a/src/util/virpci.h b/src/util/virpci.h index b4f72f8f06..16c2eded5e 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -218,6 +218,13 @@ int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) ATTRIBUTE_RETURN_CHECK; +bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, + bool report); +bool virPCIDeviceAddressIsEmpty(const virPCIDeviceAddress *addr); + +bool virPCIDeviceAddressEqual(virPCIDeviceAddress *addr1, + virPCIDeviceAddress *addr2); + char *virPCIDeviceAddressAsString(virPCIDeviceAddressPtr addr) ATTRIBUTE_NONNULL(1); -- 2.17.1

3 2

[libvirt] [PATCH] libxl: remove configure check for libxl_domain_config_from_json
by Jim Fehlig 15 Sep '18

15 Sep '18

The libxl_domain_config_from_json API appeared in Xen 4.5, hence there is no need to check for its existence after changing the minimum supported Xen version to 4.6. Remove the check and its use in the tests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- m4/virt-driver-libxl.m4 | 7 ------- tests/libxlxml2domconfigtest.c | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/m4/virt-driver-libxl.m4 b/m4/virt-driver-libxl.m4 index 902da11472..70c5c59e6a 100644 --- a/m4/virt-driver-libxl.m4 +++ b/m4/virt-driver-libxl.m4 @@ -56,13 +56,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_LIBXL], [ ],[ LIBXL_LIBS="$LIBXL_LIBS -lxenstore -lxenctrl" ]) - - dnl Check if libxl_domain_config_from_json is available for domXML to - dnl libxl_domain_config tests - LIBS="$LIBS -lxenlight -lxenctrl" - AC_CHECK_FUNCS([libxl_domain_config_from_json]) - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" fi AC_SUBST([LIBXL_CFLAGS]) diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c index b814461acc..eacf8f5615 100644 --- a/tests/libxlxml2domconfigtest.c +++ b/tests/libxlxml2domconfigtest.c @@ -33,7 +33,7 @@ #include "testutils.h" -#if defined(WITH_LIBXL) && defined(WITH_YAJL) && defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON) +#if defined(WITH_LIBXL) && defined(WITH_YAJL) # include "internal.h" # include "viralloc.h" @@ -228,4 +228,4 @@ int main(void) return EXIT_AM_SKIP; } -#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */ +#endif /* WITH_LIBXL && WITH_YAJL */ -- 2.18.0

2 1

[libvirt] [PATCH 00/10] Introduce x86 Cache Monitoring Technology (CMT)
by Wang Huaqiang 15 Sep '18

15 Sep '18

This series of patches introduced the x86 Cache Monitoring Technology (CMT) to libvirt by interacting with kernel resource control (resctrl) interface. CMT is one of the Intel(R) x86 CPU feature which belongs to the Resource Director Technology (RDT). CMT reports the occupancy of the last level cache, which is shared by all CPU cores. We have serval discussion about the enabling of CMT, please refer to following links for the RFCs. RFCv3 https://www.redhat.com/archives/libvir-list/2018-August/msg01213.html RFCv2 https://www.redhat.com/archives/libvir-list/2018-July/msg00409.html https://www.redhat.com/archives/libvir-list/2018-July/msg01241.html RFCv1 https://www.redhat.com/archives/libvir-list/2018-June/msg00674.html 1. About reason why CMT is necessary in libvirt? The perf events of 'CMT, MBML, MBMT' have been phased out since Linux kernel commit c39a0e2c8850f08249383f2425dbd8dbe4baad69, in libvirt the perf based cmt,mbm will not work with the latest linux kernel. These patches add CMT feature to libvirt through kernel resctrlfs interface. 2. Interfaces for CMT from the high level. 2.1 Query the host capability of CMT. The element 'monitor' represents the host capabilities of CMT. The explanations of involved CMT attributes: - 'maxAllocs' denotes the maximum monitoring groups could be created, which is limited by the number of hardware 'RMID'. - 'threshold' denotes the upper bound of cache occupancy for current group, in bytes, to determine if an RMID can be reused. - element 'feature' denotes the monitoring feature supported. - 'llc_occupancy' is the feature for reporting the last level cache occupancy information. # virsh capabilities ... <cache> <bank id='0' level='3' type='both' size='15' unit='MiB' cpus='0-5'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> <bank id='1' level='3' type='both' size='15' unit='MiB' cpus='6-11'> <control granularity='768' unit='KiB' type='code' maxAllocs='8'/> <control granularity='768' unit='KiB' type='data' maxAllocs='8'/> + <monitor threshold='540672' unit='B' maxAllocs='176'/> + <feature name=llc_occupancy/> + </monitor> </bank> </cache> ... 2.2 Create cache monitoring group (cache monitor). The main interface for creating monitoring group is through XML file. The proposed configuration is like: <cputune> <cachetune vcpus='1'> <cache id='0' level='3' type='code' size='7680' unit='KiB'/> <cache id='1' level='3' type='data' size='3840' unit='KiB'/> + <monitor vcpus='1'/> </cachetune> <cachetune vcpus='4-7'> + <monitor vcpus='4-6'/> </cachetune> </cputune> In above XML, created 2 cache resctrl allocation groups and 2 resctrl monitoring groups. The changes of cache monitor will be effective in next booting of VM. 2.3 Show CMT result through command 'domstats' Adding the interface in qemu to report this information for resource monitor group through command 'virsh domstats --cpu-total'. Below is a typical output: # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 **Changes Since RFCv3** In the output of 'domstats', added 'cpu.cache.<cmt_group_index>.bank.<bank_index>.id' to tell the OS assigned cache bank id of current cache. Changes is prefixed with a '+': # virsh domstats 1 --cpu-total Domain: 'ubuntu16.04-base' ... cpu.cache.monitor.count=2 cpu.cache.0.name=vcpus_1 cpu.cache.0.vcpus=1 cpu.cache.0.bank.count=2 + cpu.cache.0.bank.0.id=0 cpu.cache.0.bank.0.bytes=4505600 + cpu.cache.0.bank.1.id=1 cpu.cache.0.bank.1.bytes=5586944 cpu.cache.1.name=vcpus_4-6 cpu.cache.1.vcpus=4,5,6 cpu.cache.1.bank.count=2 + cpu.cache.1.bank.0.id=0 cpu.cache.1.bank.0.bytes=17571840 + cpu.cache.1.bank.1.id=1 cpu.cache.1.bank.1.bytes=29106176 Wang Huaqiang (10): conf: Renamed 'controlBuf' to 'childrenBuf' util: add interface retrieving CMT capability conf: Add CMT capability to host test: add test case for resctrl monitor util: resctrl: refactoring some functions util: Introduce resctrl monitor for CMT conf: refactor virDomainResctrlAppend conf: introduce resctrl monitor group in domain qemu: Introduce resctrl monitoring group qemu: Report cache occupancy (CMT) with domstats .gnulib | 1 - docs/formatdomain.html.in | 14 +- docs/schemas/capability.rng | 28 + docs/schemas/domaincommon.rng | 11 +- src/conf/capabilities.c | 51 +- src/conf/capabilities.h | 1 + src/conf/domain_conf.c | 159 +++++- src/conf/domain_conf.h | 20 + src/libvirt-domain.c | 9 + src/libvirt_private.syms | 6 + src/qemu/qemu_driver.c | 265 ++++++++- src/qemu/qemu_process.c | 40 +- src/util/virresctrl.c | 597 +++++++++++++++++++-- src/util/virresctrl.h | 48 +- tests/genericxml2xmlindata/cachetune-cdp.xml | 2 + .../cachetune-colliding-monitors.xml | 36 ++ tests/genericxml2xmlindata/cachetune-small.xml | 1 + tests/genericxml2xmlindata/cachetune.xml | 3 + tests/genericxml2xmltest.c | 4 + .../resctrl/info/L3_MON/max_threshold_occupancy | 1 + .../linux-resctrl/resctrl/info/L3_MON/mon_features | 3 + .../linux-resctrl/resctrl/info/L3_MON/num_rmids | 1 + tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml | 6 + 23 files changed, 1208 insertions(+), 99 deletions(-) delete mode 160000 .gnulib create mode 100644 tests/genericxml2xmlindata/cachetune-colliding-monitors.xml create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/max_threshold_occupancy create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/mon_features create mode 100644 tests/vircaps2xmldata/linux-resctrl/resctrl/info/L3_MON/num_rmids -- 2.7.4

5 41

[libvirt] [PATCH v2] numa: fix unsafe access to numa_nodes_ptr
by Wang Yechao 14 Sep '18

14 Sep '18

numa_nodes_ptr is a global variable in libnuma.so. It is been freed after main thread exits. If we have many running vms, restart the libvirtd service continuously at intervals of a few seconds, the main thread may exit before qemuProcessReconnect thread, and a segfault error occurs. Backstrace as follows: 0 0x00007f40e3d2dd72 in numa_bitmask_isbitset () from /lib64/libnuma.so.1 1 0x00007f40e4d14c55 in virNumaNodeIsAvailable (node=node@entry=0) at util/virnuma.c:396 2 0x00007f40e4d16010 in virNumaGetHostMemoryNodeset () at util/virnuma.c:1011 3 0x00007f40b94ced90 in qemuRestoreCgroupState (vm=0x7f407c39df00, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:877 4 qemuConnectCgroup (driver=driver@entry=0x7f407c21fe80, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:969 5 0x00007f40b94eef93 in qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:3531 6 0x00007f40e4d34bd2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 7 0x00007f40e214ee25 in start_thread () from /lib64/libpthread.so.0 8 0x00007f40e1e7c36d in clone () from /lib64/libc.so.6 Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virnuma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 67e6c86..f06f6b3 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -381,7 +381,10 @@ virNumaGetMaxCPUs(void) bool virNumaNodeIsAvailable(int node) { - return numa_bitmask_isbitset(numa_nodes_ptr, node); + if (numa_nodes_ptr) + return numa_bitmask_isbitset(numa_nodes_ptr, node); + else + return false; } -- 1.8.3.1

2 1

[libvirt] [PATCH v2] qemu: check for vhostusers bandwidth
by Roland Schulz 14 Sep '18

14 Sep '18

Vhostuser doesn't support bandwidth and due to backwards compatibility it was decided to just warn users instead of erroring out https://bugzilla.redhat.com/show_bug.cgi?id=1524230 Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- src/qemu/qemu_command.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff9589f593..011e2b45af 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8244,6 +8244,8 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { + virNetDevBandwidthPtr actualBandwidth = virDomainNetGetActualBandwidth(net); + virDomainNetType actualType = virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *chardev = NULL; char *netdev = NULL; @@ -8257,6 +8259,13 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto cleanup; } + /* Warn if unsupported bandwidth requested */ + if (actualBandwidth && !virNetDevSupportBandwidth(actualType)) { + VIR_WARN(_("setting bandwidth on interfaces of " + "type '%s' is not implemented yet"), + virDomainNetTypeToString(actualType)); + } + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev = qemuBuildChrChardevStr(logManager, secManager, -- 2.17.1

2 1

[libvirt] [PATCH] vhost-user: define conventions for vhost-user backends
by Marc-André Lureau 14 Sep '18

14 Sep '18

As discussed during "[PATCH v4 00/29] vhost-user for input & GPU" review, let's define a common set of backend conventions to help with management layer implementation, and interoperability. Cc: libvir-list(a)redhat.com Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Daniel P. Berrangé <berrange(a)redhat.com> Cc: Changpeng Liu <changpeng.liu(a)intel.com> Cc: Dr. David Alan Gilbert <dgilbert(a)redhat.com> Cc: Felipe Franciosi <felipe(a)nutanix.com> Cc: Gonglei <arei.gonglei(a)huawei.com> Cc: Maxime Coquelin <maxime.coquelin(a)redhat.com> Cc: Michael S. Tsirkin <mst(a)redhat.com> Cc: Victor Kaplansky <victork(a)redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com> --- docs/interop/vhost-user.txt | 106 +++++++++++++++++++++++++++++++++++- 1 file changed, 104 insertions(+), 2 deletions(-) diff --git a/docs/interop/vhost-user.txt b/docs/interop/vhost-user.txt index ba5e37d714..691ce173ed 100644 --- a/docs/interop/vhost-user.txt +++ b/docs/interop/vhost-user.txt @@ -17,8 +17,13 @@ The protocol defines 2 sides of the communication, master and slave. Master is the application that shares its virtqueues, in our case QEMU. Slave is the consumer of the virtqueues. -In the current implementation QEMU is the Master, and the Slave is intended to -be a software Ethernet switch running in user space, such as Snabbswitch. +In the current implementation QEMU is the Master, and the Slave is the +external process consuming the virtio queues, for example a software +Ethernet switch running in user space, such as Snabbswitch, or a block +device backend processing read & write to a virtual disk. In order to +facilitate interoperability between various backend implementations, +it is recommended to follow the "Backend program conventions" +described in this document. Master and slave can be either a client (i.e. connecting) or server (listening) in the socket communication. @@ -859,3 +864,100 @@ resilient for selective requests. For the message types that already solicit a reply from the client, the presence of VHOST_USER_PROTOCOL_F_REPLY_ACK or need_reply bit being set brings no behavioural change. (See the 'Communication' section for details.) + +Backend program conventions +--------------------------- + +vhost-user backends provide various services and they may need to be +configured manually depending on the use case. However, it is a good +idea to follow the conventions listed here when possible. Users, QEMU +or libvirt, can then rely on some common behaviour to avoid +heterogenous configuration and management of the backend program and +facilitate interoperability. + +In order to be discoverable, default vhost-user backends should be +located under "/usr/libexec", and be named "vhost-user-$device" where +"$device" is the device name in lower-case following the name listed +in the Linux virtio_ids.h header (ex: the VIRTIO_ID_RPROC_SERIAL +backend would be named "vhost-user-rproc-serial"). + +Mechanisms to list, and to select among alternatives implementations +or modify the default backend are not described at this point (a +distribution may use update-alternatives, for example, to list and to +pick a different default backend). + +The backend program must end (as quickly and cleanly as possible) when +the SIGTERM signal is received. Eventually, it may be SIGKILL by the +management layer after a few seconds. + +The following command line options have an expected behaviour. They +are mandatory, unless explicitly said differently: + +* --socket-path=PATH + +This option specify the location of the vhost-user Unix domain socket. +It is incompatible with --fd. + +* --fd=FDNUM + +When this argument is given, the backend program is started with the +vhost-user socket as file descriptor FDNUM. It is incompatible with +--socket-path. + +* --print-capabilities + +Output to stdout a line-seperated list of backend capabilities, and +then exit successfully. Other options and arguments should be ignored, +and the backend program should not perform its normal function. + +At the time of writing, there are no common capabilities. Some +device-specific capabilities are listed in the respective sections. By +convention, device-specific capabilities are prefixed by their device +name. + +* --pidfile=PATH + +Write the process id (PID) to the given file PATH. This is mostly +useful if the backend daemonize/fork itself. + +vhost-user-input program conventions +------------------------------------ + +Capabilities: + +input-evdev-path + + The --evdev-path command line option is supported. + +input-no-grab + + The --no-grab command line option is supported. + +* --evdev-path=PATH (optional) + +Specify the linux input device. + +* --no-grab (optional) + +Do no request exclusive access to the input device. + +vhost-user-gpu program conventions +---------------------------------- + +Capabilities: + +gpu-render-node + + The --render-node command line option is supported. + +gpu-virgl + + The --virgl command line option is supported. + +* --render-node=PATH (optional) + +Specify the GPU DRM render node. + +* --virgl (optional) + +Enable virgl rendering support. -- 2.19.0.rc1

2 2

[libvirt] [PATCH] util: Add stubs for virDoes{User, Group}Exist() without getpwuid_r
by Martin Kletzander 14 Sep '18

14 Sep '18

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. src/util/virutil.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/util/virutil.c b/src/util/virutil.c index 3d1b02eceb31..b0334edb36a0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1248,6 +1248,18 @@ virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED, return 0; } +int +virDoesUserExist(const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + +int +virDoesGroupExist(const char *name ATTRIBUTE_UNUSED) +{ + return 0; +} + # ifdef WIN32 /* These methods are adapted from GLib2 under terms of LGPLv2+ */ static int -- 2.18.0

1 0

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

13 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v6: - modify the description in qemu.conf - move the multiplication to BeginJobInternal changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 7 +++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 7 +++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..f5e34f1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,13 @@ # #max_queued = 0 + +# It is strongly recommended to not touch this setting +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..5be37dc 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1063,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout must be larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..306772a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,9 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + + cfg->stateLockTimeout *= 1000; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

3 2

[libvirt] [PATCH v5] qemu: Introduce state_lock_timeout to qemu.conf
by Yi Wang 13 Sep '18

13 Sep '18

When doing some job holding state lock for a long time, we may come across error: "Timed out during operation: cannot acquire state change lock" Well, sometimes it's not a problem and users want to continue to wait, and this patch allow users decide how long time they can wait the state lock. Signed-off-by: Yi Wang <wang.yi59(a)zte.com.cn> Reviewed-by: Xi Xu <xu.xi8(a)zte.com.cn> --- changes in v5: - adjust position of state lock in aug file - fix state lock time got from conf file from milliseconds to seconds changes in v4: - fix syntax-check error changes in v3: - add user-friendly description and nb of state lock - check validity of stateLockTimeout changes in v2: - change default value to 30 in qemu.conf - set the default value in virQEMUDriverConfigNew() --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_conf.c | 15 +++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_domain.c | 5 +---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 6 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index ddc4bbf..a5601e1 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -100,6 +100,7 @@ module Libvirtd_qemu = | str_entry "lock_manager" let rpc_entry = int_entry "max_queued" + | int_entry "state_lock_timeout" | int_entry "keepalive_interval" | int_entry "keepalive_count" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index cd57b3c..8920a1a 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -667,6 +667,16 @@ # #max_queued = 0 + +# When two or more threads want to work with the same domain they use a +# job lock to mutually exclude each other. However, waiting for the lock +# is limited up to state_lock_timeout seconds. +# NB, strong recommendation to set the timeout longer than 30 seconds. +# +# Default is 30 +# +#state_lock_timeout = 60 + ################################################################### # Keepalive protocol: # This allows qemu driver to detect broken connections to remote diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index a4f545e..012f4d1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -129,6 +129,9 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) #endif +/* Give up waiting for mutex after 30 seconds */ +#define QEMU_JOB_WAIT_TIME (1000ull * 30) + virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { virQEMUDriverConfigPtr cfg; @@ -346,6 +349,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->glusterDebugLevel = 4; cfg->stdioLogD = true; + cfg->stateLockTimeout = QEMU_JOB_WAIT_TIME; + if (!(cfg->namespaces = virBitmapNew(QEMU_DOMAIN_NS_LAST))) goto error; @@ -863,6 +868,10 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, if (virConfGetValueUInt(conf, "keepalive_count", &cfg->keepAliveCount) < 0) goto cleanup; + if (virConfGetValueInt(conf, "state_lock_timeout", &cfg->stateLockTimeout) < 0) + goto cleanup; + cfg->stateLockTimeout *= 1000; + if (virConfGetValueInt(conf, "seccomp_sandbox", &cfg->seccompSandbox) < 0) goto cleanup; @@ -1055,6 +1064,12 @@ virQEMUDriverConfigValidate(virQEMUDriverConfigPtr cfg) return -1; } + if (cfg->stateLockTimeout <= 0) { + virReportError(VIR_ERR_CONF_SYNTAX, "%s", + _("state_lock_timeout should larger than zero")); + return -1; + } + return 0; } diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a8d84ef..97cf2e1 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -190,6 +190,8 @@ struct _virQEMUDriverConfig { int keepAliveInterval; unsigned int keepAliveCount; + int stateLockTimeout; + int seccompSandbox; char *migrateHost; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 886e3fb..5a2ca52 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -6652,9 +6652,6 @@ qemuDomainObjCanSetJob(qemuDomainObjPrivatePtr priv, priv->job.agentActive == QEMU_AGENT_JOB_NONE)); } -/* Give up waiting for mutex after 30 seconds */ -#define QEMU_JOB_WAIT_TIME (1000ull * 30) - /** * qemuDomainObjBeginJobInternal: * @driver: qemu driver @@ -6714,7 +6711,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, } priv->jobs_queued++; - then = now + QEMU_JOB_WAIT_TIME; + then = now + cfg->stateLockTimeout; retry: if ((!async && job != QEMU_JOB_DESTROY) && diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index f1e8806..8e072d0 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -82,6 +82,7 @@ module Test_libvirtd_qemu = { "relaxed_acs_check" = "1" } { "lock_manager" = "lockd" } { "max_queued" = "0" } +{ "state_lock_timeout" = "60" } { "keepalive_interval" = "5" } { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } -- 1.8.3.1

4 3

[libvirt] Re：Re: [PATCH] add nodeset='all' and default for interleavemode
by peng.hao2＠zte.com.cn 13 Sep '18

13 Sep '18

>On 09/11/2018 04:28 PM, Peng Hao wrote: >> For interleave mode,sometimes we want to allocate mmeory regularly >> in all nodes on the host. But different hosts has different node number. >> So we add nodeset='all' for interleave mode and if nodeset=NULL default >> nodeset is 'all' for interleave mode. >> >> Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> >> --- >> src/conf/numa_conf.c | 73 ++++++++++++++++++++++++++++++++++++++++------------ >> 1 file changed, 57 insertions(+), 16 deletions(-) > >Firstly, this patch does not pass 'syntax-check'. Secondly, it breaks >qemuxml2argvtest. > I will pay attention to this. >> + numa->memory.allnode = true; >> + } else { >Any patch that changes accepted XML needs to go hand in hand with >documentation and RNG update and a test case. I will add next. >> + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && >> + mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE && >> + numa->memory.allnode) { >> + if ((bitmap = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN)) == NULL) >> + goto cleanup; >> + virBitmapClearAll(bitmap); >> + maxnode = numa_max_node(); >So, you're including numa.h to get this function. What if: >a) numa.h is not available? >b) what is wrong with virNumaGetMaxNode()? >> + for (i = 0; i <= maxnode; i++) { >> + if (virBitmapSetBit(bitmap, i) < 0) { >> + virBitmapFree(bitmap); >> + goto cleanup; >> + } >> + } >> + if (numa->memory.nodeset) >> + virBitmapFree(numa->memory.nodeset); >> + numa->memory.nodeset = bitmap; >> } >> >> /* setting nodeset when placement auto is invalid */ >> >But more importantly, why is this patch needed? I might be missing >something, but: >a) you can just not pin the memory to avoid mismatch of NUMA nodes on >migration, >b) supply new domain XML on migration where NUMA nodes match the destination >Isn't pinning memory to all NUMA nodes equivalent to no pinning at all? I would use 'interlaeve' to let virtual machine's memory distribute evenly in all nodes. And 'interleave' setting ask for providing 'nodeset'. I think it is not so convenient. >Michal

1 0

[libvirt] [PATCH 0/5] qemu: misc graphics fixes
by Nikolay Shirokovskiy 13 Sep '18

13 Sep '18

Nikolay Shirokovskiy (5): qemu: fix typo in vnc port releasing qemu: simplify graphics port releasing qemu: vnc: mark websocket as used on reconnect qemu: mark graphics ports as used on migration qemu: keep websocketGenerated on libvirtd restarts src/conf/domain_conf.c | 9 +++++++++ src/conf/domain_conf.h | 1 + src/qemu/qemu_migration.c | 6 ++++++ src/qemu/qemu_process.c | 51 ++++++++++++++++++++++------------------------- src/qemu/qemu_process.h | 3 +++ 5 files changed, 43 insertions(+), 27 deletions(-) -- 1.8.3.1

2 13

[libvirt] [libvirt PATCH v2 0/4] Share cgroup code that is duplicated between QEMU and LXC
by Fabiano Fidêncio 13 Sep '18

13 Sep '18

virLXCCgroupSetupBlkioTune() and qemuSetupBlkioCgroup() and virLXCCgroupSetupCpuTune() and qemuSetupCpuCgroup() are the most similar functions between QEMU and LXC code. Let's move their common code to virCgroup. Mind that the first two patches are basically preparing the ground for the changes introduced in the last two patches. changes since v1: - Michal Privoznik pointed out (as did the `make syntax-check` :-)) that we do want to keep src/util independently of the parsing code (thus, including "conf/domain_conf.h" in vircgroup.h is not the way to go). This has been solved now by partially following Michal's suggestion and splitting the structs and functions that would be use in the common code to new different files. Fabiano Fidêncio (4): domain_conf: split out virBlkioDevice and virDomainBlkiotune definitions domain_conf: split out virDomainMemtune and virDomainHugePage definitions vircgroup: Add virCgroupSetupBlkioTune() vircgroup: Add virCgroupSetupMemTune() src/Makefile.am | 1 + src/conf/domain_conf.c | 22 ++++-------- src/conf/domain_conf.h | 70 +++---------------------------------- src/libvirt_private.syms | 2 ++ src/lxc/lxc_cgroup.c | 69 ++----------------------------------- src/qemu/qemu_cgroup.c | 61 ++------------------------------- src/qemu/qemu_command.c | 4 +-- src/util/Makefile.inc.am | 2 ++ src/util/virblkio.c | 37 ++++++++++++++++++++ src/util/virblkio.h | 52 ++++++++++++++++++++++++++++ src/util/vircgroup.c | 74 ++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 7 ++++ src/util/virmem.h | 66 +++++++++++++++++++++++++++++++++++ 13 files changed, 259 insertions(+), 208 deletions(-) create mode 100644 src/util/virblkio.c create mode 100644 src/util/virblkio.h create mode 100644 src/util/virmem.h -- 2.17.1

4 9

[libvirt] [PATCH 0/4] cfg.mk: Introduce syntax-check rule for incorrect indentation or empty line in function body
by Shi Lei 13 Sep '18

13 Sep '18

This series introduce syntax-check rule for below: 1. For incorrect indentation of the first line in function body int foo(int a0, ...) { [NOT 4 spaces]int first-line; ... ... } 2. For empty first line of function body int foo(int a0, ...) { [empty line] int second-line; ... ... } And it *ignores* the conditions as below: 1. For macros just as #if/#ifdef int foo(int a0, ...) { #if ANYTHING int second-line; ... ... } 2. For comments int foo(int a0, ...) { /* comments */ int second-line; ... ... } 3. For empty function body int foo(void) { } ^ This function has NO content 4. For labels { readmore: int second-line; ... ... goto readmore; ... ... } Shi Lei (4): cfg.mk: Introduce syntax-check rule for incorrect indentation or empty line in function body src: fix incorrect indentation or empty first line in function body tests: fix incorrect indentation or empty first line in function body tools: fix incorrect indentation or empty first line in function body cfg.mk | 11 +++ src/bhyve/bhyve_command.c | 3 - src/bhyve/bhyve_conf.c | 6 +- src/bhyve/bhyve_driver.c | 33 ++++--- src/bhyve/bhyve_monitor.c | 1 - src/bhyve/bhyve_process.c | 1 - src/conf/cpu_conf.c | 1 - src/conf/domain_capabilities.c | 1 - src/conf/domain_conf.c | 12 +-- src/conf/network_conf.c | 2 - src/cpu/cpu_s390.c | 82 ++++++++--------- src/cpu/cpu_x86.c | 1 - src/esx/esx_vi_types.c | 2 +- src/locking/lock_driver_nop.c | 1 - src/network/bridge_driver.c | 1 - src/network/bridge_driver_linux.c | 1 - src/nwfilter/nwfilter_learnipaddr.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_alias.c | 1 - src/qemu/qemu_domain_address.c | 1 - src/qemu/qemu_driver.c | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 1 - src/qemu/qemu_process.c | 1 - src/storage/storage_backend_sheepdog.c | 3 - src/storage/storage_driver.c | 1 - src/storage/storage_util.c | 1 - src/test/test_driver.c | 2 - src/util/vircommand.c | 6 +- src/util/virdbuspriv.h | 18 ++-- src/util/virdnsmasq.c | 1 - src/util/virfile.c | 1 - src/util/virnetdev.c | 55 ++++++------ src/util/virnetdevmacvlan.c | 11 ++- src/util/virnetdevvportprofile.c | 2 +- src/util/virstoragefile.c | 1 - src/util/virutil.c | 3 +- src/vbox/vbox_storage.c | 1 - src/vz/vz_driver.c | 1 - src/vz/vz_sdk.c | 1 - src/xenapi/xenapi_driver.c | 2 - src/xenconfig/xen_common.c | 9 +- tests/qemuxml2argvmock.c | 2 +- tests/sexpr2xmltest.c | 30 +++---- tests/virnetdevmock.c | 1 - tests/virnettlshelpers.c | 18 ++-- tests/virshtest.c | 118 ++++++++++++------------- tests/vshtabletest.c | 3 - tests/xml2sexprtest.c | 24 ++--- tools/virsh-volume.c | 1 - tools/virt-admin.c | 1 - 51 files changed, 218 insertions(+), 266 deletions(-) -- 2.17.1

2 10

[libvirt] [PATCHv2 0/5] Introduce VIR_AUTOCLOSE macro for closing fd automatically
by Shi Lei 13 Sep '18

13 Sep '18

v1 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00319.html Diff from v1: - Change VIR_AUTOCLOSE macro (comments from Michal) - Remove others except for patches in util (comments from Erik) - Change sc_require_attribute_cleanup_initialization for this macro Shi Lei (5): util: file: introduce VIR_AUTOCLOSE macro to close fd of the file automatically cfg.mk: Change syntax-check rule for VIR_AUTOCLOSE variable initialization util: file: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE util: netdevbridge: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE cfg.mk | 2 +- src/util/virfile.c | 21 ++-- src/util/virfile.h | 18 ++- src/util/virnetdev.c | 251 +++++++++++++------------------------ src/util/virnetdevbridge.c | 120 ++++++------------ 5 files changed, 146 insertions(+), 266 deletions(-) -- 2.17.1

2 9

[libvirt] [PATCH 0/3] qemu: Drop some cruft
by Andrea Bolognani 13 Sep '18

13 Sep '18

No longer needed since we bumped our minimum QEMU version to 1.5.0. Andrea Bolognani (3): qemu: Drop QEMU_CAPS_VNC_WEBSOCKET qemu: Drop QEMU_CAPS_CHARDEV_SPICEPORT qemu: Drop redundant version checks src/qemu/qemu_capabilities.c | 27 +++++-------------- src/qemu/qemu_capabilities.h | 4 +-- src/qemu/qemu_command.c | 14 +--------- .../caps_1.5.3.x86_64.xml | 2 -- .../caps_1.6.0.x86_64.xml | 2 -- .../caps_1.7.0.x86_64.xml | 2 -- .../caps_2.1.1.x86_64.xml | 2 -- .../caps_2.10.0.aarch64.xml | 2 -- .../caps_2.10.0.ppc64.xml | 2 -- .../caps_2.10.0.s390x.xml | 2 -- .../caps_2.10.0.x86_64.xml | 2 -- .../caps_2.11.0.s390x.xml | 2 -- .../caps_2.11.0.x86_64.xml | 2 -- .../caps_2.12.0.aarch64.xml | 2 -- .../caps_2.12.0.ppc64.xml | 2 -- .../caps_2.12.0.s390x.xml | 2 -- .../caps_2.12.0.x86_64.xml | 2 -- .../caps_2.4.0.x86_64.xml | 2 -- .../caps_2.5.0.x86_64.xml | 2 -- .../caps_2.6.0.aarch64.xml | 2 -- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 2 -- .../caps_2.6.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml | 2 -- .../caps_2.7.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml | 2 -- .../caps_2.8.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 2 -- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml | 2 -- .../caps_2.9.0.x86_64.xml | 2 -- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 2 -- .../caps_3.0.0.riscv32.xml | 2 -- .../caps_3.0.0.riscv64.xml | 2 -- .../caps_3.0.0.x86_64.xml | 2 -- tests/qemuxml2argvtest.c | 6 ++--- 34 files changed, 12 insertions(+), 99 deletions(-) -- 2.17.1

3 11

[libvirt] [PATCH 0/2] Remove some unnecessary warnings
by Martin Kletzander 13 Sep '18

13 Sep '18

cd . ./blurb Martin Kletzander (2): Add functions for checking if user or group exists qemu: Report less errors on driver startup src/libvirt_private.syms | 2 ++ src/qemu/qemu_conf.c | 6 ++++-- src/util/virutil.c | 40 ++++++++++++++++++++++++++++++++-------- src/util/virutil.h | 4 ++++ 4 files changed, 42 insertions(+), 10 deletions(-) -- 2.18.0

3 5

[libvirt] [PATCH v7 0/2] deprecate incorrect CPUs topolog
by Igor Mammedov 12 Sep '18

12 Sep '18

Changelog since v5: * add(v6) and then remove(v7) Notes section to/from deprication doc (Eduardo Habkost <ehabkost(a)redhat.com>) * fix up wording and math formating in deprication doc (Eduardo Habkost <ehabkost(a)redhat.com>) * drop !socket check as it always evaluates to true at that point (Eduardo Habkost <ehabkost(a)redhat.com>) Changelog since v4: * extend deprication doc, adding that maxcpus should be multiple of present on CLI [sockets/cores/threads] options (Eduardo Habkost <ehabkost(a)redhat.com>) series bundles together 2 related patches posted separately earlier: vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case Goal is to depricate invalid topologies so we could make sure that topology configuration is correct by forbidding invalid input once deprecation period ends. --- CC: libvir-list(a)redhat.com CC: ehabkost(a)redhat.com Igor Mammedov (2): vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case qemu-deprecated.texi | 13 +++++++++++++ vl.c | 12 +++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) -- 2.7.4

2 4

[libvirt] [PATCH v5 0/2] deprecate incorrect CPUs topology
by Igor Mammedov 12 Sep '18

12 Sep '18

Changelog since v4: * extend deprication doc, adding that maxcpus should be multiple of present on CLI [sockets/cores/threads] options (Eduardo Habkost <ehabkost(a)redhat.com>) series bundles together 2 related patches posted separately earlier: vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case Goal is to depricate invalid topologies so we could make sure that topology configuration is correct by forbidding invalid input once deprecation period ends. --- CC: libvir-list(a)redhat.com CC: drjones(a)redhat.com CC: ehabkost(a)redhat.com Igor Mammedov (2): vl.c deprecate incorrect CPUs topology vl:c: make sure that sockets are calculated correctly in '-smp X' case qemu-deprecated.texi | 19 +++++++++++++++++++ vl.c | 12 +++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) -- 2.7.4

4 15

[libvirt] [PATCHv2 0/7] qemuxml2argvtest cleanups
by Ján Tomko 12 Sep '18

12 Sep '18

Patch 1 and patch 3 were not acked in v1. The changes to the ACKed ones are minimal. Complete diff to v2: diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 867e0d569f..0e43320b96 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -460,20 +460,20 @@ testCompareXMLToStartupXML(const void *data) } -# define TEST_EXCLUSIVE_FLAGS(FLAG1, FLAG2) \ - if ((testFlags & FLAG1) && (testFlags & FLAG2)) { \ - VIR_TEST_DEBUG("Flags %s and %s are mutually exclusive\n", \ - #FLAG1, #FLAG2); \ - return -1; \ - } - - static int -testCheckExclusiveFlags(int testFlags ATTRIBUTE_UNUSED) +testCheckExclusiveFlags(int flags) { - TEST_EXCLUSIVE_FLAGS(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE); - TEST_EXCLUSIVE_FLAGS(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR); - TEST_EXCLUSIVE_FLAGS(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS); + virCheckFlags(FLAG_EXPECT_FAILURE | + FLAG_EXPECT_PARSE_ERROR | + FLAG_FIPS | + FLAG_STEAL_VM | + FLAG_REAL_CAPS | + FLAG_SKIP_LEGACY_CPUS | + 0, -1); + + VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_FAILURE, -1); + VIR_EXCLUSIVE_FLAGS_RET(FLAG_STEAL_VM, FLAG_EXPECT_PARSE_ERROR, -1); + VIR_EXCLUSIVE_FLAGS_RET(FLAG_REAL_CAPS, FLAG_SKIP_LEGACY_CPUS, -1); return 0; } Ján Tomko (7): tests: add a function for checking exclusive flags tests: introduce macro for qemu XML->startup XML tests: only run startup XML tests if requested tests: report errors in QEMU XML->startup XML tests tests: do not mangle real qemu caps in xml2argvtest tests: turn skipLegacyCPUs into a flag qemu: remove unnecessary virQEMUCapsFreeHostCPUModel src/qemu/qemu_capabilities.c | 25 ++------------- src/qemu/qemu_capspriv.h | 5 --- tests/qemuxml2argvtest.c | 74 ++++++++++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 55 deletions(-) -- 2.16.4

2 8

[libvirt] [PATCH 0/2] Cleanup memoryBacking docs and move some hugepages checks
by John Ferlan 12 Sep '18

12 Sep '18

While reviewing the -memfd series: https://www.redhat.com/archives/libvir-list/2018-September/msg00381.html I noted that a couple of checks seemed out of place in the the domain_conf processing. They seem more "in place" in the hypvervisor processing. And while doing this I also noted the documentation is clearly not up to snuff, so I modified that too. That's a followup to another recent review comment: https://www.redhat.com/archives/libvir-list/2018-September/msg00176.html although I didn't delve into much detail, just the basics of what the attributes are and the acceptible values. John Ferlan (2): doc: Update the wording around the backingStore conf: Move hypervisor specific nhugepage checks docs/formatdomain.html.in | 13 ++++++++----- src/conf/domain_conf.c | 14 -------------- src/qemu/qemu_domain.c | 27 ++++++++++++++++++++++----- 3 files changed, 30 insertions(+), 24 deletions(-) -- 2.17.1

2 4

[libvirt] [jenkins-ci PATCH v2 0/2] Enable libosinfo tests that require network connectivity
by Fabiano Fidêncio 12 Sep '18

12 Sep '18

Let's enable both media and tree uris tests in order to early catch URL changes that need to be fixed in osinfo-db. Fabiano Fidêncio (2): guests: Enable {media,tree}uris tests for libosinfo projects: Enable {media,tree}uri tests for libosinfo guests/playbooks/build/projects/libosinfo.yml | 4 ++++ projects/libosinfo.yaml | 3 +++ 2 files changed, 7 insertions(+) -- 2.17.1

2 5

[libvirt] [PATCH 0/6] Introduce VIR_AUTOCLOSE macro for closing fd automatically
by Shi Lei 12 Sep '18

12 Sep '18

This series introduce VIR_AUTOCLOSE macro which can force close fd of the file automatically when the fd goes out of scope. It's used to eliminate VIR_FORCE_CLOSE in cleanup sections. The new macro consults VIR_AUTOFREE and VIR_AUTOPTR. Shi Lei (6): util: file: introduce VIR_AUTOCLOSE macro to close fd of the file automatically util: file: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections util: netdevbridge: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections phyp: driver: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections uml: conf: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE in cleanup sections src/phyp/phyp_driver.c | 29 ++--- src/uml/uml_conf.c | 13 +- src/util/virfile.c | 21 +-- src/util/virfile.h | 20 ++- src/util/virnetdev.c | 253 +++++++++++++------------------------ src/util/virnetdevbridge.c | 120 ++++++------------ 6 files changed, 163 insertions(+), 293 deletions(-) -- 2.17.1

3 21

[libvirt] [PATCH 0/3] Allow inputvol when creating vol from inputvol to be encrypted
by John Ferlan 12 Sep '18

12 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1613737 Details in the patches (and even more in the bz). John Ferlan (3): storage: Remove secretPath from _virStorageBackendQemuImgInfo storage: Allow for inputvol to have any format for encryption storage: Allow inputvol to be encrypted src/storage/storage_util.c | 79 ++++++++++++++++--- src/storage/storage_util.h | 1 + .../luks-convert-encrypt.argv | 11 +++ .../luks-convert-encrypt2fileqcow2.argv | 7 ++ .../luks-convert-encrypt2fileraw.argv | 7 ++ .../luks-convert-qcow2.argv | 9 +++ tests/storagevolxml2argvtest.c | 19 ++++- tests/storagevolxml2xmlin/vol-encrypt1.xml | 21 +++++ tests/storagevolxml2xmlin/vol-encrypt2.xml | 21 +++++ tests/storagevolxml2xmlin/vol-file-qcow2.xml | 21 +++++ 10 files changed, 184 insertions(+), 12 deletions(-) create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileqcow2.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-encrypt2fileraw.argv create mode 100644 tests/storagevolxml2argvdata/luks-convert-qcow2.argv create mode 100644 tests/storagevolxml2xmlin/vol-encrypt1.xml create mode 100644 tests/storagevolxml2xmlin/vol-encrypt2.xml create mode 100644 tests/storagevolxml2xmlin/vol-file-qcow2.xml -- 2.17.1

2 10

[libvirt] Fw: Re: [PATCH 4/6] util: netdev: use VIR_AUTOCLOSE instead of VIR_FORCE_CLOSE
by Shi Lei 12 Sep '18

12 Sep '18

On 2018-09-12 at 16:25, Shi Lei wrote: On 2018-09-12 at 15:21, Erik Skultety wrote: >On Tue, Sep 11, 2018 at 11:37:45PM +0800, Shi Lei wrote: >> On 2018-09-11 at 20:44, Erik Skultety wrote: >> >On Mon, Sep 10, 2018 at 11:47:53AM +0800, Shi Lei wrote: >> >> By making use of GNU C's cleanup attribute handled by the VIR_AUTOCLOSE macro, >> >> many of the VIR_FORCE_CLOSE calls can be dropped, which in turn leads to >> >> getting rid of many of our cleanup sections. >> >> >> >> Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> >> >> --- >> >> static int >> >> @@ -909,9 +867,9 @@ char *virNetDevGetName(int ifindex) >> >> #if defined(SIOCGIFINDEX) && defined(HAVE_STRUCT_IFREQ) >> >> int virNetDevGetIndex(const char *ifname, int *ifindex) >> >> { >> >> - int ret = -1; >> >> struct ifreq ifreq; >> >> - int fd = socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); >> >> + VIR_AUTOCLOSE(fd); >> >> + socket(VIR_NETDEV_FAMILY, SOCK_DGRAM, 0); >> > >> >^this could not potentially work... >> > >> >Erik >> >> Sorry! I'm too careless. >> >> I think that a new syntax-check rule might make sense. >> This rule checks below: >> >> type foo(a0, a1 ...); >> >> [type] var = foo(a0, a1, ...); /* It's OK */ >> ignore_value(foo(a0, a1, ...)); /* It's OK */ >> >> foo(a0, a1, ...); /* Report this usage */ > >but this would go away with the syntax-check rule you proposed in you response >to the first patch? If not, then would you be more specific to help me >understand the problem more? > >Thanks, >Erik Sorry! I was muddle-headed last night. It is not the syntax-check rule in my response to the first patch. This is another rule and I wanted to introduce it to avoid some faults then. Today I find that it is not easy as I thought. Please ignore it ... :-) Shi Lei > >> >> And it takes effect before compilation and even it's in the inactive >> side of the #if-#else conditons. >> >> It would not check macros since their name are upper case and >> we don't care for the function as condition in if-else statement. >> >> How about it? >> And I can try it if it's a bit helpful ... >> >> Shi Lei >> >> >> >> -- >> libvir-list mailing list >> libvir-list(a)redhat.com >> https://www.redhat.com/mailman/listinfo/libvir-list

1 0

[libvirt] [PATCHv3 0/3] Add virNetlinkNewLink helper for simplifying virNetDev*Create
by Shi Lei 12 Sep '18

12 Sep '18

v2 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00131.html Diff from V2: This series remove all unrelated changes. Those changes would be standalone patches. Shi Lei (3): util: netlink: Introduce virNetlinkNewLink helper util: netlink: Add wrapper macros to make virNetlinkNewLink more readable util: netlink: Using virNetlinkNewLink to simplify virNetDev*Create src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++--------------------- src/util/virnetdevmacvlan.c | 110 +++++------------------------------- src/util/virnetlink.c | 104 ++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 43 ++++++++++++++ 5 files changed, 172 insertions(+), 159 deletions(-) -- 2.17.1

3 17

[libvirt] [PATCH] numa: fix unsafe access to numa_nodes_ptr
by Wang Yechao 12 Sep '18

12 Sep '18

numa_nodes_ptr is a global variable in libnuma.so. It is been freed after main thread exits. If we have many running vms, restart the libvirtd service continuously at intervals of a few seconds, the main thread may exit before qemuProcessReconnect thread, and a segfault error occurs. Backstrace as follows: 0 0x00007f40e3d2dd72 in numa_bitmask_isbitset () from /lib64/libnuma.so.1 1 0x00007f40e4d14c55 in virNumaNodeIsAvailable (node=node@entry=0) at util/virnuma.c:396 2 0x00007f40e4d16010 in virNumaGetHostMemoryNodeset () at util/virnuma.c:1011 3 0x00007f40b94ced90 in qemuRestoreCgroupState (vm=0x7f407c39df00, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:877 4 qemuConnectCgroup (driver=driver@entry=0x7f407c21fe80, vm=0x7f407c39df00) at qemu/qemu_cgroup.c:969 5 0x00007f40b94eef93 in qemuProcessReconnect (opaque=<optimized out>) at qemu/qemu_process.c:3531 6 0x00007f40e4d34bd2 in virThreadHelper (data=<optimized out>) at util/virthread.c:206 7 0x00007f40e214ee25 in start_thread () from /lib64/libpthread.so.0 8 0x00007f40e1e7c36d in clone () from /lib64/libc.so.6 Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/virnuma.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 67e6c86..502b1d5 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -381,7 +381,10 @@ virNumaGetMaxCPUs(void) bool virNumaNodeIsAvailable(int node) { - return numa_bitmask_isbitset(numa_nodes_ptr, node); + if (numa_nodes_ptr) + return numa_bitmask_isbitset(numa_nodes_ptr, node); + else + return false; } -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] Fix issues in qemuARPGetInterfaces and virArpTableGet
by Lin Ma 12 Sep '18

12 Sep '18

Lin Ma (2): qemu: Remove network type limitation for qemuARPGetInterfaces virarptable: Return a virArpTablePtr when the nlmsghdr for loop is over src/qemu/qemu_driver.c | 3 --- src/util/virarptable.c | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) -- 2.16.2

2 6

Re: [libvirt] [PATCH v3 4/4] block/rbd: add deprecation documenation for filename keyvalue pairs
by Eric Blake 12 Sep '18

12 Sep '18

[MAINTAINERS says libvir-list should have been cc'd; not sure why that didn't happen] On 9/11/18 4:34 PM, Jeff Cody wrote: > Signed-off-by: Jeff Cody <jcody(a)redhat.com> In the subject: s/documenation/documentation/ > --- > qemu-deprecated.texi | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi > index 1b9c007f12..4df8ac442d 100644 > --- a/qemu-deprecated.texi > +++ b/qemu-deprecated.texi > @@ -190,6 +190,13 @@ used instead. > In order to prevent QEMU from automatically opening an image's backing > chain, use ``"backing": null'' instead. > > +@subsubsection "rbd keyvalue pair encoded filenames": "" (since 3.1.0) > + > +Options for ``rbd'' should be specified according to its runtime options, > +like other block drivers. Legacy parsing of keyvalue pair encoded > +filenames is useful to open images with the old format for backing files; > +These image files should be updated to use the current format. Can we give an example? Cribbing from patch 3, an example might look like changing: json:{"file.driver":"rbd", "file.filename":"rbd:rbd/name"} into: json:{"file.driver":"rbd", "file.pool":"rbd", "file.image":"name"} I'll let Peter or John comment on whether libvirt's RBD pool handler is impacted by this deprecation, but it seems reasonable to me. -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org

2 1

[libvirt] [PATCH] qemu_domain: Drop namespace check from top level functions
by Michal Privoznik 11 Sep '18

11 Sep '18

In some cases we are checking if the mount namespace is enabled at two places: one is at the beginning of exported function (e.g. qemuDomainNamespaceSetupDisk()) and the other is at the beginning of qemuDomainNamespaceMknodPaths() which is called from the former function anyway. Then we have some other functions which rely on the later check solely. In order to compensate for possibly needles function call, qemuDomainNamespaceMknodPaths() returns early if @npaths is zero. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5329899b13..15325aa4c1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12428,7 +12428,8 @@ qemuDomainNamespaceMknodPaths(virDomainObjPtr vm, int ret = -1; size_t i; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) || + !npaths) return 0; cfg = virQEMUDriverGetConfig(driver); @@ -12521,9 +12522,6 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, char *dmPath = NULL; int ret = -1; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - for (next = src; virStorageSourceIsBacking(next); next = next->backingStore) { if (virStorageSourceIsEmpty(next) || !virStorageSourceIsLocalStorage(next)) { @@ -12574,9 +12572,6 @@ qemuDomainNamespaceSetupHostdev(virDomainObjPtr vm, char **paths = NULL; size_t i, npaths = 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (qemuDomainGetHostdevPath(NULL, hostdev, false, &npaths, &paths, NULL) < 0) goto cleanup; @@ -12600,9 +12595,6 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, char **paths = NULL; size_t i, npaths = 0; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) - return 0; - if (qemuDomainGetHostdevPath(vm->def, hostdev, true, &npaths, &paths, NULL) < 0) goto cleanup; -- 2.16.4

2 1

[libvirt] Terminal input “udevadm trigger” command,then produce “nl_recv returned with error:No buffer space available”
by xiajidong＠cmss.chinamobile.com 11 Sep '18

11 Sep '18

Dear libvirt experts， I have add some patch as follow.this two patch add buffer size to avoid to produce “nl_recv returned with error:No buffer space available” 1. libvirt-nodedev-Increase-the-netlink-socket-buffer-size-to-t.patch 2. libvirt-util-increase-libnl-buffer-size.patch but as I set some configuration in /etc/libvirt/libvitd.conf as follows # Logging level: 4 errors, 3 warnings, 2 information, 1 debug log_level =2 # Multiple outputs can be defined, they just need to be separated by spaces. # e.g. to log all warnings and errors to syslog under the libvirtd ident: log_outputs="2:syslog:libvirtd" when I input “udevadm trigger” command [root@localhost ~]# vi /etc/libvirt/libvirtd.conf [root@localhost ~]# systemctl restart libvirtd [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# udevadm trigger [root@localhost ~]# then will produce “nl_recv returned with error:No buffer space available” [root@localhost ~]# tail -f /var/log/messages | grep buffer Sep 2 22:44:00 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:33 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available Sep 2 23:11:45 localhost libvirtd: 4004: error : virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available So my question is: When input “udevadm trigger” in terminal, if setting log_level and log_outputs="2:syslog:libvirtd",how to avoid to produce “error virNetlinkEventCallback:699 : nl_recv returned with error: No buffer space available” log information? I am looking forward to your reply. _____ Best Regards, Jidong Xia China Mobile (Suzhou) Software Technology Company.cloud computing product department Tel: (+86) 18896726087 E-Mail：xiajidong(a)cmss.chinamobile.com <mailto:xiajidong@cmss.chinamobile.com>

2 1

[libvirt] [PATCH] test: Remove possible infinite loop in virnetsockettest
by John Ferlan 11 Sep '18

11 Sep '18

Commit 39015a6f3 modified the test to be more reliable/realistic, but without checking the return status of virEventRunDefaultImpl it's possible that the test could run infinitely. Found by Coverity Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- tests/virnetsockettest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index cccb90d0be..490f720fd0 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -243,8 +243,13 @@ testSocketAccept(const void *opaque) &cdata) < 0) goto cleanup; - while (rsock == NULL) - virEventRunDefaultImpl(); + while (rsock == NULL) { + if (virEventRunDefaultImpl() < 0) { + VIR_WARN("Failed to run event loop: %s\n", + virGetLastErrorMessage()); + break; + } + } for (i = 0; i < nlsock; i++) { if (lsock[i] == rsock) { -- 2.17.1

2 2

[libvirt] [PATCH] news: Mention Xen support for PM suspend and wakeup
by Jim Fehlig 11 Sep '18

11 Sep '18

Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index b8bee35df0..9d16b2930b 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -35,6 +35,15 @@ <libvirt> <release version="v4.8.0" date="unreleased"> <section title="New features"> + <change> + <summary> + Xen: Support PM Suspend and Wakeup + </summary> + <description> + The libxl driver now supports the virDomainPMSuspendForDuration + and virDomainPMWakeup APIs. + </description> + </change> </section> <section title="Improvements"> <change> -- 2.18.0

2 1

[libvirt] [PATCH 0/9] qemuxml2argvtest cleanups
by Ján Tomko 11 Sep '18

11 Sep '18

While looking at how slow this test has gotten, I found a lost test case, some redundancies. Thankfully, not running the HostModel functions twice helped, but there is still room for improvement: we spend a lot of time in the CPU driver comparing the same strings over and over again and with over 300 entries in virQEMUCaps enum, we can reduce some of these string comparisons in the future to cope with more and more QEMU versions being tested. Ján Tomko (9): tests: drop 'drive' from qemuxml2startup tests tests: add macro for dealing with exclusive flags tests: introduce macro for qemu XML->startup XML tests: only run startup XML tests if requested tests: report errors in QEMU XML->startup XML tests tests: drop redundant virQEMUCapsFilterByMachineType tests: do not mangle real qemu caps in xml2argvtest tests: turn skipLegacyCPUs into a flag qemu: remove unnecessary virQEMUCapsFreeHostCPUModel src/qemu/qemu_capabilities.c | 25 +------ src/qemu/qemu_capspriv.h | 5 -- tests/qemuxml2argvtest.c | 76 +++++++++++++--------- .../{disk-drive-shared.xml => disk-shared.xml} | 0 4 files changed, 49 insertions(+), 57 deletions(-) rename tests/qemuxml2startupxmloutdata/{disk-drive-shared.xml => disk-shared.xml} (100%) -- 2.16.4

2 18

[libvirt] [PATCH] qemu: free SEV caps in virQEMUCapsDispose
by Ján Tomko 11 Sep '18

11 Sep '18

Commit 77f51ab5 started parsing an copying the SEV capabilities, but omitted the free call. Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_capabilities.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 08cf822b88..308f5602ca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1662,6 +1662,8 @@ void virQEMUCapsDispose(void *obj) VIR_FREE(qemuCaps->gicCapabilities); + virSEVCapabilitiesFree(qemuCaps->sevCapabilities); + virQEMUCapsHostCPUDataClear(&qemuCaps->kvmCPU); virQEMUCapsHostCPUDataClear(&qemuCaps->tcgCPU); } -- 2.16.4

2 1

[libvirt] [PATCH 0/2] Remove unnecessary/duplicated qemuAgentCheckError calls
by John Ferlan 11 Sep '18

11 Sep '18

Followup to review comments I made for recent agent series. John Ferlan (2): qemu: Remove duplicated qemuAgentCheckError qemu: Remove duplicated qemuAgentCheckError src/qemu/qemu_agent.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.17.1

2 3

[libvirt] [PATCHv4 0/2] Add virNetlinkNewLink helper for simplifying virNetDev*Create
by Shi Lei 11 Sep '18

11 Sep '18

v3 here: https://www.redhat.com/archives/libvir-list/2018-September/msg00233.html Diff from v3: This series make changes according to the comments from Erik and John. Shi Lei (2): util: netlink: Introduce virNetlinkNewLink helper to simplify virNetDev*Create util: netlink: Add wrapper macros to make virNetlinkNewLink more readable src/libvirt_private.syms | 1 + src/util/virnetdevbridge.c | 73 +++--------------------- src/util/virnetdevmacvlan.c | 110 +++++------------------------------ src/util/virnetlink.c | 111 ++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 36 ++++++++++++ 5 files changed, 172 insertions(+), 159 deletions(-) -- 2.17.1

2 4

[libvirt] [PATCH] add nodeset='all' and default for interleave mode
by Peng Hao 11 Sep '18

11 Sep '18

For interleave mode,sometimes we want to allocate mmeory regularly in all nodes on the host. But different hosts has different node number. So we add nodeset='all' for interleave mode and if nodeset=NULL default nodeset is 'all' for interleave mode. Signed-off-by: Peng Hao <peng.hao2(a)zte.com.cn> --- src/conf/numa_conf.c | 73 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 57 insertions(+), 16 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 97a3ca4..de5fb9c 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -29,6 +29,10 @@ #include "virnuma.h" #include "virstring.h" +#if WITH_NUMACTL +#include <numa.h> +#endif + /* * Distance definitions defined Conform ACPI 2.0 SLIT. * See include/linux/topology.h @@ -66,6 +70,7 @@ typedef virDomainNumaNode *virDomainNumaNodePtr; struct _virDomainNuma { struct { bool specified; + bool allnode; virBitmapPtr nodeset; virDomainNumatuneMemMode mode; virDomainNumatunePlacement placement; @@ -259,13 +264,17 @@ virDomainNumatuneParseXML(virDomainNumaPtr numa, tmp = virXMLPropString(node, "nodeset"); if (tmp) { - if (virBitmapParse(tmp, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) - goto cleanup; - - if (virBitmapIsAllClear(nodeset)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid value of 'nodeset': %s"), tmp); - goto cleanup; + if (strcmp(tmp, "all") == 0) { + numa->memory.allnode = true; + } else { + if (virBitmapParse(tmp, &nodeset, VIR_DOMAIN_CPUMASK_LEN) < 0) + goto cleanup; + + if (virBitmapIsAllClear(nodeset)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid value of 'nodeset': %s"), tmp); + goto cleanup; + } } VIR_FREE(tmp); @@ -319,10 +328,14 @@ virDomainNumatuneFormatXML(virBufferPtr buf, virBufferAsprintf(buf, "<memory mode='%s' ", tmp); if (numatune->memory.placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC) { - if (!(nodeset = virBitmapFormat(numatune->memory.nodeset))) - return -1; - virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset); - VIR_FREE(nodeset); + if (numatune->memory.allnode == true) { + virBufferAsprintf(buf, "nodeset='all'/>\n"); + } else { + if (!(nodeset = virBitmapFormat(numatune->memory.nodeset))) + return -1; + virBufferAsprintf(buf, "nodeset='%s'/>\n", nodeset); + VIR_FREE(nodeset); + } } else if (numatune->memory.placement) { tmp = virDomainNumatunePlacementTypeToString(numatune->memory.placement); virBufferAsprintf(buf, "placement='%s'/>\n", tmp); @@ -497,6 +510,9 @@ virDomainNumatuneSet(virDomainNumaPtr numa, virBitmapPtr nodeset) { int ret = -1; + int i = 0, maxnode = 0; + virBitmapPtr bitmap = NULL; + /* No need to do anything in this case */ if (mode == -1 && placement == -1 && !nodeset) @@ -538,7 +554,7 @@ virDomainNumatuneSet(virDomainNumaPtr numa, } if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_DEFAULT) { - if (numa->memory.nodeset || placement_static) + if (numa->memory.nodeset || placement_static || numa->memory.allnode) placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC; else placement = VIR_DOMAIN_NUMATUNE_PLACEMENT_AUTO; @@ -546,10 +562,35 @@ virDomainNumatuneSet(virDomainNumaPtr numa, if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && !numa->memory.nodeset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("nodeset for NUMA memory tuning must be set " - "if 'placement' is 'static'")); - goto cleanup; + if (mode != VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("nodeset for NUMA memory tuning must be set " + "if 'placement' is 'static'")); + goto cleanup; + } else { + /* default set all node if nodeset is NULL, when placement + * is static and mode is interleave. + */ + numa->memory.allnode = true; + } + } + + if (placement == VIR_DOMAIN_NUMATUNE_PLACEMENT_STATIC && + mode == VIR_DOMAIN_NUMATUNE_MEM_INTERLEAVE && + numa->memory.allnode) { + if ((bitmap = virBitmapNew(VIR_DOMAIN_CPUMASK_LEN)) == NULL) + goto cleanup; + virBitmapClearAll(bitmap); + maxnode = numa_max_node(); + for (i = 0; i <= maxnode; i++) { + if (virBitmapSetBit(bitmap, i) < 0) { + virBitmapFree(bitmap); + goto cleanup; + } + } + if (numa->memory.nodeset) + virBitmapFree(numa->memory.nodeset); + numa->memory.nodeset = bitmap; } /* setting nodeset when placement auto is invalid */ -- 1.8.3.1

2 1

[libvirt] [PATCH] docs: Fix missing timestamp inside backingStore.
by Julio Faracco 11 Sep '18

11 Sep '18

All backingStore XML definitions have a XML tag with the timestamp. This timestamp is not defined insinde RNG volume storage schema and it is causing some problems to validate and check volume XMLs. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1594266 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- docs/schemas/storagevol.rng | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index 96d6b3e6d0..32aaa2784d 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -139,6 +139,7 @@ </element> <ref name='format'/> <ref name='permissions'/> + <ref name='timestamps'/> </interleave> </element> </define> -- 2.17.1

2 1

[libvirt] [PATCH] qemu: fix deadlock if create qemuProcessReconnect thread failed
by Wang Yechao 11 Sep '18

11 Sep '18

qemuProcessReconnectHelper has hold the doms lock, if create qemuProcessReconnect thread failed, it will get the doms lock again to remove the dom from doms list. add obj->inReconnetCtx flag to avoid deadlock. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/conf/domain_conf.h | 1 + src/conf/virdomainobjlist.c | 6 ++++-- src/qemu/qemu_process.c | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e30a4b2..5bc5771 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2608,6 +2608,7 @@ struct _virDomainObj { virDomainSnapshotObjPtr current_snapshot; bool hasManagedSave; + bool inReconnectCtx; void *privateData; void (*privateDataFreeFunc)(void *); diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 805fe94..30300b4 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -397,11 +397,13 @@ virDomainObjListRemove(virDomainObjListPtr doms, dom->removing = true; virObjectRef(dom); virObjectUnlock(dom); - virObjectRWLockWrite(doms); + if (!dom->inReconnectCtx) + virObjectRWLockWrite(doms); virObjectLock(dom); virDomainObjListRemoveLocked(doms, dom); virObjectUnref(dom); - virObjectRWUnlock(doms); + if (!dom->inReconnectCtx) + virObjectRWUnlock(doms); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index eb9904b..8c30850 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8029,6 +8029,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj, */ qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, QEMU_ASYNC_JOB_NONE, 0); + obj->inReconnectCtx = true; qemuDomainRemoveInactiveJob(src->driver, obj); virDomainObjEndAPI(&obj); -- 1.8.3.1

1 0

[libvirt] [PATCH V2 0/2] libxl: drop support for Xen 4.4 and 4.5
by Jim Fehlig 11 Sep '18

11 Sep '18

V1: https://www.redhat.com/archives/libvir-list/2018-March/msg01704.html Jim Fehlig (2): libxl: drop support for Xen < 4.6 news: Announce dropping support for Xen 4.4 and 4.5 docs/drvxen.html.in | 2 +- docs/news.xml | 9 +++++++++ m4/virt-driver-libxl.m4 | 22 +--------------------- 3 files changed, 11 insertions(+), 22 deletions(-) -- 2.18.0

4 6

[libvirt] [PATCH] qemu: check for vhostusers bandwidth
by Roland Schulz 11 Sep '18

11 Sep '18

https://bugzilla.redhat.com/show_bug.cgi?id=1524230 Signed-off-by: Roland Schulz <schullzroll(a)gmail.com> --- src/qemu/qemu_command.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index ff9589f593..284c2709fc 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8244,6 +8244,8 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, unsigned int bootindex) { + virNetDevBandwidthPtr actualBandwidth = virDomainNetGetActualBandwidth(net); + virDomainNetType actualType = virDomainNetGetActualType(net); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); char *chardev = NULL; char *netdev = NULL; @@ -8257,6 +8259,19 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, goto cleanup; } + /* Set bandwidth or warn if requested and not supported. */ + if (actualBandwidth) { + if (virNetDevSupportBandwidth(actualType)) { + if (virNetDevBandwidthSet(net->ifname, actualBandwidth, false, + !virDomainNetTypeSharesHostView(net)) < 0) + goto cleanup; + } else { + VIR_WARN("setting bandwidth on interfaces of " + "type '%s' is not implemented yet", + virDomainNetTypeToString(actualType)); + } + } + switch ((virDomainChrType)net->data.vhostuser->type) { case VIR_DOMAIN_CHR_TYPE_UNIX: if (!(chardev = qemuBuildChrChardevStr(logManager, secManager, -- 2.17.1

3 3

[libvirt] [PATCH 0/5] libxl: various migration V3 improvements
by Jim Fehlig 11 Sep '18

11 Sep '18

Patch 5 fixes a long standing problem found by some very slow hosts in xen's osstest https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg01945.html While working on the fix, I discovered other problems in libxl's V3 migration protocol. E.g. a modify job on the migrating VM was not handled properly across the phases on either src or dst host. Patches 1-4 fix this and other problems found along the way. Jim Fehlig (5): libxl: migration: defer removing VM until finish phase libxl: fix logic in P2P migration libxl: fix job handling across migration phases on src libxl: fix job handling across migration phases on dst libxl: join with thread receiving migration data src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 7 -- src/libxl/libxl_migration.c | 168 ++++++++++++++++++++++++------------ 3 files changed, 114 insertions(+), 62 deletions(-) -- 2.18.0

2 6

[libvirt] [PATCH] nwfilter: fix deadlock when nwfilter reload
by Wang Yechao 11 Sep '18

11 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 1ee5162..8dcc40b 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -80,18 +80,27 @@ static void nwfilterDriverUnlock(void) } #if HAVE_FIREWALLD +static void nwfilterReloadThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + if (virThreadCreate(&thread, false, nwfilterReloadThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH] rpm: increase min required Fedora to 27
by Fabiano Fidêncio 11 Sep '18

11 Sep '18

Fedora 26 has reached its EOL on May 29th 2018. https://lists.fedoraproject.org/archives/list/announce@lists.fedoraproject.… Signed-off-by: Fabiano Fidêncio <fidencio(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 cc2e662e27..b31947b0f4 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -4,7 +4,7 @@ # that's still supported by the vendor. It may work on other distros # or versions, but no effort will be made to ensure that going forward. %define min_rhel 7 -%define min_fedora 26 +%define min_fedora 27 %if (0%{?fedora} && 0%{?fedora} >= %{min_fedora}) || (0%{?rhel} && 0%{?rhel} >= %{min_rhel}) %define supported_platform 1 -- 2.17.1

2 1

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 11 Sep '18

11 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Yi Wang <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH v3 0/3] libxl: implement virDomainPM* functions
by Marek Marczykowski-Górecki 10 Sep '18

10 Sep '18

Needed libxl_domain_suspend_only is supported in Xen >= 4.11. But wakeup should work with older versions. Marek Marczykowski-Górecki (3): libxl: send lifecycle event on suspend libxl: implement virDomainPM* functions libxl: initialize domain state with real data src/libxl/libxl_domain.c | 20 +++--- src/libxl/libxl_driver.c | 138 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 150 insertions(+), 8 deletions(-) base-commit: 3ad77f853230f870efa396636e008292c7f2b1c0 -- git-series 0.9.1

2 5

[libvirt] [PATCH] nwfilter:fix deadlock when nwfilter reload
by Wang Yechao 10 Sep '18

10 Sep '18

user run "firewalld-cmd --reload" nwfilterStateReload called in main thread step 1. virRWLockWrite(&updateLock) step 2. virNWFilterLoadAllConfigs step 3. virRWLockUnlock(&updateLock); lauch a vm: qemuDomainCreateXML runs in other thread step 1. virRWLockRead(&updateLock); step 2. qemuProcessStart step 3. qemuProcessWaitForMonitor step 4. ... step 5 virRWLockUnlock(&updateLock); if nwfilterStateReload called in the middle of step 1 and step 5 of qemuDomainCreateXML, it can't get the updateLock and then block the event_loop, so event_loop can't handle the qemu-monitor messages, cause deadlock move nwfilterStateReload into thread to fix this problem. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> Reviewed-by: Wang Yi <wang.yi59(a)zte.com.cn> --- src/nwfilter/nwfilter_driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/nwfilter/nwfilter_driver.c diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c old mode 100644 new mode 100755 index ac3a964..2c099e2 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -81,17 +81,28 @@ static void nwfilterDriverUnlock(void) #if HAVE_FIREWALLD +static void nwfilterThread(void *opaque ATTRIBUTE_UNUSED) +{ + nwfilterStateReload(); +} + static DBusHandlerResult nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, DBusMessage *message, void *user_data ATTRIBUTE_UNUSED) { + virThread thread; + if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || dbus_message_is_signal(message, "org.fedoraproject.FirewallD1", "Reloaded")) { VIR_DEBUG("Reload in nwfilter_driver because of firewalld."); - nwfilterStateReload(); + + /* create thread handle the nwfilter reload, don't block the event_loop.*/ + if (virThreadCreate(&thread, false, nwfilterThread, NULL) < 0) { + VIR_ERROR("create nwfilterThread failed."); + } } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -- 1.8.3.1

1 0

[libvirt] [PATCH] util: netlink: Remove virNetDevPutExtraHeader and replace with nlmsg_append
by Shi Lei 08 Sep '18

08 Sep '18

This patch removes virNetDevPutExtraHeader and replaces it with nlmsg_append directly. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/util/virnetdev.c | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index c4dd354..5d4ad24 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3163,28 +3163,6 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap, # if HAVE_DECL_DEVLINK_CMD_ESWITCH_GET -/** - * virNetDevPutExtraHeader - * reserve and prepare room for an extra header - * This function sets to zero the room that is required to put the extra - * header after the initial Netlink header. This function also increases - * the nlmsg_len field. - * - * @nlh: pointer to Netlink header - * @size: size of the extra header that we want to put - * - * Returns pointer to the start of the extended header - */ -static void * -virNetDevPutExtraHeader(struct nlmsghdr *nlh, - size_t size) -{ - char *ptr = (char *)nlh + nlh->nlmsg_len; - size_t len = NLMSG_ALIGN(size); - nlh->nlmsg_len += len; - return ptr; -} - /** * virNetDevGetFamilyId: @@ -3199,7 +3177,11 @@ virNetDevGetFamilyId(const char *family_name) { struct nl_msg *nl_msg = NULL; struct nlmsghdr *resp = NULL; - struct genlmsghdr* gmsgh = NULL; + struct genlmsghdr gmsgh = { + .cmd = CTRL_CMD_GETFAMILY, + .version = DEVLINK_GENL_VERSION, + .reserved = 0, + }; struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, }; unsigned int recvbuflen; uint32_t family_id = 0; @@ -3210,12 +3192,9 @@ virNetDevGetFamilyId(const char *family_name) goto cleanup; } - if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0) goto cleanup; - gmsgh->cmd = CTRL_CMD_GETFAMILY; - gmsgh->version = DEVLINK_GENL_VERSION; - if (nla_put_string(nl_msg, CTRL_ATTR_FAMILY_NAME, family_name) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("allocated netlink buffer is too small")); @@ -3262,7 +3241,11 @@ virNetDevSwitchdevFeature(const char *ifname, unsigned int recvbuflen; struct nlattr *tb[DEVLINK_ATTR_MAX + 1] = {NULL, }; virPCIDevicePtr pci_device_ptr = NULL; - struct genlmsghdr* gmsgh = NULL; + struct genlmsghdr gmsgh = { + .cmd = DEVLINK_CMD_ESWITCH_GET, + .version = DEVLINK_GENL_VERSION, + .reserved = 0, + }; const char *pci_name; char *pfname = NULL; int is_vf = -1; @@ -3292,12 +3275,9 @@ virNetDevSwitchdevFeature(const char *ifname, goto cleanup; } - if (!(gmsgh = virNetDevPutExtraHeader(nlmsg_hdr(nl_msg), sizeof(struct genlmsghdr)))) + if (nlmsg_append(nl_msg, &gmsgh, sizeof(gmsgh), NLMSG_ALIGNTO) < 0) goto cleanup; - gmsgh->cmd = DEVLINK_CMD_ESWITCH_GET; - gmsgh->version = DEVLINK_GENL_VERSION; - pci_name = virPCIDeviceGetName(pci_device_ptr); if (nla_put(nl_msg, DEVLINK_ATTR_BUS_NAME, strlen("pci")+1, "pci") < 0 || -- 2.17.1

2 2

[libvirt] [PATCH] util: netdev: fix memleak of virNetDevIPRouteAdd
by Shi Lei 08 Sep '18

08 Sep '18

This patch fixes memleak for *resp* in virNetDevIPRouteAdd. Signed-off-by: Shi Lei <shi_lei(a)massclouds.com> --- src/util/virnetdevip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index 0f080a5..16570a5 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -283,7 +283,7 @@ virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr gateway, unsigned int metric) { - struct nlmsghdr *resp = NULL; + VIR_AUTOFREE(struct nlmsghdr *) resp = NULL; unsigned int recvbuflen; unsigned int ifindex; struct rtmsg rtmsg; -- 2.17.1

2 2

[libvirt] [PATCH v2 0/3] libxl: implement virDomainPM* functions
by Marek Marczykowski-Górecki 07 Sep '18

07 Sep '18

Needed libxl_domain_suspend_only is supported in Xen >= 4.11. But wakeup should work with older versions. Marek Marczykowski-Górecki (3): libxl: send lifecycle event on suspend libxl: implement virDomainPM* functions libxl: initialize domain state with real data src/libxl/libxl_domain.c | 20 +++--- src/libxl/libxl_driver.c | 132 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 144 insertions(+), 8 deletions(-) base-commit: 3ad77f853230f870efa396636e008292c7f2b1c0 -- git-series 0.9.1

2 7