- Devel - libvirt List Archives

[libvirt] [PATCH] news: remove kernel version reference from switchdev entry
by Ján Tomko 20 Sep '17

20 Sep '17

The functionality was added in 4.8, but due to a rename of the DEVLINK_CMD_ESWITCH_GET constant in the kernel headers, the headers from kernel 4.11 are required by the libvirt code. Remove the reference from the news entry, since it could be misleading. --- docs/news.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/news.xml b/docs/news.xml index c48869c55..aab812b25 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -56,7 +56,7 @@ <description> Allow querying the NIC interface capabilities for the availability of switchdev offloading (also known as - kernel-forward-plane-offload introduced in kernel 4.8). + kernel-forward-plane-offload). </description> </change> </section> -- 2.13.0

2 1

[libvirt] [PATCH v2] util: Fix configure.ac check for DEVLINK_CMD_ESWITCH_GET
by John Ferlan 20 Sep '17

20 Sep '17

Turns out the mechanism of providing multiple definitions to check via AC_CHECK_DECLS in order to determine whether HAVE_DECL_DEVLINK should be set resulted in a false positive since as long as one of the defs was true, then the HAVE_DECL_DEVLINK got defined. But we cannot just check for the symbol we most care about due to a complication in a kernel 4.11 change that altered the name of the symbol from DEVLINK_CMD_ESWITCH_MODE_GET to DEVLINK_CMD_ESWITCH_GET in the newer kernel and added a #define for the former name with an ominous comment/caveat that the old format is obsolete should never be used. However, if we only looked for the new symbol, that would leave kernels 4.8 through 4.10 unable to use the command even though it exists under an old name. So, rather than checking for whether the devlink.h on the system has multiple symbols, let's only check for whether the command we want is defined. This patch checks for both symbol names in order to allow usage and then adds a check to see if the new name doesn't exist after linux/devlink.h is include, then to use #define of the new name to the old name - essentially the reverse logic that the 4.11 header file has. Note that we do not need to check for other symbols as well since they already existed prior to when the various ESWITCH symbols were added. Other defintions include DEVLINK_GENL_VERSION, DEVLINK_GENL_NAME, DEVLINK_ATTR_MAX, DEVLINK_ATTR_BUS_NAME, and DEVLINK_ATTR_DEV_NAME. The DEVLINK_ATTR_ESWITCH_MODE and DEVLINK_ESWITCH_MODE_SWITCHDEV were added at the same time as DEVLINK_CMD_ESWITCH_MODE_GET, but it's only DEVLINK_CMD_ESWITCH_MODE_GET that changed in 4.11. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2017-September/msg00543.html Just to make it official - here's what I described in the v1 followup which got the ACK if comment from Andrea: https://www.redhat.com/archives/libvir-list/2017-September/msg00591.html Still, I won't push this yet until it too gets an official blessing. configure.ac | 8 ++++++-- src/util/virnetdev.c | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index c9509c7f9..73ae7fdd5 100644 --- a/configure.ac +++ b/configure.ac @@ -630,12 +630,16 @@ fi dnl dnl check for kernel headers required by devlink dnl +dnl kernel 4.8 introduced DEVLINK_CMD_ESWITCH_MODE_GET, but that was +dnl later changed in kernel 4.11 to be just DEVLINK_CMD_ESWITCH_GET, so +dnl for "completeness" let's allow HAVE_DECL_DEVLINK to be define if +dnl either is defined. if test "$with_linux" = "yes"; then AC_CHECK_HEADERS([linux/devlink.h]) - AC_CHECK_DECLS([DEVLINK_GENL_VERSION, DEVLINK_GENL_NAME, DEVLINK_ATTR_MAX, DEVLINK_CMD_ESWITCH_GET, DEVLINK_ATTR_BUS_NAME, DEVLINK_ATTR_DEV_NAME, DEVLINK_ATTR_ESWITCH_MODE, DEVLINK_ESWITCH_MODE_SWITCHDEV], + AC_CHECK_DECLS([DEVLINK_CMD_ESWITCH_GET, DEVLINK_CMD_ESWITCH_MODE_GET], [AC_DEFINE([HAVE_DECL_DEVLINK], [1], - [whether devlink declarations are available])], + [whether devlink CMD_ESWITCH_GET is available])], [], [[#include <linux/devlink.h>]]) fi diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 040693925..435ca5562 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -61,6 +61,9 @@ #if HAVE_DECL_DEVLINK # include <linux/devlink.h> +# ifndef DEVLINK_CMD_ESWITCH_GET +# define DEVLINK_CMD_ESWITCH_GET DEVLINK_CMD_ESWITCH_MODE_GET +# endif #endif #ifndef IFNAMSIZ -- 2.13.5

