- Devel - libvirt List Archives

[libvirt] [PATCH] util: drop support for stack traces with logging
by Daniel P. Berrangé 10 Oct '19

10 Oct '19

The log filters have supported the use of a "+" before the source match string to request that a stack trace be emitted for every log message: commit 548563956e484e0e43e9a66a89bdda0f95930108 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed May 9 15:18:56 2012 +0100 Allow stack traces to be included with log messages Sometimes it is useful to see the callpath for log messages. This change enhances the log filter syntax so that stack traces can be show by setting '1:+NAME' instead of '1:NAME'. With the huge & ever increasing number of logging statements per file, this will be incredibly verbose and have a major performance penalty. This makes the feature impractical to use widely and as such it is not worth the code maint cost. Removing this seldom used feature allows us to drop the 'execinfo' module in gnulib which provides the backtrace() function which doesn't exist on non-Linux. Users who want to get stack traces of parts of libvirt can use GDB, or systemtap for live tracing with minimal perf impact. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- bootstrap.conf | 1 - docs/logging.html.in | 7 ++-- src/locking/virtlockd.conf | 4 --- src/logging/virtlogd.conf | 4 --- src/remote/libvirtd.conf.in | 4 --- src/util/virlog.c | 68 ++++++------------------------------- src/util/virlog.h | 11 +----- tests/testutils.c | 2 -- tests/virtestmock.c | 1 - 9 files changed, 14 insertions(+), 88 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 358d783a6b..55997b018f 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -35,7 +35,6 @@ connect configmake dirname-lgpl environ -execinfo fclose fcntl fcntl-h diff --git a/docs/logging.html.in b/docs/logging.html.in index be2fd4ab5b..d62220a9c1 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -102,16 +102,13 @@ variables. The format for a filter is one of: <pre> -x:name (log message only) -x:+name (log message + stack trace)</pre> +x:name (log message only)</pre> where <code>name</code> is a string which is matched against the category given in the VIR_LOG_INIT() at the top of each libvirt source file, e.g., <code>remote</code>, <code>qemu</code>, or <code>util.json</code> (the name in the filter can be a substring of the full category name, in order to match multiple - similar categories), the optional <code>+</code> prefix tells - libvirt to log stack trace for each message - matching <code>name</code>, and <code>x</code> is the minimal + similar categories), and <code>x</code> is the minimal level where matching messages should be logged: <ul> <li>1: DEBUG</li> diff --git a/src/locking/virtlockd.conf b/src/locking/virtlockd.conf index b65110fc3e..b75eb3b279 100644 --- a/src/locking/virtlockd.conf +++ b/src/locking/virtlockd.conf @@ -26,7 +26,6 @@ # of logs. The format for a filter is one of: # # level:match -# level:+match # # where 'match' is a string which is matched against the category # given in the VIR_LOG_INIT() at the top of each libvirt source @@ -35,9 +34,6 @@ # The 'match' is always treated as a substring match. IOW a match # string 'foo' is equivalent to '*foo*'. # -# If 'match' contains the optional "+" prefix, it tells libvirt -# to log stack trace for each message matching name. -# # 'level' is the minimal level where matching messages should # be logged: # diff --git a/src/logging/virtlogd.conf b/src/logging/virtlogd.conf index bc41edbc6b..9f2d36c382 100644 --- a/src/logging/virtlogd.conf +++ b/src/logging/virtlogd.conf @@ -26,7 +26,6 @@ # of logs. The format for a filter is one of: # # level:match -# level:+match # # where 'match' is a string which is matched against the category # given in the VIR_LOG_INIT() at the top of each libvirt source @@ -35,9 +34,6 @@ # The 'match' is always treated as a substring match. IOW a match # string 'foo' is equivalent to '*foo*'. # -# If 'match' contains the optional "+" prefix, it tells libvirt -# to log stack trace for each message matching name. -# # 'level' is the minimal level where matching messages should # be logged: # diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in index fdef97f371..50e3a00854 100644 --- a/src/remote/libvirtd.conf.in +++ b/src/remote/libvirtd.conf.in @@ -372,7 +372,6 @@ # of logs. The format for a filter is one of: # # level:match -# level:+match # # where 'match' is a string which is matched against the category # given in the VIR_LOG_INIT() at the top of each libvirt source @@ -381,9 +380,6 @@ # The 'match' is always treated as a substring match. IOW a match # string 'foo' is equivalent to '*foo*'. # -# If 'match' contains the optional "+" prefix, it tells libvirt -# to log stack trace for each message matching name. -# # 'level' is the minimal level where matching messages should # be logged: # diff --git a/src/util/virlog.c b/src/util/virlog.c index 4c76fbc5a4..611475c8d7 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -28,7 +28,6 @@ #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> -#include <execinfo.h> #include <regex.h> #include <sys/uio.h> #if HAVE_SYSLOG_H @@ -88,7 +87,6 @@ VIR_ENUM_IMPL(virLogDestination, struct _virLogFilter { char *match; virLogPriority priority; - unsigned int flags; /* bitwise OR of virLogFilterFlags */ }; static int virLogFiltersSerial = 1; @@ -127,7 +125,6 @@ static void virLogOutputToFd(virLogSourcePtr src, const char *funcname, const char *timestamp, virLogMetadataPtr metadata, - unsigned int flags, const char *rawstr, const char *str, void *data); @@ -510,19 +507,16 @@ virLogSourceUpdate(virLogSourcePtr source) virLogLock(); if (source->serial < virLogFiltersSerial) { unsigned int priority = virLogDefaultPriority; - unsigned int flags = 0; size_t i; for (i = 0; i < virLogNbFilters; i++) { if (fnmatch(virLogFilters[i]->match, source->name, 0) == 0) { priority = virLogFilters[i]->priority; - flags = virLogFilters[i]->flags; break; } } source->priority = priority; - source->flags = flags; source->serial = virLogFiltersSerial; } virLogUnlock(); @@ -591,7 +585,6 @@ virLogVMessage(virLogSourcePtr source, int ret; size_t i; int saved_errno = errno; - unsigned int filterflags = 0; if (virLogInitialize() < 0) return; @@ -611,7 +604,6 @@ virLogVMessage(virLogSourcePtr source, virLogSourceUpdate(source); if (priority < source->priority) goto cleanup; - filterflags = source->flags; /* * serialize the error message, add level and timestamp @@ -641,13 +633,13 @@ virLogVMessage(virLogSourcePtr source, if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawinitmsg, initmsg, + timestamp, NULL, rawinitmsg, initmsg, virLogOutputs[i]->data); VIR_FREE(initmsg); if (virLogHostnameString(&hoststr, &initmsg) >= 0) virLogOutputs[i]->f(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, hoststr, initmsg, + timestamp, NULL, hoststr, initmsg, virLogOutputs[i]->data); VIR_FREE(hoststr); VIR_FREE(initmsg); @@ -655,7 +647,7 @@ virLogVMessage(virLogSourcePtr source, } virLogOutputs[i]->f(source, priority, filename, linenr, funcname, - timestamp, metadata, filterflags, + timestamp, metadata, str, msg, virLogOutputs[i]->data); } } @@ -667,13 +659,13 @@ virLogVMessage(virLogSourcePtr source, if (virLogVersionString(&rawinitmsg, &initmsg) >= 0) virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, rawinitmsg, initmsg, + timestamp, NULL, rawinitmsg, initmsg, (void *) STDERR_FILENO); VIR_FREE(initmsg); if (virLogHostnameString(&hoststr, &initmsg) >= 0) virLogOutputToFd(&virLogSelf, VIR_LOG_INFO, __FILE__, __LINE__, __func__, - timestamp, NULL, 0, hoststr, initmsg, + timestamp, NULL, hoststr, initmsg, (void *) STDERR_FILENO); VIR_FREE(hoststr); VIR_FREE(initmsg); @@ -681,7 +673,7 @@ virLogVMessage(virLogSourcePtr source, } virLogOutputToFd(source, priority, filename, linenr, funcname, - timestamp, metadata, filterflags, + timestamp, metadata, str, msg, (void *) STDERR_FILENO); } virLogUnlock(); @@ -693,26 +685,6 @@ virLogVMessage(virLogSourcePtr source, } -static void -virLogStackTraceToFd(int fd) -{ - void *array[100]; - int size; - static bool doneWarning; - const char *msg = "Stack trace not available on this platform\n"; - -#define STRIP_DEPTH 3 - size = backtrace(array, ARRAY_CARDINALITY(array)); - if (size) { - backtrace_symbols_fd(array + STRIP_DEPTH, size - STRIP_DEPTH, fd); - ignore_value(safewrite(fd, "\n", 1)); - } else if (!doneWarning) { - ignore_value(safewrite(fd, msg, strlen(msg))); - doneWarning = true; - } -#undef STRIP_DEPTH -} - static void virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, virLogPriority priority ATTRIBUTE_UNUSED, @@ -721,7 +693,6 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, const char *funcname ATTRIBUTE_UNUSED, const char *timestamp, virLogMetadataPtr metadata ATTRIBUTE_UNUSED, - unsigned int flags, const char *rawstr ATTRIBUTE_UNUSED, const char *str, void *data) @@ -737,9 +708,6 @@ virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, ignore_value(safewrite(fd, msg, strlen(msg))); VIR_FREE(msg); - - if (flags & VIR_LOG_STACK_TRACE) - virLogStackTraceToFd(fd); } @@ -827,13 +795,10 @@ virLogOutputToSyslog(virLogSourcePtr source ATTRIBUTE_UNUSED, const char *funcname ATTRIBUTE_UNUSED, const char *timestamp ATTRIBUTE_UNUSED, virLogMetadataPtr metadata ATTRIBUTE_UNUSED, - unsigned int flags, const char *rawstr ATTRIBUTE_UNUSED, const char *str, void *data ATTRIBUTE_UNUSED) { - virCheckFlags(VIR_LOG_STACK_TRACE,); - syslog(virLogPrioritySyslog(priority), "%s", str); } @@ -975,12 +940,10 @@ virLogOutputToJournald(virLogSourcePtr source, const char *funcname, const char *timestamp ATTRIBUTE_UNUSED, virLogMetadataPtr metadata, - unsigned int flags, const char *rawstr, const char *str ATTRIBUTE_UNUSED, void *data) { - virCheckFlags(VIR_LOG_STACK_TRACE,); int buffd = -1; int journalfd = (intptr_t) data; struct msghdr mh; @@ -1168,8 +1131,6 @@ virLogGetFilters(void) virLogLock(); for (i = 0; i < virLogNbFilters; i++) { const char *sep = ":"; - if (virLogFilters[i]->flags & VIR_LOG_STACK_TRACE) - sep = ":+"; virBufferAsprintf(&filterbuf, "%d%s%s ", virLogFilters[i]->priority, sep, @@ -1395,7 +1356,6 @@ virLogOutputNew(virLogOutputFunc f, * virLogFilterNew: * @match: the pattern to match * @priority: the priority to give to messages matching the pattern - * @flags: extra flags, see virLogFilterFlags enum * * Allocates and returns a new log filter object. The object has to be later * defined, so that the pattern will be taken into account when executing the @@ -1409,15 +1369,12 @@ virLogOutputNew(virLogOutputFunc f, */ virLogFilterPtr virLogFilterNew(const char *match, - virLogPriority priority, - unsigned int flags) + virLogPriority priority) { virLogFilterPtr ret = NULL; char *mdup = NULL; size_t mlen = strlen(match); - virCheckFlags(VIR_LOG_STACK_TRACE, NULL); - if (priority < VIR_LOG_DEBUG || priority > VIR_LOG_ERROR) { virReportError(VIR_ERR_INVALID_ARG, _("Invalid log priority %d"), priority); @@ -1441,7 +1398,6 @@ virLogFilterNew(const char *match, ret->match = mdup; ret->priority = priority; - ret->flags = flags; return ret; } @@ -1661,9 +1617,6 @@ virLogParseOutput(const char *src) * * The format of @src should be one of the following: * x:name - filter affecting all modules which match 'name' - * x:+name - * - * '+' - hints the logger to also include a stack trace for every message * 'name' - match string which either matches a name of a directory in * libvirt's source tree which in turn affects all modules in * that directory or it can matches a specific module within a @@ -1689,7 +1642,6 @@ virLogParseFilter(const char *src) size_t count = 0; virLogPriority prio; char **tokens = NULL; - unsigned int flags = 0; char *match = NULL; VIR_DEBUG("filter=%s", src); @@ -1711,7 +1663,9 @@ virLogParseFilter(const char *src) match = tokens[1]; if (match[0] == '+') { - flags |= VIR_LOG_STACK_TRACE; + /* '+' used to indicate printing a stack trace, + * but we dropped that feature, so just chomp + * that leading '+' */ match++; } @@ -1723,7 +1677,7 @@ virLogParseFilter(const char *src) goto cleanup; } - if (!(ret = virLogFilterNew(match, prio, flags))) + if (!(ret = virLogFilterNew(match, prio))) goto cleanup; cleanup: diff --git a/src/util/virlog.h b/src/util/virlog.h index a30b760fb4..e27cd6475d 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -64,7 +64,6 @@ struct _virLogSource { const char *name; unsigned int priority; unsigned int serial; - unsigned int flags; }; /* @@ -77,7 +76,6 @@ struct _virLogSource { .name = "" n "", \ .priority = VIR_LOG_ERROR, \ .serial = 0, \ - .flags = 0, \ } /* @@ -144,7 +142,6 @@ typedef virLogFilter *virLogFilterPtr; * @funcname: the function emitting the message * @timestamp: zero terminated string with timestamp of the message * @metadata: NULL or metadata array, terminated by an item with NULL key - * @flags: flags associated with the message * @rawstr: the unformatted message to log, zero terminated * @str: the message to log, preformatted and zero terminated * @data: extra output logging data @@ -158,7 +155,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src, const char *funcname, const char *timestamp, virLogMetadataPtr metadata, - unsigned int flags, const char *rawstr, const char *str, void *data); @@ -171,10 +167,6 @@ typedef void (*virLogOutputFunc) (virLogSourcePtr src, */ typedef void (*virLogCloseFunc) (void *data); -typedef enum { - VIR_LOG_STACK_TRACE = (1 << 0), -} virLogFilterFlags; - int virLogGetNbFilters(void); int virLogGetNbOutputs(void); char *virLogGetFilters(void); @@ -224,8 +216,7 @@ virLogOutputPtr virLogOutputNew(virLogOutputFunc f, virLogDestination dest, const char *name) ATTRIBUTE_NONNULL(1); virLogFilterPtr virLogFilterNew(const char *match, - virLogPriority priority, - unsigned int flags) ATTRIBUTE_NONNULL(1); + virLogPriority priority) ATTRIBUTE_NONNULL(1); int virLogFindOutput(virLogOutputPtr *outputs, size_t noutputs, virLogDestination dest, const void *opaque); int virLogDefineOutputs(virLogOutputPtr *outputs, diff --git a/tests/testutils.c b/tests/testutils.c index 1b663f9d5d..92eb780617 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -740,13 +740,11 @@ virtTestLogOutput(virLogSourcePtr source ATTRIBUTE_UNUSED, const char *funcname ATTRIBUTE_UNUSED, const char *timestamp, virLogMetadataPtr metadata ATTRIBUTE_UNUSED, - unsigned int flags, const char *rawstr ATTRIBUTE_UNUSED, const char *str, void *data) { struct virtTestLogData *log = data; - virCheckFlags(VIR_LOG_STACK_TRACE,); virBufferAsprintf(&log->buf, "%s: %s", timestamp, str); } diff --git a/tests/virtestmock.c b/tests/virtestmock.c index df8cac6441..1261393ec2 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -22,7 +22,6 @@ #include <unistd.h> #include <sys/types.h> #include <fcntl.h> -#include <execinfo.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/socket.h> -- 2.21.0

2 1

[libvirt] [PATCH v2 00/23] Integrate usage of glib into libvirt
by Daniel P. Berrangé 10 Oct '19

10 Oct '19

This is a followup to a previous patch series: v0: https://www.redhat.com/archives/libvir-list/2019-August/msg01374.html v1: https://www.redhat.com/archives/libvir-list/2019-September/msg01331.html The focus in this glib series is - Wire up pieces to facilitate interoperability around memory allocation/cleanup. - Deprecate & document existing libvirt APIs that are targetted for removal/conversion. - Illustrate some conversions and/or usage of new APIs. - Convert code that allows us to eliminate more gnulib modules There's obviously alot of conversion work that could be done, especially around memory allocation, auto cleanup and virObject stuff. I'm not intending to do that myself in the short term, as my immediate focus is on eliminating gnulib modules. Once this series is merged though, anyone is able to take on conversion jobs, so this allows the work to be spread out across the contributors. Daniel P. Berrangé (23): build: probe for glib-2 library in configure build: link to glib library util: use glib memory allocation functions util: use glib string allocation/formatting functions util: convert virSystemdActivation to use VIR_DEFINE_AUTOPTR_FUNC util: rewrite auto cleanup macros to use glib's equivalent src: add support for g_autoptr with virObject instances conf: convert virSecretObj APIs to use autofree util: use glib base64 encoding/decoding APIs util: convert virIdentity implementation and test suite to g_autoptr access: convert polkit driver to auto free memory admin: convert admin server code to use auto free macros rpc: convert methods using virIdentityPtr to auto free macros remote: convert methods using virIdentityPtr to auto free macros util: convert virIdentity class to use GObject libxl: convert over to use GRegex for regular expressions conf: convert over to use GRegex for regular expressions virsh: convert command line parsing to use GOptionContext virt-admin: convert command line parsing to use GOptionContext virt-login-shell: convert command line parsing to use GOptionContext virt-host-validate: convert command line parsing to use GOptionContext util: replace strerror/strerror_r with g_strerror build: remove use of usleep gnulib module in favour of g_usleep bootstrap.conf | 8 - cfg.mk | 2 +- configure.ac | 7 +- docs/hacking.html.in | 144 ++++++------- libvirt.spec.in | 1 + m4/virt-glib.m4 | 36 ++++ mingw-libvirt.spec.in | 2 + src/Makefile.am | 2 + src/access/viraccessdriverpolkit.c | 38 ++-- src/admin/admin_server.c | 204 ++++++++----------- src/conf/capabilities.h | 3 + src/conf/domain_capabilities.h | 3 + src/conf/domain_conf.h | 3 + src/conf/domain_event.c | 25 +-- src/conf/snapshot_conf.h | 3 + src/conf/storage_capabilities.h | 3 + src/conf/virsecretobj.c | 68 ++----- src/datatypes.h | 15 ++ src/hyperv/hyperv_driver.c | 2 +- src/hyperv/hyperv_wmi.c | 4 +- src/internal.h | 1 + src/libvirt_private.syms | 1 - src/libxl/libxl_capabilities.c | 42 ++-- src/libxl/libxl_conf.c | 3 +- src/libxl/libxl_conf.h | 2 + src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/Makefile.inc.am | 2 + src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 4 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_agent.c | 6 +- src/qemu/qemu_blockjob.h | 1 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 5 +- src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 8 +- src/qemu/qemu_monitor_json.c | 2 +- src/qemu/qemu_process.c | 6 +- src/qemu/qemu_tpm.c | 2 +- src/remote/Makefile.inc.am | 1 + src/remote/remote_daemon.c | 3 +- src/remote/remote_daemon_dispatch.c | 35 ++-- src/rpc/virnetserverclient.c | 57 +++--- src/rpc/virnetserverprogram.c | 13 +- src/rpc/virnetsocket.c | 2 +- src/secret/secret_driver.c | 1 - src/security/security_manager.c | 2 +- src/storage/storage_backend_rbd.c | 4 +- src/storage/storage_util.c | 4 +- src/util/Makefile.inc.am | 1 + src/util/viralloc.c | 29 +-- src/util/viralloc.h | 14 +- src/util/virautoclean.h | 38 ++-- src/util/vircgroup.c | 2 +- src/util/virerror.c | 9 +- src/util/virerror.h | 1 + src/util/virfile.c | 2 +- src/util/virhostdev.h | 3 + src/util/viridentity.c | 97 ++++----- src/util/viridentity.h | 7 +- src/util/virmdev.h | 3 + src/util/virnetdev.c | 2 +- src/util/virnetdevip.c | 2 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virobject.h | 4 + src/util/virpci.c | 8 +- src/util/virpci.h | 3 + src/util/virprocess.c | 4 +- src/util/virresctrl.h | 4 + src/util/virscsi.h | 3 + src/util/virscsivhost.h | 3 + src/util/virstoragefile.h | 2 + src/util/virstring.c | 49 ++--- src/util/virstring.h | 10 +- src/util/virsystemd.c | 10 +- src/util/virsystemd.h | 5 +- src/util/virtime.c | 2 +- src/util/virusb.h | 3 + src/vbox/vbox_common.c | 2 +- tests/Makefile.am | 3 +- tests/commandtest.c | 16 +- tests/eventtest.c | 4 +- tests/fdstreamtest.c | 4 +- tests/qemumonitortestutils.c | 2 +- tests/seclabeltest.c | 4 +- tests/testutils.c | 6 +- tests/virhostcputest.c | 4 +- tests/viridentitytest.c | 45 ++-- tests/virnetserverclienttest.c | 3 +- tests/virsystemdtest.c | 2 +- tests/virtestmock.c | 4 +- tools/Makefile.am | 1 + tools/virsh-domain.c | 2 +- tools/virsh-secret.c | 17 +- tools/virsh.c | 304 +++++++++++++--------------- tools/virt-admin.c | 210 +++++++++---------- tools/virt-host-validate.c | 86 ++++---- tools/virt-login-shell-helper.c | 76 +++---- 103 files changed, 891 insertions(+), 1027 deletions(-) create mode 100644 m4/virt-glib.m4 -- 2.21.0

4 47

[libvirt] [PATCH 0/2] qemu: Add support for host-model pseries machine option
by Fabiano Rosas 10 Oct '19

10 Oct '19

This series adds support for the -machine,host-model= QEMU option for for pseries guests. Pseries guests used to have a node (/proc/device-tree/host-model) in device-tree that exposed the host's model string so that guest userspace tools could determine the host machine they were running on. QEMU used to provide the node by default, but this has been disabled due to security concerns. There is now a machine option (host-model) that allows the user to set an arbitrary string to be used as the host model. Userspace tools will then be broken unless the user explicitly edits the domain XML with the desired host model to be exposed to the guest. However, having an arbitrary string in the domain XML that needs to be the same for every guest in that machine but different across host machines would generate issues with XML portability and more importantly, migration. So this series implements a generic way for an administrator to enable the old behavior for a specific guest without allowing arbitrary strings. Implementation note: The 'host-serial' property, which reads /proc/device-tree/system-id in the host and was also addressed by the QEMU change could be implemented similarly in the future. However I see that we're currently populating smbios structures (virSysinfoDef) with info gathered from /proc/cpuinfo for architectures that do not use smbios and I think that should be addressed first. My idea is to perhaps create new sysinfo types like the existing 'smbios', such as 'cpuinfo' and 'device-tree'. So to keep the two discussions separated I took advantage of the fact that the host model happens to also be present at /proc/cpuinfo and used the smbios structures for now. Fabiano Rosas (2): qemu: Add capability for pseries machine 'host-model' parameter qemu: Add support for pseries 'host-model' machine parameter docs/formatdomain.html.in | 9 ++++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 4 +++ src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 25 ++++++++++++++-- src/qemu/qemu_domain.c | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + tests/qemuxml2argvdata/pseries-features.args | 3 +- tests/qemuxml2argvdata/pseries-features.xml | 1 + tests/qemuxml2argvtest.c | 30 ++++++++++++++++++- tests/qemuxml2xmloutdata/pseries-features.xml | 1 + 13 files changed, 79 insertions(+), 5 deletions(-) -- 2.20.1

2 7

[libvirt] [PATCH 0/2] qemu: Fix @vm locking issue when connecting to the monitor
by Michal Privoznik 10 Oct '19

10 Oct '19

See 1/2 for explanation. Michal Prívozník (2): qemu: Fix @vm locking issue when connecting to the monitor Revert "qemu: Obtain reference on monConfig" src/qemu/qemu_monitor.c | 33 +++++++++++++++++++++++++-------- src/qemu/qemu_process.c | 17 +---------------- tests/qemumonitortestutils.c | 2 ++ 3 files changed, 28 insertions(+), 24 deletions(-) -- 2.21.0

3 6

[libvirt] [PATCH] qemu_process: Initialize domain definition for QMP query
by Michal Privoznik 10 Oct '19

10 Oct '19

When constructing QMP capabilities we allocate a dummy domain object to pass to qemuMonitorOpen(). However, after 75dd595861 the function also expects domain definition to be allocated for the domain object. The referenced commit already fixed qemumonitortestutils.c but forgot to fix the other caller: qemuProcessQMPConnectMonitor(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/qemu/qemu_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ca2a5cab5b..c14c09da11 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8654,7 +8654,8 @@ qemuProcessQMPConnectMonitor(qemuProcessQMPPtr proc) monConfig.data.nix.listen = false; if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL, NULL, NULL)) || - !(proc->vm = virDomainObjNew(xmlopt))) + !(proc->vm = virDomainObjNew(xmlopt)) || + !(proc->vm->def = virDomainDefNew())) goto cleanup; proc->vm->pid = proc->pid; -- 2.21.0