3 3

[libvirt] [PATCH] Stop linking tests/commandhelper to libvirt code
by Daniel P. Berrange 20 Sep '17

20 Sep '17

The commandhelper binary is a helper for commandtest that validates what file handles were inherited. For this to work reliably we must not have any libraries that leak file descriptors into commandhelper. Unfortunately some versions of gnutls will intentionally open file handles at library load time via a constructor function. We previously hacked around this in commit 4cbc15d037e1cd8abf5c4aa6acc30d83ae13e34d Author: Martin Kletzander <mkletzan(a)redhat.com> Date: Fri May 2 09:55:52 2014 +0200 tests: don't fail with newer gnutls gnutls-3.3.0 and newer leaves 2 FDs open in order to be backwards compatible when it comes to chrooted binaries [1]. Linking commandhelper with gnutls then leaves these two FDs open and commandtest fails thanks to that. This patch does not link commandhelper with libvirt.la, but rather only the utilities making the test pass. Based on suggestion from Daniel [2]. [1] http://lists.gnutls.org/pipermail/gnutls-help/2014-April/003429.html [2] https://www.redhat.com/archives/libvir-list/2014-April/msg01119.html That fix relied on fact that while libvirt.so linked with gnutls, libvirt_util.la did not link to it. With the introduction of the util/vircrypto.c file that assumption is no longer valid. We must not link to libvirt_util.la at all - only gnulib and libc can (hopefully) be relied on not to open random file descriptors in constructors. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 8 ++++---- tests/Makefile.am | 6 ++++-- tests/commandhelper.c | 29 +++++++++++++---------------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/cfg.mk b/cfg.mk index 56cb14b..f2a053f 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1111,7 +1111,7 @@ $(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x exclude_file_name_regexp--sc_avoid_strcase = ^tools/vsh\.h$$ _src1=libvirt-stream|qemu/qemu_monitor|util/vir(command|file|fdstream)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon|logging/log_daemon -_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock +_test1=shunloadtest|virnettlscontexttest|virnettlssessiontest|vircgroupmock|commandhelper exclude_file_name_regexp--sc_avoid_write = \ ^(src/($(_src1))|daemon/libvirtd|tools/virsh-console|tests/($(_test1)))\.c$$ @@ -1146,10 +1146,10 @@ exclude_file_name_regexp--sc_prohibit_asprintf = \ ^(cfg\.mk|bootstrap.conf$$|examples/|src/util/virstring\.[ch]$$|tests/vircgroupmock\.c$$) exclude_file_name_regexp--sc_prohibit_strdup = \ - ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c$$) + ^(docs/|examples/|src/util/virstring\.c|tests/vir(netserverclient|cgroup)mock.c|tests/commandhelper\.c$$) exclude_file_name_regexp--sc_prohibit_close = \ - (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c)$$) + (\.p[yl]$$|\.spec\.in$$|^docs/|^(src/util/virfile\.c|src/libvirt-stream\.c|tests/vir.+mock\.c|tests/commandhelper\.c)$$) exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \ (^tests/(qemuhelp|virhostcpu|virpcitest)data/|docs/js/.*\.js|docs/fonts/.*\.woff|\.diff|tests/virconfdata/no-newline\.conf$$) @@ -1173,7 +1173,7 @@ exclude_file_name_regexp--sc_prohibit_select = \ ^cfg\.mk$$ exclude_file_name_regexp--sc_prohibit_raw_allocation = \ - ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock)\.c|tools/wireshark/src/packet-libvirt\.c)$$ + ^(docs/hacking\.html\.in|src/util/viralloc\.[ch]|examples/.*|tests/(securityselinuxhelper|(vircgroup|nss)mock|commandhelper)\.c|tools/wireshark/src/packet-libvirt\.c)$$ exclude_file_name_regexp--sc_prohibit_readlink = \ ^src/(util/virutil|lxc/lxc_container)\.c$$ diff --git a/tests/Makefile.am b/tests/Makefile.am index 8138885..0b2305d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -946,12 +946,14 @@ commandtest_SOURCES = \ commandtest.c testutils.h testutils.c commandtest_LDADD = $(LDADDS) +# Must not link to any libvirt modules - libc / gnulib only +# otherwise external libraries might unexpectedly leak +# file descriptors into commandhelper invalidating the +# test logic assumptions commandhelper_SOURCES = \ commandhelper.c commandhelper_LDADD = \ $(NO_INDIRECT_LDFLAGS) \ - $(PROBES_O) \ - ../src/libvirt_util.la \ $(GNULIB_LIBS) commandhelper_LDFLAGS = -static diff --git a/tests/commandhelper.c b/tests/commandhelper.c index 015efda..e9e6353 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -28,11 +28,6 @@ #include <sys/stat.h> #include "internal.h" -#include "virutil.h" -#include "viralloc.h" -#include "virfile.h" -#include "testutils.h" -#include "virstring.h" #ifndef WIN32 @@ -50,11 +45,13 @@ static int envsort(const void *a, const void *b) char *bkey; int ret; - ignore_value(VIR_STRNDUP_QUIET(akey, astr, aeq - astr)); - ignore_value(VIR_STRNDUP_QUIET(bkey, bstr, beq - bstr)); + if (!(akey = strndup(astr, aeq - astr))) + abort(); + if (!(bkey = strndup(bstr, beq - bstr))) + abort(); ret = strcmp(akey, bkey); - VIR_FREE(akey); - VIR_FREE(bkey); + free(akey); + free(bkey); return ret; } @@ -80,8 +77,8 @@ int main(int argc, char **argv) { origenv++; } - if (VIR_ALLOC_N_QUIET(newenv, n) < 0) - goto cleanup; + if (!(newenv = malloc(sizeof(*newenv) * n))) + abort(); origenv = environ; n = i = 0; @@ -120,7 +117,7 @@ int main(int argc, char **argv) { STREQ(cwd + strlen(cwd) - strlen("/commanddata"), "/commanddata")) strcpy(cwd, ".../commanddata"); fprintf(log, "CWD:%s\n", cwd); - VIR_FREE(cwd); + free(cwd); fprintf(log, "UMASK:%04o\n", umask(0)); @@ -144,9 +141,9 @@ int main(int argc, char **argv) { goto cleanup; if (got == 0) break; - if (safewrite(STDOUT_FILENO, buf, got) != got) + if (write(STDOUT_FILENO, buf, got) != got) goto cleanup; - if (safewrite(STDERR_FILENO, buf, got) != got) + if (write(STDERR_FILENO, buf, got) != got) goto cleanup; } @@ -158,8 +155,8 @@ int main(int argc, char **argv) { ret = EXIT_SUCCESS; cleanup: - VIR_FORCE_FCLOSE(log); - VIR_FREE(newenv); + fclose(log); + free(newenv); return ret; } -- 2.5.5

2 2

[libvirt] [PATCH v2] Fix libvirtd crash in qemuDomainGetTLSObjects
by Ashish Mittal 20 Sep '17

20 Sep '17

Passing a NULL value for the argument secAlias to the function qemuDomainGetTLSObjects causes a segmentation fault. Thread 3 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007f97c9c42a3d in qemuDomainGetTLSObjects (..., secAlias=0x0) at qemu/qemu_hotplug.c:1736 Changed code to not dereference a NULL secAlias. Signed-off-by: Ashish Mittal <ashmit602(a)gmail.com> --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7dd6e5f..9ecdf0a 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1643,7 +1643,8 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, } if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, - *secAlias, qemuCaps, tlsProps) < 0) + secAlias ? *secAlias : NULL, qemuCaps, + tlsProps) < 0) return -1; if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias))) -- 2.5.5

4 3

[libvirt] [PATCH] Fix libvirtd crash in qemuDomainGetTLSObjects
by Ashish Mittal 20 Sep '17

20 Sep '17

Passing a NULL value for the argument secAlias to the function qemuDomainGetTLSObjects causes a segmentation fault. Thread 3 "libvirtd" received signal SIGSEGV, Segmentation fault. 0x00007f97c9c42a3d in qemuDomainGetTLSObjects (...,secAlias=0x0) at qemu/qemu_hotplug.c:1736 Changed code to not dereference a NULL secAlias. Signed-off-by: Ashish Mittal <ashmit602(a)gmail.com> --- src/qemu/qemu_hotplug.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 7dd6e5f..df58ecc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1643,7 +1643,8 @@ qemuDomainGetTLSObjects(virQEMUCapsPtr qemuCaps, } if (qemuBuildTLSx509BackendProps(tlsCertdir, tlsListen, tlsVerify, - *secAlias, qemuCaps, tlsProps) < 0) + **secAlias ? *secAlias : NULL, qemuCaps, + tlsProps) < 0) return -1; if (!(*tlsAlias = qemuAliasTLSObjFromSrcAlias(srcAlias))) -- 2.5.5