1 0

[libvirt] [PATCH v2 0/1] IDE: Deprecate ide-drive
by John Snow 10 Oct '19

10 Oct '19

V2: Change phrasings and spellings as Markus suggested. John Snow (1): IDE: deprecate ide-drive qemu-deprecated.texi | 5 +++++ hw/ide/qdev.c | 3 +++ tests/qemu-iotests/051.pc.out | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) -- 2.21.0

3 3

[libvirt] Limiting old version back compat for language bindings ?
by Daniel P. Berrangé 10 Oct '19

10 Oct '19

In at least the Python and Go bindings for libvirt we use conditional compilation to allow the bindings to be build against old versions of libvirt. For Python this goes back to 0.9.11, from Apr 2012 For Go this goes back to 1.2.0, from Dec 2013 I'm wondering whether it would be worthwhile to define some rule to set a historical maximum, beyond which we will drop conditional compilation, or whether we're ok letting it grow without bound. The conditional compilation of code has some maint cost, but the cost is not huge, so I don't think this is something we need to be too aggressive on. At the same time I'm sceptical anyone is using latest Python bindings with libvirt 0.9.11, or latest Go bindings with libvirt 1.2.0 The challenge with language bindings is that users will often not use the language binding provided by the host OS vendor, instead preferring to download & build themselves. IOW, the host OS can have libvirt 3.0.0, but the app will be blindly pulling latest python binding (4.8.0) from PyPI and expect it to work. Of course if they're on an old distro, they could just pull an older version of the binding. Having to write code to download different version of the binding code on each OS is costly though, and indeed not even supported by common build tools. eg in python requirements.txt you can allow it to pick the latest version, or you can set an explicit version. The problem comes if you want to build on an OS with version 3.0.0, but also want to be able to use APIs from 4.0.0 if its available. AFAIK, you can't express this with distutils/setuptools. The same issue arises with the way you express deps in Go modules. You can ask for a specific version, but can't say to use a different version on certain OS. The key question is thus how far back applications should reasonably expect us to support language bindings. LTS distros live for quite a long time & its not unreasonable for apps to target them. In RHEL we've tended to rebase libvirt frequently while that RHEL version was the latest. That means we have RHEL-6 - 0.10.2 RHEL-7 - 4.5.0 RHEL-8 - 4.5.0 Considering Ubuntu LTS which doesn't rebase we have Trusty 14.04 - 1.2.2 Xenial 16.04 - 1.3.1 Bionic 18.04 - 4.0.0 Given this is only low/moderate maint cost, I'm tempted to be quite generous to applications and say that in January each year, we purge support for versions older than 5 years. This would imply... - Jan 2020 - purge older than 1.2.12 (Jan 2015) (Drops Trusty) - Jan 2021 - purge older than 1.3.1 (Jan 2016) - Jan 2022 - purge older than 3.0.0 (Jan 2017) (Drops Xenial) - Jan 2023 - purge older than 4.0.0 (Jan 2018) - Jan 2024 - purge older than 5.0.0 (Jan 2019) (drops RHEL-7, Bionic) - Jan 2025 - purge older than 6.0.0 (Jan 2020) Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