3 3

[libvirt] [PATCH] storage: Add new events for *PoolBuild() and *PoolDelete().
by Julio Faracco 20 Sep '17

20 Sep '17

This commit adds new events for two methods and operations: *PoolBuild() and *PoolDelete(). Using the event-test and the commands set below we have the following outputs: $ sudo ./event-test Registering event callbacks myStoragePoolEventCallback EVENT: Storage pool test Defined 0 myStoragePoolEventCallback EVENT: Storage pool test Created 0 myStoragePoolEventCallback EVENT: Storage pool test Started 0 myStoragePoolEventCallback EVENT: Storage pool test Stopped 0 myStoragePoolEventCallback EVENT: Storage pool test Deleted 0 myStoragePoolEventCallback EVENT: Storage pool test Undefined 0 Another terminal: $ sudo virsh pool-define test.xml Pool test defined from test.xml $ sudo virsh pool-build test Pool test built $ sudo virsh pool-start test Pool test started $ sudo virsh pool-destroy test Pool test destroyed $ sudo virsh pool-delete test Pool test deleted $ sudo virsh pool-undefine test Pool test has been undefined This commits can be a solution for RHBZ #1475227. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1475227 Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- examples/object-events/event-test.c | 4 ++++ include/libvirt/libvirt-storage.h | 2 ++ src/storage/storage_driver.c | 17 +++++++++++++++++ src/test/test_driver.c | 14 ++++++++++++++ tools/virsh-pool.c | 4 +++- 5 files changed, 40 insertions(+), 1 deletion(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 78d2008..a144638 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -356,6 +356,10 @@ storagePoolEventToString(int event) return "Started"; case VIR_STORAGE_POOL_EVENT_STOPPED: return "Stopped"; + case VIR_STORAGE_POOL_EVENT_CREATED: + return "Created"; + case VIR_STORAGE_POOL_EVENT_DELETED: + return "Deleted"; case VIR_STORAGE_POOL_EVENT_LAST: break; } diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 4517f71..736e2e3 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -465,6 +465,8 @@ typedef enum { VIR_STORAGE_POOL_EVENT_UNDEFINED = 1, VIR_STORAGE_POOL_EVENT_STARTED = 2, VIR_STORAGE_POOL_EVENT_STOPPED = 3, + VIR_STORAGE_POOL_EVENT_CREATED = 4, + VIR_STORAGE_POOL_EVENT_DELETED = 5, # ifdef VIR_ENUM_SENTINELS VIR_STORAGE_POOL_EVENT_LAST diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7cf5943..5e50415 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -959,6 +959,7 @@ storagePoolBuild(virStoragePoolPtr pool, { virStoragePoolObjPtr obj; virStorageBackendPtr backend; + virObjectEventPtr event = NULL; int ret = -1; if (!(obj = virStoragePoolObjFromStoragePool(pool))) @@ -980,9 +981,17 @@ storagePoolBuild(virStoragePoolPtr pool, if (backend->buildPool && backend->buildPool(pool->conn, obj, flags) < 0) goto cleanup; + + event = virStoragePoolEventLifecycleNew(obj->def->name, + obj->def->uuid, + VIR_STORAGE_POOL_EVENT_CREATED, + 0); + ret = 0; cleanup: + if (event) + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjUnlock(obj); return ret; } @@ -1062,6 +1071,7 @@ storagePoolDelete(virStoragePoolPtr pool, { virStoragePoolObjPtr obj; virStorageBackendPtr backend; + virObjectEventPtr event = NULL; char *stateFile = NULL; int ret = -1; @@ -1106,9 +1116,16 @@ storagePoolDelete(virStoragePoolPtr pool, if (backend->deletePool(pool->conn, obj, flags) < 0) goto cleanup; + event = virStoragePoolEventLifecycleNew(obj->def->name, + obj->def->uuid, + VIR_STORAGE_POOL_EVENT_DELETED, + 0); + ret = 0; cleanup: + if (event) + virObjectEventStateQueue(driver->storageEventState, event); virStoragePoolObjUnlock(obj); return ret; } diff --git a/src/test/test_driver.c b/src/test/test_driver.c index aa38f54..0a2cde7 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -4562,13 +4562,20 @@ testStoragePoolBuild(virStoragePoolPtr pool, { testDriverPtr privconn = pool->conn->privateData; virStoragePoolObjPtr obj; + virObjectEventPtr event = NULL; virCheckFlags(0, -1); if (!(obj = testStoragePoolObjFindInactiveByName(privconn, pool->name))) return -1; + event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, + VIR_STORAGE_POOL_EVENT_CREATED, + 0); + virStoragePoolObjUnlock(obj); + + testObjectEventQueue(privconn, event); return 0; } @@ -4653,12 +4660,19 @@ testStoragePoolDelete(virStoragePoolPtr pool, { testDriverPtr privconn = pool->conn->privateData; virStoragePoolObjPtr obj; + virObjectEventPtr event = NULL; virCheckFlags(0, -1); if (!(obj = testStoragePoolObjFindInactiveByName(privconn, pool->name))) return -1; + event = virStoragePoolEventLifecycleNew(pool->name, pool->uuid, + VIR_STORAGE_POOL_EVENT_DELETED, + 0); + + testObjectEventQueue(privconn, event); + virStoragePoolObjUnlock(obj); return 0; } diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index ba9281f..558461b 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1952,7 +1952,9 @@ VIR_ENUM_IMPL(virshPoolEvent, N_("Defined"), N_("Undefined"), N_("Started"), - N_("Stopped")) + N_("Stopped"), + N_("Created"), + N_("Deleted")) static const char * virshPoolEventToString(int event) -- 2.7.4