2 5

[libvirt] [PATCH v3 00/12] hostdev: handle usb detach/attach on node
by Nikolay Shirokovskiy 10 Oct '19

10 Oct '19

Diff to v2[1] version: - add 'replug' attribute for hostdev element to allow replug semantics - avoid accuiring domain lock in event loop thread on udev events as suggested by Peter - nit picks after review by Daniel Henrique Barboza * is used to mark patches that were 'Reviewed-by' by Daniel (sometimes with very minor changes to take into account new replug flag). [1] https://www.redhat.com/archives/libvir-list/2019-September/msg00321.html Nikolay Shirokovskiy (12): conf: add replug option for usb hostdev qemu: track hostdev delete intention qemu: support host usb device unplug * qemu: support usb hostdev plugging back * qemu: handle host usb device add/del udev events qemu: handle libvirtd restart after host usb device unplug * qemu: handle race on device deletion and usb host device plugging * qemu: hotplug: update device list on device deleted event qemu: handle host usb device plug/unplug when libvirtd is down * qemu: don't mess with non mandatory hostdevs on reattaching * qemu: handle detaching of unplugged hostdev conf: parse hostdev missing flag * docs/formatdomain.html.in | 10 +- docs/schemas/domaincommon.rng | 5 + src/conf/domain_conf.c | 62 +++ src/conf/domain_conf.h | 17 + src/qemu/Makefile.inc.am | 2 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 404 +++++++++++++++++- src/qemu/qemu_hotplug.c | 104 ++++- src/qemu/qemu_hotplug.h | 3 +- src/qemu/qemu_process.c | 60 +++ src/util/virhostdev.c | 2 + tests/qemuhotplugtest.c | 2 +- tests/qemuxml2argvdata/hostdev-usb-replug.xml | 36 ++ .../qemuxml2xmloutdata/hostdev-usb-replug.xml | 40 ++ tests/qemuxml2xmltest.c | 1 + 17 files changed, 733 insertions(+), 22 deletions(-) create mode 100644 tests/qemuxml2argvdata/hostdev-usb-replug.xml create mode 100644 tests/qemuxml2xmloutdata/hostdev-usb-replug.xml -- 2.23.0