2 1

[libvirt] [PATCH] Link libvirt_util.la with gnutls
by Daniel P. Berrange 20 Sep '17

20 Sep '17

The util/vircrypto.c file uses gnutls, so we must directly link libvirt_util.la with gnutls to avoid errors on OS which do not resolve symbols against indirectly linked libraries. This fixes a build failure on Ubuntu Trusty CCLD storagevolxml2argvtest /usr/bin/ld: ../src/.libs/libvirt_util.a(libvirt_util_la-vircrypto.o): undefined reference to symbol 'gnutls_strerror@@GNUTLS_1_4' //usr/lib/x86_64-linux-gnu/libgnutls.so.26: error adding symbols: DSO missing from command line Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build breaker fix src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index c3c7a8f04..173fba1e6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1224,7 +1224,7 @@ libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(WIN32_EXTRA_LIBS) $(LIBXML_LIBS) \ $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(ACL_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) $(GNUTLS_LIBS) noinst_LTLIBRARIES += libvirt_conf.la -- 2.13.5

2 2

[libvirt] [PATCH v2] qemu: handle reconnect on chardev hotplug
by ZhiPeng Lu 20 Sep '17

20 Sep '17

The patch passes the reconnect timeout to QEMU by monitor on chardev hotplug. Signed-off-by: ZhiPeng Lu <lu.zhipeng(a)zte.com.cn> --- v1->v2: - Fix syntax errors about Curly brackets --- src/qemu/qemu_monitor_json.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df5fb7c..290a037 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6444,6 +6444,17 @@ int qemuMonitorJSONGetTPMTypes(qemuMonitorPtr mon, return qemuMonitorJSONGetStringArray(mon, "query-tpm-types", tpmtypes); } +static int +qemuMonitorJSONBuildChrChardevReconnect(virJSONValuePtr object, + const virDomainChrSourceReconnectDef *def) +{ + int ret = 0; + + if (def->enabled == VIR_TRISTATE_BOOL_YES) + ret = virJSONValueObjectAppendNumberUint(object, "reconnect", def->timeout); + return ret; +} + static virJSONValuePtr qemuMonitorJSONAttachCharDevCommand(const char *chrID, const virDomainChrSourceDef *chr) @@ -6508,6 +6519,9 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendString(data, "tls-creds", tlsalias) < 0) goto cleanup; } + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.tcp.reconnect) < 0) + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_UDP: @@ -6545,6 +6559,9 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, if (virJSONValueObjectAppendBoolean(data, "wait", false) < 0 || virJSONValueObjectAppendBoolean(data, "server", chr->data.nix.listen) < 0) goto cleanup; + + if (qemuMonitorJSONBuildChrChardevReconnect(data, &chr->data.nix.reconnect) < 0) + goto cleanup; break; case VIR_DOMAIN_CHR_TYPE_SPICEVMC: -- 1.8.3.1