2 15

[libvirt] Add support for vhost-user-scsi-pci/vhost-user-blk-pci
by Li Feng 10 Oct '19

10 Oct '19

Hi Guys, And I want to add the vhost-user-scsi-pci/vhost-user-blk-pci support for libvirt. The usage in qemu like this: Vhost-SCSI -chardev socket,id=char0,path=/var/tmp/vhost.0 -device vhost-user-scsi-pci,id=scsi0,chardev=char0 Vhost-BLK -chardev socket,id=char1,path=/var/tmp/vhost.1 -device vhost-user-blk-pci,id=blk0,chardev=char1 What type should I add for libvirt. Type1: <hostdev mode='subsystem' type='vhost-user'> <source protocol='vhost-user-scsi' path='/tmp/vhost-scsi.sock'></source> <alias name="vhost-user-scsi-disk1"/> </hostdev> Type2: <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source protocol='vhost-user' path='/tmp/vhost-scsi.sock'> </source> <target dev='sdb' bus='vhost-user-scsi'/> <boot order='3'/> <alias name='scsi0-0-0-1'/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> <disk type='network' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source protocol='vhost-user' path='/tmp/vhost-blk.sock'> </source> <target dev='vda' bus='vhost-user-blk'/> <boot order='1'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> Could anyone give some suggestions? Thanks, Feng Li -- The SmartX email address is only for business purpose. Any sent message that is not related to the business is not authorized or permitted by SmartX. 本邮箱为北京志凌海纳科技有限公司（SmartX）工作邮箱. 如本邮箱发出的邮件与工作无关,该邮件未得到本公司任何的明示或默示的授权.

2 1

[libvirt] [PATCH 0/1] IDE: Deprecate ide-drive
by John Snow 10 Oct '19

10 Oct '19

John Snow (1): IDE: deprecate ide-drive qemu-deprecated.texi | 5 +++++ hw/ide/qdev.c | 3 +++ tests/qemu-iotests/051.pc.out | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) -- 2.21.0

3 6