2 1

[libvirt] [PATCH v7 00/11] Add support for Veritas HyperScale (VxHS) block device protocol
by John Ferlan 20 Sep '17

20 Sep '17

v6: https://www.redhat.com/archives/libvir-list/2017-August/msg00993.html Changes/notes since v6: Patch1 - Used the "right" process to create the files. There's also a separate patch on list which I used mainly to "extract" the details/needs from being associated specifically with the addition of VxHS support Patch2 - Altered the commit message slightly to note that lack of ability to actually check that even though something is introspectible, there's no "non-hacky" way to determine if the QEMU image being used was built "--enable=vxhs" *unless* (as Jeff Cody points out) we scan --help output for vxhs within the "Supported formats:" line. We're avoiding that path for many different reasons. Patch3 -> Patch5 - No change, patches ACKed. Patch6 - Removed qemuCaps from qemuBlockStorageSourceGetVxHSProps and created a qemuProcessStartValidateDisks which will run the disk list looking for NETWORK and VXHS to ensure the QEMU_CAPS_VXHS bit is set. Also added a note here similar to patch2 describing the "gotcha" with the processing. Patch7 - Altered the text of the vxhs_tls description a bit, not much Patch8 - Altered the formatdomain.html.in description a bit in order to remove the previous restriction surrounding when vxhs_tls = 0, but src->haveTLS = YES. Added a tlsFromConfig boolean to virStorageSource to match the same logic as chardev's use. Documented it's use though as every time I've read that for chardev, I've first said tlsFromConfig must mean domain config, when in fact it's meant to be qemu.conf. Make code adjustments to handle tlsFromConfig Patch9 - Altered the order here - used to be flip-flopped with subsequent patch. Create the qemuDomainPrepareDiskSource[TLS] API's in order manage the src->haveTLS setting just as we've done for chardev. Also, introduce and manage a virStorageSource "tlsAlias" field. This is where we'll "set" the alias to be used. Patch10- Fixed up the virStorageSourceParseBackingJSONVxHS and TEST_BACKING_PARSE to manage the new src->tlsAlias field. Patch11- Make this all work for qemu_command *and* qemu_hotplug - well theoretically at least. The hotplug code is new in this patch - it has essentially copied what was needed from qemuDomainAddChardevTLSObjects and applied it to the needs for disks in general, but mainly for VxHS in particular. The qemuDomainAddDiskTLSObjects also doesn't set a 'tlscreds' boolean like Chardev does since JSON object generation doesn't occur in the depths of qemu_monitor_json, but rather it occurs in qemu_block and we have everything we need there. Probably could have done the chardev code differently to keep the TLS alias around... Although I don't believe VxHS has support/need for MassUSB and SCSI Disk operations, adding the infrastructure there should be usable for future needs. I also left a note about future needs that may arise if some network disk type requires a secret to decrypt a server key (although I cannot imagine the need, someone else may have a better imagination than me). The rest of the qemu_command changes remove the qemuCaps and diskAlias parameters from the qemuBlockStorageSourceGetBackendProps API and use what's been (hopefully) properly set up during qemuDomainPrepareDiskSourceTLS. Finally former patch12 has been removed since there is no restriction regarding vxhs_tls = 0 and "tls = 'yes'"... Also former patch13 has been merged into patch11. Still to be done: Patch12 - A news.xml article for 3.8.0, but 3.7.0 isn't closed yet so I'm waiting... Testing, testing, testing, testing, testing, and more testing. Hopefully even some hotplug testing as I have absolutely no way to know if the changes I've made actually work since I don't have a Veritas enviroment set up. I leave the testing/debugging to Ashish. I do believe that patches 1-5 (e.g. everything not TLS related are reasonable and ready once 3.8.0 opens for business). Ashish Mittal (8): storage: Introduce VIR_STORAGE_NET_PROTOCOL_VXHS docs: Add schema and docs for Veritas HyperScale (VxHS) util: storage: Add JSON backing volume parse for VxHS qemu: Add qemu command line generation for a VxHS block device conf: Introduce TLS options for VxHS block device clients util: Add TLS attributes to virStorageSource util: Add virstoragetest to parse/format a tls='yes' qemu: Add TLS support for Veritas HyperScale (VxHS) John Ferlan (3): qemu: Add QEMU 2.10 x86_64 the generated capabilities qemu: Detect support for vxhs qemu: Introduce qemuDomainPrepareDiskSource docs/formatdomain.html.in | 45 +- docs/schemas/domaincommon.rng | 18 + src/conf/domain_conf.c | 28 +- src/libxl/libxl_conf.c | 1 + src/qemu/libvirtd_qemu.aug | 4 + src/qemu/qemu.conf | 34 + src/qemu/qemu_block.c | 44 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 3 + src/qemu/qemu_command.c | 38 + src/qemu/qemu_conf.c | 16 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 71 + src/qemu/qemu_domain.h | 11 + src/qemu/qemu_driver.c | 3 + src/qemu/qemu_hotplug.c | 73 + src/qemu/qemu_parse_command.c | 15 + src/qemu/qemu_process.c | 33 + src/qemu/test_libvirtd_qemu.aug.in | 2 + src/util/virstoragefile.c | 58 +- src/util/virstoragefile.h | 14 + src/xenconfig/xen_xl.c | 1 + .../caps_2.10.0.x86_64.replies | 18144 +++++++++++++++++++ tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 799 + tests/qemucapabilitiestest.c | 1 + ...-disk-drive-network-tlsx509-multidisk-vxhs.args | 43 + ...v-disk-drive-network-tlsx509-multidisk-vxhs.xml | 50 + ...muxml2argv-disk-drive-network-tlsx509-vxhs.args | 30 + ...emuxml2argv-disk-drive-network-tlsx509-vxhs.xml | 32 + .../qemuxml2argv-disk-drive-network-vxhs.args | 27 + .../qemuxml2argv-disk-drive-network-vxhs.xml | 32 + tests/qemuxml2argvtest.c | 8 + ...uxml2xmlout-disk-drive-network-tlsx509-vxhs.xml | 34 + .../qemuxml2xmlout-disk-drive-network-vxhs.xml | 34 + tests/qemuxml2xmltest.c | 2 + tests/virstoragetest.c | 23 + 36 files changed, 19766 insertions(+), 12 deletions(-) create mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies create mode 100644 tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-multidisk-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-tlsx509-vxhs.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-vxhs.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-tlsx509-vxhs.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-network-vxhs.xml -- 2.9.5

4 22

[libvirt] [PATCH v2 0/2] qemu: blockPeek: Fix invalid buffer usage
by Peter Krempa 19 Sep '17

19 Sep '17

v2 fixes bug introduced by attempting to split the change into two patches. Peter Krempa (2): qemu: blockPeek: Fix filling of the return buffer qemu: blockPeek: Enforce buffer filling src/qemu/qemu_driver.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- 2.14.1

2 3