- Devel - libvirt List Archives

[libvirt] [PATCH] libxl: define a per-domain logger.
by Cédric Bosdonnat 04 Jan '17

04 Jan '17

libxl doesn't provide a way to write one log for each domain. Thus we need to demux the messages. If our logger doesn't know to which domain to attribute a message, then it will write it to the default log file. Starting with Xen 4.9 (commit f9858025 and following), libxl will write the domain ID in an easy to grab manner. The logger introduced by this commit will use it to demux the libxl log messages. Thanks to the default log file, this logger will also work with older versions of Xen. --- src/Makefile.am | 1 + src/libxl/libxl_conf.c | 38 +-------- src/libxl/libxl_conf.h | 4 +- src/libxl/libxl_domain.c | 4 + src/libxl/libxl_driver.c | 2 + src/libxl/libxl_logger.c | 217 +++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_logger.h | 39 +++++++++ 7 files changed, 268 insertions(+), 37 deletions(-) create mode 100644 src/libxl/libxl_logger.c create mode 100644 src/libxl/libxl_logger.h diff --git a/src/Makefile.am b/src/Makefile.am index b71378728..e34d52345 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -851,6 +851,7 @@ LIBXL_DRIVER_SOURCES = \ libxl/libxl_capabilities.c libxl/libxl_capabilities.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index b569ddad8..929179903 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -76,9 +76,7 @@ libxlDriverConfigDispose(void *obj) virObjectUnref(cfg->caps); libxl_ctx_free(cfg->ctx); - xtl_logger_destroy(cfg->logger); - if (cfg->logger_file) - VIR_FORCE_FCLOSE(cfg->logger_file); + libxlLoggerFree(cfg->logger); VIR_FREE(cfg->configDir); VIR_FREE(cfg->autostartDir); @@ -1356,8 +1354,6 @@ libxlDriverConfigPtr libxlDriverConfigNew(void) { libxlDriverConfigPtr cfg; - char *log_file = NULL; - xentoollog_level log_level = XTL_DEBUG; char ebuf[1024]; unsigned int free_mem; @@ -1386,9 +1382,6 @@ libxlDriverConfigNew(void) if (VIR_STRDUP(cfg->channelDir, LIBXL_CHANNEL_DIR) < 0) goto error; - if (virAsprintf(&log_file, "%s/libxl-driver.log", cfg->logDir) < 0) - goto error; - if (virFileMakePath(cfg->logDir) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("failed to create log dir '%s': %s"), @@ -1397,37 +1390,13 @@ libxlDriverConfigNew(void) goto error; } - if ((cfg->logger_file = fopen(log_file, "a")) == NULL) { - VIR_ERROR(_("Failed to create log file '%s': %s"), - log_file, virStrerror(errno, ebuf, sizeof(ebuf))); - goto error; - } - VIR_FREE(log_file); - - switch (virLogGetDefaultPriority()) { - case VIR_LOG_DEBUG: - log_level = XTL_DEBUG; - break; - case VIR_LOG_INFO: - log_level = XTL_INFO; - break; - case VIR_LOG_WARN: - log_level = XTL_WARN; - break; - case VIR_LOG_ERROR: - log_level = XTL_ERROR; - break; - } - - cfg->logger = - (xentoollog_logger *)xtl_createlogger_stdiostream(cfg->logger_file, - log_level, XTL_STDIOSTREAM_SHOW_DATE); + cfg->logger = libxlLoggerNew(cfg->logDir, virLogGetDefaultPriority()); if (!cfg->logger) { VIR_ERROR(_("cannot create logger for libxenlight, disabling driver")); goto error; } - if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, cfg->logger)) { + if (libxl_ctx_alloc(&cfg->ctx, LIBXL_VERSION, 0, (void*)cfg->logger)) { VIR_ERROR(_("cannot initialize libxenlight context, probably not " "running in a Xen Dom0, disabling driver")); goto error; @@ -1478,7 +1447,6 @@ libxlDriverConfigNew(void) return cfg; error: - VIR_FREE(log_file); virObjectUnref(cfg); return NULL; } diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 851f3afb4..69d78851a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -41,6 +41,7 @@ # include "locking/lock_manager.h" # include "virfirmware.h" # include "libxl_capabilities.h" +# include "libxl_logger.h" # define LIBXL_DRIVER_NAME "xenlight" # define LIBXL_VNC_PORT_MIN 5900 @@ -74,8 +75,7 @@ struct _libxlDriverConfig { unsigned int version; /* log stream for driver-wide libxl ctx */ - FILE *logger_file; - xentoollog_logger *logger; + libxlLoggerPtr logger; /* libxl ctx for driver wide ops; getVersion, getNodeInfo, ... */ libxl_ctx *ctx; diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 5cde576ef..3bc468f61 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -809,6 +809,8 @@ libxlDomainCleanup(libxlDriverPrivatePtr driver, VIR_FREE(xml); } + libxlLoggerCloseFile(cfg->logger, vm->def->id); + virDomainObjRemoveTransientDef(vm); virObjectUnref(cfg); } @@ -1291,6 +1293,8 @@ libxlDomainStart(libxlDriverPrivatePtr driver, */ vm->def->id = domid; + libxlLoggerOpenFile(cfg->logger, domid, vm->def->name); + /* Always enable domain death events */ if (libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW)) goto destroy_dom; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7e5d9b69e..6a4ecddef 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -406,6 +406,8 @@ libxlReconnectDomain(virDomainObjPtr vm, /* Update domid in case it changed (e.g. reboot) while we were gone? */ vm->def->id = d_info.domid; + libxlLoggerOpenFile(cfg->logger, vm->def->id, vm->def->name); + /* Update hostdev state */ if (virHostdevUpdateActiveDomainDevices(hostdev_mgr, LIBXL_DRIVER_NAME, vm->def, hostdev_flags) < 0) diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c new file mode 100644 index 000000000..31110d0fd --- /dev/null +++ b/src/libxl/libxl_logger.c @@ -0,0 +1,217 @@ +/* + * libxl_logger.c: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ +#include <config.h> + +#include <string.h> +#include <libxl.h> + +#include "internal.h" +#include "libxl_logger.h" +#include "util/viralloc.h" +#include "util/virerror.h" +#include "util/virfile.h" +#include "util/virhash.h" +#include "util/virstring.h" +#include "util/virtime.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_logger"); + +typedef struct xentoollog_logger_libvirt xentoollog_logger_libvirt; + +struct xentoollog_logger_libvirt { + xentoollog_logger vtable; + xentoollog_level minLevel; + const char *logDir; + + /* map storing the opened fds: "domid" -> FILE* */ + virHashTablePtr files; + FILE *defaultLogFile; +}; + +static void +libxlLoggerFileFree(void *payload, const void *key ATTRIBUTE_UNUSED) +{ + FILE *file = payload; + VIR_FORCE_FCLOSE(file); + file = NULL; +} + +ATTRIBUTE_FMT_PRINTF(5, 0) static void +libvirt_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list args) +{ + xentoollog_logger_libvirt *lg = (void*)logger_in; + FILE *logFile = lg->defaultLogFile; + char timestamp[VIR_TIME_STRING_BUFLEN]; + char *message = NULL; + char *start, *end; + char ebuf[1024]; + + VIR_DEBUG("libvirt_vmessage: context='%s' format='%s'", context, format); + + if (level < lg->minLevel) + return; + + if (virVasprintf(&message, format, args) < 0) + return; + + /* Should we print to a domain-specific log file? */ + if ((start = strstr(message, ": Domain ")) && + (end = strstr(start + 9, ":"))) { + FILE *domainLogFile; + + VIR_DEBUG("Found domain log message"); + + start = start + 9; + *end = '\0'; + + domainLogFile = virHashLookup(lg->files, start); + if (domainLogFile) + logFile = domainLogFile; + + *end = ':'; + } + + /* Do the actual print to the log file */ + if (virTimeStringNowRaw(timestamp) < 0) + timestamp[0] = '\0'; + + fprintf(logFile, "%s: ", timestamp); + if (context) + fprintf(logFile, "%s: ", context); + + fprintf(logFile, "%s", message); + + if (errnoval >= 0) + fprintf(logFile, ": %s", virStrerror(errnoval, ebuf, sizeof(ebuf))); + + fputc('\n', logFile); + fflush(logFile); + + VIR_FREE(message); +} + +static void +libvirt_progress(xentoollog_logger *logger_in ATTRIBUTE_UNUSED, + const char *context ATTRIBUTE_UNUSED, + const char *doingwhat ATTRIBUTE_UNUSED, + int percent ATTRIBUTE_UNUSED, + unsigned long done ATTRIBUTE_UNUSED, + unsigned long total ATTRIBUTE_UNUSED) +{ + /* This function purposedly does nothing: it's no logging info */ +} + +static void +libvirt_destroy(xentoollog_logger *logger_in) +{ + xentoollog_logger_libvirt *lg = (void*)logger_in; + VIR_FREE(lg); +} + + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel) +{ + xentoollog_logger_libvirt logger; + libxlLoggerPtr logger_out = NULL; + char *path = NULL; + + switch (minLevel) { + case VIR_LOG_DEBUG: + logger.minLevel = XTL_DEBUG; + break; + case VIR_LOG_INFO: + logger.minLevel = XTL_INFO; + break; + case VIR_LOG_WARN: + logger.minLevel = XTL_WARN; + break; + case VIR_LOG_ERROR: + logger.minLevel = XTL_ERROR; + break; + } + logger.logDir = logDir; + + if ((logger.files = virHashCreate(3, libxlLoggerFileFree)) == NULL) + return NULL; + + if (virAsprintf(&path, "%s/libxl-driver.log", logDir) < 0) + goto error; + + if ((logger.defaultLogFile = fopen(path, "a")) == NULL) + goto error; + + logger_out = XTL_NEW_LOGGER(libvirt, logger); + + cleanup: + VIR_FREE(path); + return logger_out; + + error: + virHashFree(logger.files); + goto cleanup; +} + +void libxlLoggerFree(libxlLoggerPtr logger) +{ + xentoollog_logger *xtl_logger = (void*)logger; + if (logger->defaultLogFile) + VIR_FORCE_FCLOSE(logger->defaultLogFile); + virHashFree(logger->files); + xtl_logger_destroy(xtl_logger); +} + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name) +{ + char *path = NULL; + FILE *logFile = NULL; + char *domidstr = NULL; + + if (virAsprintf(&path, "%s/%s.log", logger->logDir, name) < 0 || + virAsprintf(&domidstr, "%d", id) < 0) + return; + + logFile = fopen(path, "a"); + ignore_value(virHashAddEntry(logger->files, domidstr, logFile)); + + VIR_FREE(path); + VIR_FREE(domidstr); +} + +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id) +{ + char *domidstr = NULL; + if (virAsprintf(&domidstr, "%d", id) < 0) + return; + + ignore_value(virHashRemoveEntry(logger->files, domidstr)); + + VIR_FREE(domidstr); +} diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h new file mode 100644 index 000000000..88c2868eb --- /dev/null +++ b/src/libxl/libxl_logger.h @@ -0,0 +1,39 @@ +/* + * libxl_logger.h: libxl logger implementation + * + * Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#ifndef __LIBXL_LOGGER_H +# define __LIBXL_LOGGER_H + +# include "util/virlog.h" + +typedef struct xentoollog_logger_libvirt libxlLogger; +typedef libxlLogger *libxlLoggerPtr; + +libxlLoggerPtr libxlLoggerNew(const char *logDir, + virLogPriority minLevel); +void libxlLoggerFree(libxlLoggerPtr logger); + +void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name); +void libxlLoggerCloseFile(libxlLoggerPtr logger, int id); + +#endif /* __LIBXL_LOGGER_H */ -- 2.11.0

2 1

[libvirt] [PATCH 00/11] Allow creation of vHBA by parent_wwnn/wwpn or fabric_name
by John Ferlan 03 Jan '17

03 Jan '17

https://bugzilla.redhat.com/show_bug.cgi?id=1349696 Lots of details in the bz, but essentially the problem is that providing a "parent" scsi_hostX value has drawbacks on reboots because what was scsi_hostX could turn into scsi_hostY on subsequent reboots. So add the ability to use the parent wwnn/wwpn or fabric_wwn as 'search' criteria in order to create either non persistent vHBA's via nodedev or persistent vHBA's via storage pools. NB: Documentation of this "process" is on the wiki: http://wiki.libvirt.org/page/NPIV_in_libvirt and would need to be adjusted once/if the changes are accepted. John Ferlan (11): nodedev: Fix crash in libvirtd on vHBA creation path nodedev: Create helpers to search for vport capable nodedevs nodedev: Add ability to find a vport capable vHBA nodedev: Add the ability to create vHBA by parent wwnn/wwpn or fabric_wwn conf: Add more fchost search fields for storage pool vHBA creation iscsi: Clean up createVport exit paths iscsi: Change order of checks in createVport iscsi: Converge more createVport checks util: Remove need for extra VIR_FREE's in virGetFCHostNameByWWN util: Introduce virGetFCHostNameByFabricWWN iscsi: Add parent wwnn/wwpn or fabric capability for createVport docs/schemas/basictypes.rng | 15 +++ docs/schemas/nodedev.rng | 15 +++ src/conf/node_device_conf.c | 234 +++++++++++++++++++++++++++++++---- src/conf/node_device_conf.h | 17 +++ src/conf/storage_conf.c | 21 +++- src/conf/storage_conf.h | 3 + src/libvirt_private.syms | 4 + src/node_device/node_device_driver.c | 28 ++++- src/storage/storage_backend_scsi.c | 86 +++++++------ src/util/virutil.c | 113 ++++++++++++----- src/util/virutil.h | 4 + 11 files changed, 439 insertions(+), 101 deletions(-) -- 2.7.4

5 34

[libvirt] [PATCH] qemu: Don't assume secret provided for LUKS encryption
by John Ferlan 03 Jan '17

03 Jan '17

https://bugzilla.redhat.com/show_bug.cgi?id=1405269 If a secret was not provided for what was determined to be a LUKS encrypted disk (during virStorageFileGetMetadata processing when called from qemuDomainDetermineDiskChain as a result of hotplug attach qemuDomainAttachDeviceDiskLive), then do not attempt to look it up (avoiding a libvirtd crash) and do not alter the format to "luks" when adding the disk; otherwise, the device_add would fail with a message such as: "unable to execute QEMU command 'device_add': Property 'scsi-hd.drive' can't find value 'drive-scsi0-0-0-0'" because of assumptions that when the format=luks that libvirt would have provided the secret to decrypt the volume. Access to unlock the volume will thus be left to the application. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I could have spread things over 2 patches (one to create the helper and one to add the extra check for nsecrets > 0), but just going with one to fix the issue just felt cleaner (besides makes any possible backports a bit simpler). NB: The "extra" !virStorageSourceIsEmpty check for the qemu_command path is a no-op essentially. src/qemu/qemu_command.c | 3 +-- src/qemu/qemu_domain.c | 15 +++++++++++++-- src/qemu/qemu_domain.h | 3 +++ src/qemu/qemu_hotplug.c | 3 ++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f8e48d2..28d8146 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1442,8 +1442,7 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk, if (disk->src->format > 0 && disk->src->type != VIR_STORAGE_TYPE_DIR) { const char *qemuformat = virStorageFileFormatTypeToString(disk->src->format); - if (disk->src->encryption && - disk->src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) + if (qemuDomainDiskHasEncryptionSecret(disk->src)) qemuformat = "luks"; virBufferAsprintf(buf, "format=%s,", qemuformat); } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index acfa695..25cb4ad 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1174,6 +1174,18 @@ qemuDomainSecretDiskCapable(virStorageSourcePtr src) } +bool +qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src) +{ + if (!virStorageSourceIsEmpty(src) && src->encryption && + src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && + src->encryption->nsecrets > 0) + return true; + + return false; +} + + /* qemuDomainSecretDiskPrepare: * @conn: Pointer to connection * @priv: pointer to domain private object @@ -1209,8 +1221,7 @@ qemuDomainSecretDiskPrepare(virConnectPtr conn, diskPriv->secinfo = secinfo; } - if (!virStorageSourceIsEmpty(src) && src->encryption && - src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { + if (qemuDomainDiskHasEncryptionSecret(src)) { if (VIR_ALLOC(secinfo) < 0) return -1; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index b2db45e..cce879f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -734,6 +734,9 @@ void qemuDomainSecretDiskDestroy(virDomainDiskDefPtr disk) bool qemuDomainSecretDiskCapable(virStorageSourcePtr src) ATTRIBUTE_NONNULL(1); +bool qemuDomainDiskHasEncryptionSecret(virStorageSourcePtr src) + ATTRIBUTE_NONNULL(1); + int qemuDomainSecretDiskPrepare(virConnectPtr conn, qemuDomainObjPrivatePtr priv, virDomainDiskDefPtr disk) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 92a2e73..6b10e63 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3584,7 +3584,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver, * can remove the luks object password too */ if (!virStorageSourceIsEmpty(disk->src) && disk->src->encryption && - disk->src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) { + disk->src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS && + disk->src->encryption->nsecrets > 0) { if (!(encAlias = qemuDomainGetSecretAESAlias(disk->info.alias, true))) { -- 2.7.4

2 2

[libvirt] [PATCH jenkins-ci v2] Add libvirt-go-xml job
by Daniel P. Berrange 03 Jan '17

03 Jan '17

Add a job for building the libvirt-go-xml library code Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Actually committed all changes projects/libvirt-go-xml.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 projects/libvirt-go-xml.yaml diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml new file mode 100644 index 0000000..b3b316b --- /dev/null +++ b/projects/libvirt-go-xml.yaml @@ -0,0 +1,13 @@ + +- project: + name: libvirt-go-xml + machines: + - libvirt-centos-7 + - libvirt-fedora-23 + - libvirt-fedora-24 + - libvirt-fedora-rawhide + title: Libvirt Go XML + jobs: + - go-build-job: + - go-check-job: + parent_jobs: 'libvirt-go-xml-master-build' -- 2.9.3

1 0

[libvirt] [PATCH jenkins-ci] Add libvirt-go-xml job
by Daniel P. Berrange 03 Jan '17

03 Jan '17

Add a job for building the libvirt-go-xml library code Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- projects/libvirt-go-xml.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 projects/libvirt-go-xml.yaml diff --git a/projects/libvirt-go-xml.yaml b/projects/libvirt-go-xml.yaml new file mode 100644 index 0000000..3f73505 --- /dev/null +++ b/projects/libvirt-go-xml.yaml @@ -0,0 +1,13 @@ + +- project: + name: libvirt-go-xml + machines: + - libvirt-centos-7 + - libvirt-fedora-23 + - libvirt-fedora-24 + - libvirt-fedora-rawhide + title: Libvirt Go + jobs: + - go-build-job: + - go-check-job: + parent_jobs: 'libvirt-go-xml-master-build' -- 2.9.3

1 0

[libvirt] [PATCH 0/3] Fix networkxml2conftest on FreeBSD
by Martin Kletzander 02 Jan '17

02 Jan '17

Yet another approach. If you hate it, we still have this: https://www.redhat.com/archives/libvir-list/2016-December/msg01123.html as an option. Martin Kletzander (3): networkxml2conftest: Rename outxml to outconf networkxml2conftest: Indent function parameters properly networkxml2conftest: Fix build on BSD tests/networkxml2confdata/dhcp6-nat-network.conf | 2 +- tests/networkxml2confdata/dhcp6-network.conf | 2 +- .../dhcp6host-routed-network.conf | 2 +- tests/networkxml2confdata/isolated-network.conf | 2 +- .../nat-network-dns-forward-plain.conf | 2 +- .../nat-network-dns-forwarders.conf | 2 +- .../networkxml2confdata/nat-network-dns-hosts.conf | 2 +- .../nat-network-dns-local-domain.conf | 2 +- .../nat-network-dns-srv-record-minimal.conf | 2 +- .../nat-network-dns-srv-record.conf | 2 +- .../nat-network-dns-txt-record.conf | 2 +- .../nat-network-name-with-quotes.conf | 2 +- tests/networkxml2confdata/nat-network.conf | 2 +- tests/networkxml2confdata/netboot-network.conf | 2 +- .../networkxml2confdata/netboot-proxy-network.conf | 2 +- tests/networkxml2confdata/open-network.conf | 2 +- tests/networkxml2confdata/ptr-domains-auto.conf | 2 +- .../networkxml2confdata/routed-network-no-dns.conf | 2 +- tests/networkxml2confdata/routed-network.conf | 2 +- tests/networkxml2conftest.c | 51 +++++++++++++++++++--- 20 files changed, 63 insertions(+), 26 deletions(-) -- 2.11.0

4 12

[libvirt] [PATCH 0/9] Couple of *BSD fixes
by Michal Privoznik 02 Jan '17

02 Jan '17

After Andrea pointed out that FreeBSD build is broken [1], I've started my freebsd domain and found out couple of problems. Here are the fixes. Oh, I've noticed alternative approaches to patch 6/9 on the list [2] [3]. None of them have been ACKed though. Yet. 1: https://www.redhat.com/archives/libvir-list/2016-December/msg01121.html 2: https://www.redhat.com/archives/libvir-list/2016-December/msg00009.html 3: https://www.redhat.com/archives/libvir-list/2016-December/msg01123.html Michal Privoznik (9): tests: Run virmacmaptest iff WITH_YAJL tests: Move test_libraries a bit higher virt-nss: Introduce more checks before enabling NSS tests: Run nss*test iff WITH_NSS src: Build libvirt_nss.la iff WITH_NSS networkxml2conftest: s/lo/lo0/ on non-Linux bhyvexml2argvdata: Fix <drive/> addresses bhyvexml2argvdata: Add mac address to <interface/> bhyvexml2xmltest: Test more XMLs configure.ac | 2 +- m4/virt-nss.m4 | 36 +++++++--- src/Makefile.am | 2 + tests/Makefile.am | 77 +++++++++++----------- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 3 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 3 +- .../bhyvexml2argv-bhyveload-bootorder.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder.xml | 5 +- .../bhyvexml2argv-bhyveload-bootorder1.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder1.xml | 5 +- .../bhyvexml2argv-bhyveload-bootorder2.xml | 3 +- .../bhyvexml2argv-bhyveload-bootorder3.args | 2 +- .../bhyvexml2argv-bhyveload-bootorder3.xml | 5 +- .../bhyvexml2argv-bhyveload-bootorder4.xml | 5 +- .../bhyvexml2argv-bhyveload-explicitargs.args | 2 +- .../bhyvexml2argv-bhyveload-explicitargs.xml | 3 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 3 +- .../bhyvexml2argv-custom-loader.args | 2 +- .../bhyvexml2argv-custom-loader.xml | 3 +- .../bhyvexml2argv-disk-cdrom-grub.args | 2 +- .../bhyvexml2argv-disk-cdrom-grub.xml | 3 +- .../bhyvexml2argv-disk-cdrom.args | 2 +- .../bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml | 3 +- .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 1 + .../bhyvexml2argv-grub-bootorder.args | 6 +- .../bhyvexml2argv-grub-bootorder.xml | 7 +- .../bhyvexml2argv-grub-bootorder2.args | 6 +- .../bhyvexml2argv-grub-bootorder2.xml | 7 +- .../bhyvexml2argv-grub-defaults.args | 2 +- .../bhyvexml2argv-grub-defaults.xml | 3 +- .../bhyvexml2argvdata/bhyvexml2argv-localtime.args | 2 +- .../bhyvexml2argvdata/bhyvexml2argv-localtime.xml | 3 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 +- .../bhyvexml2argv-serial-grub-nocons.args | 2 +- .../bhyvexml2argv-serial-grub-nocons.xml | 3 +- .../bhyvexml2argv-serial-grub.args | 2 +- .../bhyvexml2argv-serial-grub.xml | 3 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 3 +- .../bhyvexml2xmlout-acpiapic.xml | 34 ++++++++++ tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml | 30 +++++++++ .../bhyvexml2xmlout-bhyveload-bootorder.xml | 37 +++++++++++ .../bhyvexml2xmlout-bhyveload-bootorder1.xml | 37 +++++++++++ .../bhyvexml2xmlout-bhyveload-bootorder2.xml | 30 +++++++++ .../bhyvexml2xmlout-bhyveload-bootorder3.xml | 37 +++++++++++ .../bhyvexml2xmlout-bhyveload-bootorder4.xml | 38 +++++++++++ .../bhyvexml2xmlout-bhyveload-explicitargs.xml | 30 +++++++++ .../bhyvexml2xmlout-console.xml | 38 +++++++++++ .../bhyvexml2xmlout-custom-loader.xml | 31 +++++++++ .../bhyvexml2xmlout-disk-cdrom-grub.xml | 31 +++++++++ .../bhyvexml2xmlout-disk-cdrom.xml | 31 +++++++++ .../bhyvexml2xmlout-disk-virtio.xml | 29 ++++++++ .../bhyvexml2xmlout-grub-bootorder.xml | 43 ++++++++++++ .../bhyvexml2xmlout-grub-bootorder2.xml | 45 +++++++++++++ .../bhyvexml2xmlout-grub-defaults.xml | 30 +++++++++ .../bhyvexml2xmlout-localtime.xml | 30 +++++++++ .../bhyvexml2xmlout-macaddr.xml | 30 +++++++++ .../bhyvexml2xmlout-serial-grub-nocons.xml | 38 +++++++++++ .../bhyvexml2xmlout-serial-grub.xml | 38 +++++++++++ .../bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml | 38 +++++++++++ tests/bhyvexml2xmltest.c | 21 ++++++ tests/networkxml2conftest.c | 15 ++++- 66 files changed, 896 insertions(+), 102 deletions(-) create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-acpiapic.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-base.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder1.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder2.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder3.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-bootorder4.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-bhyveload-explicitargs.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-console.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-custom-loader.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom-grub.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-cdrom.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-disk-virtio.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-bootorder2.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-grub-defaults.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-localtime.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-macaddr.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub-nocons.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial-grub.xml create mode 100644 tests/bhyvexml2xmloutdata/bhyvexml2xmlout-serial.xml -- 2.11.0

3 18

[libvirt] [PATCH] maint: Sync bootstrap after gnulib update
by Andrea Bolognani 02 Jan '17

02 Jan '17

7fa7fe22d844 updated gnulib to the latest upstream commit, but forgot to include the corresponding bootstrap changes. --- Pushed under the gnulib rule. bootstrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap b/bootstrap index 5d3c289..26066b2 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2016-11-03.18; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 2.7.4

1 0

[libvirt] [PATCH 0/2] virmacmap: Fix crash
by Michal Privoznik 02 Jan '17

02 Jan '17

I was notified about a virmacmaptest crash that happens on FreeBSD. Interestingly, the problem occurs on Linux too, but for some reason the process is not getting SIGSEGV. Michal Privoznik (2): virmacmap: Fix variable handling virmacmap: Don't use hash table dataFree callback src/util/virmacmap.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) -- 2.11.0

2 3

[libvirt] [PATCH] maint: update to latest gnulib
by Michal Privoznik 02 Jan '17

02 Jan '17

Required for the copyright year bump to keep 'make syntax-check' happy, and also pulls in several portability fixes. * .gnulib: Update to latest. * bootstrap: Resync from upstream. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under gnulib-free-to-push rule. .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index c3b131294..e210a3cba 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c3b131294aa42b7997cc9b9a0bbb2934aa27fd6c +Subproject commit e210a3cbaec0ee82a67ff8fc427e21bdd64dba1b -- 2.11.0

1 0

[libvirt] [PATCH] maint: Update to latest gnulib
by Andrea Bolognani 02 Jan '17

02 Jan '17

In particular, this fixes the ./.gnulib/lib/version-etc.c maint.mk: out of date copyright in ./.gnulib/lib/version-etc.c; update it maint.mk:1196: recipe for target 'sc_copyright_check' failed error when running 'make syntax-check' in 2017. --- .gnulib | 2 +- bootstrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index c3b1312..e210a3c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit c3b131294aa42b7997cc9b9a0bbb2934aa27fd6c +Subproject commit e210a3cbaec0ee82a67ff8fc427e21bdd64dba1b diff --git a/bootstrap b/bootstrap index 5d3c289..26066b2 100755 --- a/bootstrap +++ b/bootstrap @@ -4,7 +4,7 @@ scriptversion=2016-11-03.18; # UTC # Bootstrap this package from checked-out sources. -# Copyright (C) 2003-2016 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- 2.7.4

1 0

[libvirt] Libvirtd is not started as a service
by Weiwei Jia 31 Dec '16

31 Dec '16

Hi Daniel, I download libvirt 2.5.0 source codes and install them as following steps. $ ./autogen.sh --prefix=/usr --localstatedir=/var --sysconfdir=/etc $ make $ sudo make install However, the libvirtd is not started as a service daemon. $ initctl stop libvirt-bin initctl: Unknown job: libvirt-bin Is libvirtd started as a service daemon by default after 'make install'? Or I need to start it manually. Is there any doc to make libvirtd as a service daemon, which is located at '/etc/init.d/libvirtd' for debian? My distro version is > lsb_release -a No LSB modules are available. Distributor ID: LinuxMint Description: Linux Mint 17.2 Rafaela Release: 17.2 Codename: rafaela The same as Ubuntu 14.04 Trusty. Thanks, Weiwei Jia

2 3

[libvirt] [PATCH] network: write both lo and lo0 in dnsmasq configuration
by Pino Toscano 28 Dec '16

28 Dec '16

When generating a new configuration for dnsmasq, add except-interface for both lo and lo0: this should make sure the configuration works, and is always the same for every supported OS. Adjust the data of networkxml2conftest to reflect the new dnsmasq configuration, making networkxml2conftest pass on non-Linux OSes. Followup of commit 478ddedc12b77313cbaf72328ab2236ce7c56ead. --- src/network/bridge_driver.c | 9 ++++----- tests/networkxml2confdata/dhcp6-nat-network.conf | 1 + tests/networkxml2confdata/dhcp6-network.conf | 1 + tests/networkxml2confdata/dhcp6host-routed-network.conf | 1 + tests/networkxml2confdata/isolated-network.conf | 1 + tests/networkxml2confdata/nat-network-dns-forward-plain.conf | 1 + tests/networkxml2confdata/nat-network-dns-forwarders.conf | 1 + tests/networkxml2confdata/nat-network-dns-hosts.conf | 1 + tests/networkxml2confdata/nat-network-dns-local-domain.conf | 1 + .../networkxml2confdata/nat-network-dns-srv-record-minimal.conf | 1 + tests/networkxml2confdata/nat-network-dns-srv-record.conf | 1 + tests/networkxml2confdata/nat-network-dns-txt-record.conf | 1 + tests/networkxml2confdata/nat-network-name-with-quotes.conf | 1 + tests/networkxml2confdata/nat-network.conf | 1 + tests/networkxml2confdata/netboot-network.conf | 1 + tests/networkxml2confdata/netboot-proxy-network.conf | 1 + tests/networkxml2confdata/open-network.conf | 1 + tests/networkxml2confdata/routed-network-no-dns.conf | 1 + tests/networkxml2confdata/routed-network.conf | 1 + 19 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9d94d65..feea35b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1001,13 +1001,12 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (pidfile) virBufferAsprintf(&configbuf, "pid-file=%s\n", pidfile); - /* dnsmasq will *always* listen on localhost unless told otherwise */ -#ifdef __linux__ + /* dnsmasq will *always* listen on localhost unless told otherwise: + * - "lo" is the loopback interface on Linux + * - "lo0" is the loopback interface on BSD and Solaris + */ virBufferAddLit(&configbuf, "except-interface=lo\n"); -#else - /* BSD family OSes and Solaris call loopback interface as lo0 */ virBufferAddLit(&configbuf, "except-interface=lo0\n"); -#endif if (dnsmasqCapsGet(caps, DNSMASQ_CAPS_BIND_DYNAMIC)) { /* using --bind-dynamic with only --interface (no diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network.conf index d1058df..a5d69b5 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network.conf index 8270690..f58a088 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network.conf @@ -8,6 +8,7 @@ strict-order domain=mynet expand-hosts except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network.conf index 87a1498..03ea9a6 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network.conf index ce4a59f..b2b7ec2 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.152.1 dhcp-option=3 diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain.conf index 9a000b8..6e9a27a 100644 --- a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf +++ b/tests/networkxml2confdata/nat-network-dns-forward-plain.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf index 0bd76bf..c3d351b 100644 --- a/tests/networkxml2confdata/nat-network-dns-forwarders.conf +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -11,6 +11,7 @@ server=8.8.4.4 server=/example.com/192.168.1.1 server=/www.example.com/# except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf index 021316f..16cc397 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf @@ -10,6 +10,7 @@ expand-hosts domain-needed local=// except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain.conf index 5f41b91..f9ffd3a 100644 --- a/tests/networkxml2confdata/nat-network-dns-local-domain.conf +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.conf @@ -9,6 +9,7 @@ local=/example.com/ domain=example.com expand-hosts except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf index f35ea1d..d15120d 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record.conf index af1ed70..07280da 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111 diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record.conf index 7f560fb..ddc51be 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 txt-record=example,example value diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes.conf index 36e11d1..fb2668c 100644 --- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf +++ b/tests/networkxml2confdata/nat-network-name-with-quotes.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network.conf index a3c8b10..cf49e27 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network.conf index b554a54..cd8c7e9 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network.conf @@ -8,6 +8,7 @@ strict-order domain=example.com expand-hosts except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network.conf index afb4033..e91edb8 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network.conf @@ -8,6 +8,7 @@ strict-order domain=example.com expand-hosts except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml2confdata/open-network.conf index ff09984..acf9440 100644 --- a/tests/networkxml2confdata/open-network.conf +++ b/tests/networkxml2confdata/open-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/open.addnhosts diff --git a/tests/networkxml2confdata/routed-network-no-dns.conf b/tests/networkxml2confdata/routed-network-no-dns.conf index 83cc85e..ab687fa 100644 --- a/tests/networkxml2confdata/routed-network-no-dns.conf +++ b/tests/networkxml2confdata/routed-network-no-dns.conf @@ -7,5 +7,6 @@ strict-order port=0 except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network.conf index 970aa3c..ba0353c 100644 --- a/tests/networkxml2confdata/routed-network.conf +++ b/tests/networkxml2confdata/routed-network.conf @@ -6,6 +6,7 @@ ## dnsmasq conf file created by libvirt strict-order except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts -- 2.7.4

4 4

[libvirt] [PATCH] cmdPerf: Display enabled/disabled message on perf event enable/disable
by Nitesh Konkar 28 Dec '16

28 Dec '16

Currently, the code to display enabled/disabled message is a dead code as its misplaced in if block instead of else. This patch fixes that issue. Signed-off-by: Nitesh Konkar <nitkon12(a)linux.vnet.ibm.com> --- tools/virsh-domain.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a6fa5c..624a36a 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8891,18 +8891,19 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("Unable to get perf events")); goto cleanup; } - for (i = 0; i < nparams; i++) { - if (params[i].type == VIR_TYPED_PARAM_BOOLEAN && - params[i].value.b) { - vshPrint(ctl, "%-15s: %s\n", params[i].field, _("enabled")); - } else { - vshPrint(ctl, "%-15s: %s\n", params[i].field, _("disabled")); - } - } } else { if (virDomainSetPerfEvents(dom, params, nparams, flags) != 0) { vshError(ctl, "%s", _("Unable to enable/disable perf events")); goto cleanup; + } else { + for (i = 0; i < nparams; i++) { + if (params[i].type == VIR_TYPED_PARAM_BOOLEAN && + params[i].value.b) { + vshPrint(ctl, "%-15s: %s\n", params[i].field, _("enabled")); + } else { + vshPrint(ctl, "%-15s: %s\n", params[i].field, _("disabled")); + } + } } } -- 1.9.3

1 1

[libvirt] Cannot add iothreads label in libvirt xml configuration file
by Weiwei Jia 23 Dec '16

23 Dec '16

Hi, I cannot add iothreads (https://libvirt.org/formatdomain.html#elementsIOThreadsAllocation) in the libvirt xml configuration file. Once I add "<iothreads>4</iothreads>" and other related config for IOthreads into the libvirt xml configuration file with virsh command and save it, these iothreads related configuration will disappear after I open libvirt xml configuration file again for double-check. The current libvirt xml configuration file is like following. # virsh dumpxml kvm1 <domain type='kvm'> <name>kvm1</name> <uuid>20811918-9057-4496-aa03-0fe9d1bcaf78</uuid> <memory unit='KiB'>8194304</memory> <currentMemory unit='KiB'>8194304</currentMemory> <vcpu placement='static'>6</vcpu> <cputune> <vcpupin vcpu='0' cpuset='0'/> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='2' cpuset='2'/> <vcpupin vcpu='3' cpuset='3'/> <vcpupin vcpu='4' cpuset='4'/> <vcpupin vcpu='5' cpuset='5'/> <emulatorpin cpuset='12-15'/> </cputune> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64' machine='pc-i440fx-2.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm-spice</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none' io='native'/> <source file='/var/lib/libvirt/images/kvm1.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'/> <controller type='scsi' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> <controller type='ide' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <mac address='52:54:00:a7:67:eb'/> <source network='default'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> <seclabel type='none'/> </domain> I want to config above xml file to be like following but once I save it, the iothreads related configuration will disappear (like above) after I re-open the libvirt xml for double-check. <domain type='kvm' id='1' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>kvm1</name> <memory unit='KiB'>8194304</memory> <currentMemory unit='KiB'>8194304</currentMemory> <vcpu placement='static'>6</vcpu> <iothreads>4</iothreads> <iothreadids> <iothread id="2"/> <iothread id="4"/> <iothread id="6"/> <iothread id="8"/> </iothreadids> <cputune> <vcpupin vcpu='0' cpuset='0'/> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='2' cpuset='2'/> <vcpupin vcpu='3' cpuset='3'/> <vcpupin vcpu='4' cpuset='4'/> <vcpupin vcpu='5' cpuset='5'/> <emulatorpin cpuset="12-15"/> <iothreadpin iothread="2" cpuset="7"/> <iothreadpin iothread="4" cpuset="8"/> <iothreadpin iothread="6" cpuset="9"/> <iothreadpin iothread="8" cpuset="10"/> </cputune> <resource> <partition>/machine</partition> </resource> <os> <type arch='x86_64' machine='pc-i440fx-2.0'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/kvm-spice</emulator> <disk type='file' device='disk'> <driver name='qemu' type='raw' cache='none' io='native' iothread='2-8'/> <source file='/home/wj47/ssd1/kvm1.img'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> <disk type='block' device='cdrom'> <driver name='qemu' type='raw'/> <target dev='hdc' bus='ide'/> <readonly/> <alias name='ide0-1-0'/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> <controller type='usb' index='0'> <alias name='usb0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <controller type='pci' index='0' model='pci-root'> <alias name='pci.0'/> </controller> <controller type='scsi' index='0'> <alias name='scsi0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </controller> <controller type='ide' index='0'> <alias name='ide0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> </controller> <interface type='network'> <source network='default'/> <target dev='vnet0'/> <model type='virtio'/> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <source path='/dev/pts/11'/> <target port='0'/> <alias name='serial0'/> </serial> <console type='pty' tty='/dev/pts/11'> <source path='/dev/pts/11'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> <input type='mouse' bus='ps2'/> <input type='keyboard' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <alias name='video0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> <seclabel type='none'/> </domain> Another concern is like this: can I config 4 dedicated IOthreads for one drive. Just like above, I want to start 4 IOthreads for virtio-disk0. If true, is my config like above correct? Thank you. Best, Weiwei Jia

3 5

[libvirt] [PATCH v3 00/11] clean up after slot sharing patches
by Laine Stump 23 Dec '16

23 Dec '16

(rebase of the original patches to make review easier) Some of the patches that enabled sharing PCI slots by multiple pcie-root-ports made the idea of reserving an entire slot obsolete. To reduce confusion and misunderstandings, this patch series gets rid of the name "Slot" in all of the functions that reserve and release PCI addresses. Laine Stump (11): conf: fix fromConfig argument to virDomainPCIAddressReserveAddr() conf: fix fromConfig argument to virDomainPCIAddressValidate() conf: rename virDomainPCIAddressGetNextSlot() to ...GetNextAddr() conf: eliminate virDomainPCIAddressReserveNextSlot() qemu: replace virDomainPCIAddressReserveAddr with virDomainPCIAddressReserveSlot conf: make virDomainPCIAddressReserveAddr() a static function conf: rename virDomainPCIAddressReserveAddr() to ...Internal() conf: rename virDomainPCIAddressReserveSlot() to ...Addr() qemu: remove qemuDomainPCIAddressReserveNextAddr() qemu: rename qemuDomainPCIAddressReserveNextSlot() to ...Addr() conf: eliminate virDomainPCIAddressReleaseSlot() in favor of ...Addr() src/bhyve/bhyve_device.c | 26 ++++++---- src/conf/domain_addr.c | 60 +++++------------------ src/conf/domain_addr.h | 15 ------ src/libvirt_private.syms | 4 +- src/qemu/qemu_domain_address.c | 105 ++++++++++++++++++++--------------------- 5 files changed, 80 insertions(+), 130 deletions(-) -- 2.7.4

2 22

[libvirt] [PATCH] tests/networkxml2conf: Fix to work again on non-Linux
by Andrea Bolognani 23 Dec '16

23 Dec '16

Since commit 478ddedc12b7 the name of the loopback interface in the generated dnsmasq configuration is OS-dependent. However, the test suite has not been updated to cope with the change, causing it to fail on FreeBSD and other non-Linux operating systems. Modify the networkxml2conf test case to read the expected output from different files based on the OS we're building on. --- .../{dhcp6-nat-network.conf => dhcp6-nat-network-linux.conf} | 0 .../{dhcp6-nat-network.conf => dhcp6-nat-network-other.conf} | 2 +- .../{dhcp6-network.conf => dhcp6-network-linux.conf} | 0 .../{dhcp6-network.conf => dhcp6-network-other.conf} | 2 +- ...t-routed-network.conf => dhcp6host-routed-network-linux.conf} | 0 ...t-routed-network.conf => dhcp6host-routed-network-other.conf} | 2 +- .../{isolated-network.conf => isolated-network-linux.conf} | 0 .../{isolated-network.conf => isolated-network-other.conf} | 2 +- ...rward-plain.conf => nat-network-dns-forward-plain-linux.conf} | 0 ...rward-plain.conf => nat-network-dns-forward-plain-other.conf} | 2 +- ...dns-forwarders.conf => nat-network-dns-forwarders-linux.conf} | 0 ...dns-forwarders.conf => nat-network-dns-forwarders-other.conf} | 2 +- ...t-network-dns-hosts.conf => nat-network-dns-hosts-linux.conf} | 0 ...t-network-dns-hosts.conf => nat-network-dns-hosts-other.conf} | 2 +- ...local-domain.conf => nat-network-dns-local-domain-linux.conf} | 0 ...local-domain.conf => nat-network-dns-local-domain-other.conf} | 2 +- ...dns-srv-record.conf => nat-network-dns-srv-record-linux.conf} | 0 ...inimal.conf => nat-network-dns-srv-record-minimal-linux.conf} | 0 ...inimal.conf => nat-network-dns-srv-record-minimal-other.conf} | 2 +- ...dns-srv-record.conf => nat-network-dns-srv-record-other.conf} | 2 +- ...dns-txt-record.conf => nat-network-dns-txt-record-linux.conf} | 0 ...dns-txt-record.conf => nat-network-dns-txt-record-other.conf} | 2 +- .../{nat-network.conf => nat-network-linux.conf} | 0 ...-with-quotes.conf => nat-network-name-with-quotes-linux.conf} | 0 ...-with-quotes.conf => nat-network-name-with-quotes-other.conf} | 2 +- .../{nat-network.conf => nat-network-other.conf} | 2 +- .../{netboot-network.conf => netboot-network-linux.conf} | 0 .../{netboot-network.conf => netboot-network-other.conf} | 2 +- ...tboot-proxy-network.conf => netboot-proxy-network-linux.conf} | 0 ...tboot-proxy-network.conf => netboot-proxy-network-other.conf} | 2 +- .../{open-network.conf => open-network-linux.conf} | 0 .../{open-network.conf => open-network-other.conf} | 2 +- .../{ptr-domains-auto.conf => ptr-domains-auto-linux.conf} | 0 .../{ptr-domains-auto.conf => ptr-domains-auto-other.conf} | 2 +- .../{routed-network.conf => routed-network-linux.conf} | 0 ...uted-network-no-dns.conf => routed-network-no-dns-linux.conf} | 0 ...uted-network-no-dns.conf => routed-network-no-dns-other.conf} | 2 +- .../{routed-network.conf => routed-network-other.conf} | 2 +- tests/networkxml2conftest.c | 9 +++++++-- 39 files changed, 26 insertions(+), 21 deletions(-) copy tests/networkxml2confdata/{dhcp6-nat-network.conf => dhcp6-nat-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6-nat-network.conf => dhcp6-nat-network-other.conf} (96%) copy tests/networkxml2confdata/{dhcp6-network.conf => dhcp6-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6-network.conf => dhcp6-network-other.conf} (96%) copy tests/networkxml2confdata/{dhcp6host-routed-network.conf => dhcp6host-routed-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6host-routed-network.conf => dhcp6host-routed-network-other.conf} (96%) copy tests/networkxml2confdata/{isolated-network.conf => isolated-network-linux.conf} (100%) rename tests/networkxml2confdata/{isolated-network.conf => isolated-network-other.conf} (96%) copy tests/networkxml2confdata/{nat-network-dns-forward-plain.conf => nat-network-dns-forward-plain-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-forward-plain.conf => nat-network-dns-forward-plain-other.conf} (94%) copy tests/networkxml2confdata/{nat-network-dns-forwarders.conf => nat-network-dns-forwarders-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-forwarders.conf => nat-network-dns-forwarders-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-hosts.conf => nat-network-dns-hosts-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-hosts.conf => nat-network-dns-hosts-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-local-domain.conf => nat-network-dns-local-domain-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-local-domain.conf => nat-network-dns-local-domain-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-srv-record.conf => nat-network-dns-srv-record-linux.conf} (100%) copy tests/networkxml2confdata/{nat-network-dns-srv-record-minimal.conf => nat-network-dns-srv-record-minimal-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-srv-record-minimal.conf => nat-network-dns-srv-record-minimal-other.conf} (97%) rename tests/networkxml2confdata/{nat-network-dns-srv-record.conf => nat-network-dns-srv-record-other.conf} (97%) copy tests/networkxml2confdata/{nat-network-dns-txt-record.conf => nat-network-dns-txt-record-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-txt-record.conf => nat-network-dns-txt-record-other.conf} (96%) copy tests/networkxml2confdata/{nat-network.conf => nat-network-linux.conf} (100%) copy tests/networkxml2confdata/{nat-network-name-with-quotes.conf => nat-network-name-with-quotes-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-name-with-quotes.conf => nat-network-name-with-quotes-other.conf} (97%) rename tests/networkxml2confdata/{nat-network.conf => nat-network-other.conf} (96%) copy tests/networkxml2confdata/{netboot-network.conf => netboot-network-linux.conf} (100%) rename tests/networkxml2confdata/{netboot-network.conf => netboot-network-other.conf} (96%) copy tests/networkxml2confdata/{netboot-proxy-network.conf => netboot-proxy-network-linux.conf} (100%) rename tests/networkxml2confdata/{netboot-proxy-network.conf => netboot-proxy-network-other.conf} (96%) copy tests/networkxml2confdata/{open-network.conf => open-network-linux.conf} (100%) rename tests/networkxml2confdata/{open-network.conf => open-network-other.conf} (94%) copy tests/networkxml2confdata/{ptr-domains-auto.conf => ptr-domains-auto-linux.conf} (100%) rename tests/networkxml2confdata/{ptr-domains-auto.conf => ptr-domains-auto-other.conf} (97%) copy tests/networkxml2confdata/{routed-network.conf => routed-network-linux.conf} (100%) copy tests/networkxml2confdata/{routed-network-no-dns.conf => routed-network-no-dns-linux.conf} (100%) rename tests/networkxml2confdata/{routed-network-no-dns.conf => routed-network-no-dns-other.conf} (93%) rename tests/networkxml2confdata/{routed-network.conf => routed-network-other.conf} (94%) diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6-nat-network.conf copy to tests/networkxml2confdata/dhcp6-nat-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6-nat-network.conf rename to tests/networkxml2confdata/dhcp6-nat-network-other.conf index d1058df..f182691 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6-network.conf copy to tests/networkxml2confdata/dhcp6-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6-network.conf rename to tests/networkxml2confdata/dhcp6-network-other.conf index 8270690..6093037 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=mynet expand-hosts -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6host-routed-network.conf copy to tests/networkxml2confdata/dhcp6host-routed-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6host-routed-network.conf rename to tests/networkxml2confdata/dhcp6host-routed-network-other.conf index 87a1498..2d1513a 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/isolated-network.conf copy to tests/networkxml2confdata/isolated-network-linux.conf diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network-other.conf similarity index 96% rename from tests/networkxml2confdata/isolated-network.conf rename to tests/networkxml2confdata/isolated-network-other.conf index ce4a59f..952e0d6 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.152.1 dhcp-option=3 diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-forward-plain.conf copy to tests/networkxml2confdata/nat-network-dns-forward-plain-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf similarity index 94% rename from tests/networkxml2confdata/nat-network-dns-forward-plain.conf rename to tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf index 9a000b8..e141afc 100644 --- a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf +++ b/tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-forwarders.conf copy to tests/networkxml2confdata/nat-network-dns-forwarders-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-forwarders.conf rename to tests/networkxml2confdata/nat-network-dns-forwarders-other.conf index 0bd76bf..926fbe3 100644 --- a/tests/networkxml2confdata/nat-network-dns-forwarders.conf +++ b/tests/networkxml2confdata/nat-network-dns-forwarders-other.conf @@ -10,7 +10,7 @@ server=8.8.8.8 server=8.8.4.4 server=/example.com/192.168.1.1 server=/www.example.com/# -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-hosts.conf copy to tests/networkxml2confdata/nat-network-dns-hosts-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-hosts.conf rename to tests/networkxml2confdata/nat-network-dns-hosts-other.conf index 021316f..cd51d0a 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts-other.conf @@ -9,7 +9,7 @@ domain=example.com expand-hosts domain-needed local=// -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-local-domain.conf copy to tests/networkxml2confdata/nat-network-dns-local-domain-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-local-domain.conf rename to tests/networkxml2confdata/nat-network-dns-local-domain-other.conf index 5f41b91..bb72019 100644 --- a/tests/networkxml2confdata/nat-network-dns-local-domain.conf +++ b/tests/networkxml2confdata/nat-network-dns-local-domain-other.conf @@ -8,7 +8,7 @@ strict-order local=/example.com/ domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-srv-record.conf copy to tests/networkxml2confdata/nat-network-dns-srv-record-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf copy to tests/networkxml2confdata/nat-network-dns-srv-record-minimal-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf rename to tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf index f35ea1d..fe1a804 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-dns-srv-record.conf rename to tests/networkxml2confdata/nat-network-dns-srv-record-other.conf index af1ed70..bdf33dc 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111 diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-txt-record.conf copy to tests/networkxml2confdata/nat-network-dns-txt-record-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record-other.conf similarity index 96% rename from tests/networkxml2confdata/nat-network-dns-txt-record.conf rename to tests/networkxml2confdata/nat-network-dns-txt-record-other.conf index 7f560fb..8f127c2 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 txt-record=example,example value diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network.conf copy to tests/networkxml2confdata/nat-network-linux.conf diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-name-with-quotes.conf copy to tests/networkxml2confdata/nat-network-name-with-quotes-linux.conf diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-name-with-quotes.conf rename to tests/networkxml2confdata/nat-network-name-with-quotes-other.conf index 36e11d1..70dea13 100644 --- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf +++ b/tests/networkxml2confdata/nat-network-name-with-quotes-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network-other.conf similarity index 96% rename from tests/networkxml2confdata/nat-network.conf rename to tests/networkxml2confdata/nat-network-other.conf index a3c8b10..6fef02f 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/netboot-network.conf copy to tests/networkxml2confdata/netboot-network-linux.conf diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network-other.conf similarity index 96% rename from tests/networkxml2confdata/netboot-network.conf rename to tests/networkxml2confdata/netboot-network-other.conf index b554a54..a78f3e6 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/netboot-proxy-network.conf copy to tests/networkxml2confdata/netboot-proxy-network-linux.conf diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network-other.conf similarity index 96% rename from tests/networkxml2confdata/netboot-proxy-network.conf rename to tests/networkxml2confdata/netboot-proxy-network-other.conf index afb4033..cf2bec5 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml2confdata/open-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/open-network.conf copy to tests/networkxml2confdata/open-network-linux.conf diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml2confdata/open-network-other.conf similarity index 94% rename from tests/networkxml2confdata/open-network.conf rename to tests/networkxml2confdata/open-network-other.conf index ff09984..6e03486 100644 --- a/tests/networkxml2confdata/open-network.conf +++ b/tests/networkxml2confdata/open-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/open.addnhosts diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networkxml2confdata/ptr-domains-auto-linux.conf similarity index 100% copy from tests/networkxml2confdata/ptr-domains-auto.conf copy to tests/networkxml2confdata/ptr-domains-auto-linux.conf diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networkxml2confdata/ptr-domains-auto-other.conf similarity index 97% rename from tests/networkxml2confdata/ptr-domains-auto.conf rename to tests/networkxml2confdata/ptr-domains-auto-other.conf index 7f1a393..7f2cd8b 100644 --- a/tests/networkxml2confdata/ptr-domains-auto.conf +++ b/tests/networkxml2confdata/ptr-domains-auto-other.conf @@ -7,7 +7,7 @@ strict-order local=/122.168.192.in-addr.arpa/ local=/1.0.e.f.0.1.c.a.8.b.d.0.1.0.0.2.ip6.arpa/ -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/routed-network.conf copy to tests/networkxml2confdata/routed-network-linux.conf diff --git a/tests/networkxml2confdata/routed-network-no-dns.conf b/tests/networkxml2confdata/routed-network-no-dns-linux.conf similarity index 100% copy from tests/networkxml2confdata/routed-network-no-dns.conf copy to tests/networkxml2confdata/routed-network-no-dns-linux.conf diff --git a/tests/networkxml2confdata/routed-network-no-dns.conf b/tests/networkxml2confdata/routed-network-no-dns-other.conf similarity index 93% rename from tests/networkxml2confdata/routed-network-no-dns.conf rename to tests/networkxml2confdata/routed-network-no-dns-other.conf index 83cc85e..eada11e 100644 --- a/tests/networkxml2confdata/routed-network-no-dns.conf +++ b/tests/networkxml2confdata/routed-network-no-dns-other.conf @@ -6,6 +6,6 @@ ## dnsmasq conf file created by libvirt strict-order port=0 -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network-other.conf similarity index 94% rename from tests/networkxml2confdata/routed-network.conf rename to tests/networkxml2confdata/routed-network-other.conf index 970aa3c..79f1d77 100644 --- a/tests/networkxml2confdata/routed-network.conf +++ b/tests/networkxml2confdata/routed-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index a80d3b2..617c7ea 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -71,11 +71,16 @@ testCompareXMLToConfHelper(const void *data) const testInfo *info = data; char *inxml = NULL; char *outxml = NULL; +#ifdef __linux__ + const char *os = "linux"; +#else + const char *os = "other"; +#endif if (virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/networkxml2confdata/%s.conf", - abs_srcdir, info->name) < 0) { + virAsprintf(&outxml, "%s/networkxml2confdata/%s-%s.conf", + abs_srcdir, info->name, os) < 0) { goto cleanup; } -- 2.7.4

2 3

[libvirt] [PATCH v2 0/5] vz: fix some CT disk representation cases and its statistics
by Maxim Nestratov 22 Dec '16

22 Dec '16

v1-v2 changes - comments addressed Maxim Nestratov (5): vz: report "scsi" bus for disks when nothing was set explixitly vz: don't add implicit devices for CTs vz: report disks either as disks or filesystems depending on original xml vz: set boot from disk for CT only when there is no root filesystem vz: get disks statistics for CTs src/vz/vz_driver.c | 10 ++++- src/vz/vz_sdk.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++------- src/vz/vz_sdk.h | 2 +- 3 files changed, 121 insertions(+), 20 deletions(-) -- 2.4.11

2 11

[libvirt] [PATCH] tests: enable virpolkittest on any ELF platform
by Pino Toscano 22 Dec '16

22 Dec '16

This tests uses preload, which should work on any ELF-based platform (and indeed it passes on Linux, GNU/kFreeBSD, and FreeBSD). Also remove the WITH_DBUS conditional, as the test is already built based on that conditional. --- tests/virpolkittest.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index a51dd1c..4495c7c 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -22,7 +22,7 @@ #include "testutils.h" -#if defined(WITH_DBUS) && defined(__linux__) +#if defined(__ELF__) # include <stdlib.h> # include <dbus/dbus.h> @@ -352,10 +352,10 @@ mymain(void) VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virdbusmock.so") -#else /* ! (WITH_DBUS && __linux__) */ +#else /* ! __ELF__ */ int main(void) { return EXIT_AM_SKIP; } -#endif /* ! WITH_DBUS */ +#endif /* ! __ELF__ */ -- 2.7.4

2 1

[libvirt] [PATCH] docs: Update docs for recently added physical adjustments
by John Ferlan 22 Dec '16

22 Dec '16

Add the description for <physical>... One is a new feature - the API and the other is an improvement for the volume xml output. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- I'll hold off pushing as trivial for a bit just in case the grammar/format gestapo (Andrea) would like an adjustment ;-) docs/news.html.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index c06153e..36c7d3d 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -32,6 +32,13 @@ adjusted during runtime using the admin interface without the necessity of the daemon's restart </li> + <li>storage: Add virStorageVolInfoFlags API<br/> + Add the API to support using the VIR_STORAGE_VOL_GET_PHYSICAL + flag in order to return the host physical size in bytes + of the image container in the allocation field of the + _virStorageVolInfo structure. The --physical flag has been + added to the virsh vol-info command to access the data + </li> </ul> </li> <li><strong>Improvements</strong> @@ -42,6 +49,10 @@ cpu cycles, stalled backend cpu cycles, and ref cpu cycles by applications running on the platform </li> + <li>conf: Display <physical> for volume xml<br/> + Add a display of the <physical> size of a disk + volume in the output of the volume XML + </li> </ul> </li> <li><strong>Bug fixes</strong> -- 2.7.4

1 0

[libvirt] [PATCH] Add domain event for metadata changes
by Daniel P. Berrange 22 Dec '16

22 Dec '16

When changing the metadata via virDomainSetMetadata, we now emit an event to notify the app of changes. This is useful when co-ordinating different applications read/write of custom metadata. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/remote.c | 45 +++++++++++++++++++ examples/object-events/event-test.c | 35 +++++++++++++++ include/libvirt/libvirt-domain.h | 20 +++++++++ src/bhyve/bhyve_driver.c | 7 +++ src/conf/domain_event.c | 86 +++++++++++++++++++++++++++++++++++++ src/conf/domain_event.h | 10 +++++ src/libvirt_private.syms | 2 + src/lxc/lxc_driver.c | 6 +++ src/qemu/qemu_driver.c | 6 +++ src/remote/remote_driver.c | 33 +++++++++++++- src/remote/remote_protocol.x | 15 ++++++- src/remote_protocol-structs | 7 +++ src/test/test_driver.c | 6 +++ tools/virsh-domain.c | 25 +++++++++++ 14 files changed, 301 insertions(+), 2 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 23c9de4..3d837d8 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -1223,6 +1223,50 @@ remoteRelayDomainEventDeviceRemovalFailed(virConnectPtr conn, } +static int +remoteRelayDomainEventMetadataChange(virConnectPtr conn, + virDomainPtr dom, + int type, + const char *nsuri, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_callback_metadata_change_msg data; + char **nsurip; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + VIR_DEBUG("Relaying domain metadata change %s %d %d %s, callback %d", + dom->name, dom->id, type, NULLSTR(nsuri), callback->callbackID); + + /* build return data */ + memset(&data, 0, sizeof(data)); + + data.type = type; + if (nsuri) { + if (VIR_ALLOC(nsurip) < 0) + return -1; + if (VIR_STRDUP(*nsurip, nsuri) < 0) { + VIR_FREE(nsurip); + return -1; + } + data.nsuri = nsurip; + } + + make_nonnull_domain(&data.dom, dom); + data.callbackID = callback->callbackID; + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_CALLBACK_METADATA_CHANGE, + (xdrproc_t)xdr_remote_domain_event_callback_metadata_change_msg, + &data); + + return 0; +} + + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), @@ -1248,6 +1292,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMigrationIteration), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventJobCompleted), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemovalFailed), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventMetadataChange), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 730cb8b..f2316d7 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -917,6 +917,40 @@ myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, } +static const char * +metadataTypeToStr(int status) +{ + switch ((virDomainMetadataType) status) { + case VIR_DOMAIN_METADATA_DESCRIPTION: + return "description"; + + case VIR_DOMAIN_METADATA_TITLE: + return "title"; + + case VIR_DOMAIN_METADATA_ELEMENT: + return "element"; + + case VIR_DOMAIN_METADATA_LAST: + break; + } + + return "unknown"; +} + +static int +myDomainEventMetadataChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int type, + const char *nsuri, + void *opaque ATTRIBUTE_UNUSED) +{ + const char *typestr = metadataTypeToStr(type); + printf("%s EVENT: Domain %s(%d) metadata type: %s (%s)\n", + __func__, virDomainGetName(dom), virDomainGetID(dom), typestr, nsuri ? nsuri : "n/a"); + return 0; +} + + static void myFreeFunc(void *opaque) @@ -971,6 +1005,7 @@ struct domainEventData domainEvents[] = { DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION, myDomainEventMigrationIterationCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, myDomainEventJobCompletedCallback), DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED, myDomainEventDeviceRemovalFailedCallback), + DOMAIN_EVENT(VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, myDomainEventMetadataChangeCallback), }; struct storagePoolEventData { diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 6362947..e303140 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -3770,6 +3770,25 @@ typedef void (*virConnectDomainEventDeviceRemovalFailedCallback)(virConnectPtr c const char *devAlias, void *opaque); +/** + * virConnectDomainEventMetadataChangeCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @type: a value from virDomainMetadataTypea + * @nsuri: XML namespace URI + * @opaque: application specified data + * + * This callback is triggered when the domain XML metadata is changed + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_METADATA_CHANGE with virConnectDomainEventRegisterAny(). + */ +typedef void (*virConnectDomainEventMetadataChangeCallback)(virConnectPtr conn, + virDomainPtr dom, + int type, + const char *nsuri, + void *opaque); + /** * virConnectDomainEventMigrationIterationCallback: @@ -4195,6 +4214,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_MIGRATION_ITERATION = 20, /* virConnectDomainEventMigrationIterationCallback */ VIR_DOMAIN_EVENT_ID_JOB_COMPLETED = 21, /* virConnectDomainEventJobCompletedCallback */ VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ + VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /* virConnectDomainEventMetadataChangeCallback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 17f8524..e42ec47 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1124,6 +1124,13 @@ bhyveDomainSetMetadata(virDomainPtr dom, privconn->xmlopt, BHYVE_STATE_DIR, BHYVE_CONFIG_DIR, flags); + if (ret == 0) { + virObjectEventPtr ev = NULL; + ev = virDomainEventMetadataChangeNewFromObj(vm, type, uri); + virObjectEventStateQueue(privconn->domainEventState, ev); + } + + cleanup: virObjectUnref(caps); virObjectUnlock(vm); diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 63ae9e1..da503f3 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -59,6 +59,7 @@ static virClassPtr virDomainEventDeviceAddedClass; static virClassPtr virDomainEventMigrationIterationClass; static virClassPtr virDomainEventJobCompletedClass; static virClassPtr virDomainEventDeviceRemovalFailedClass; +static virClassPtr virDomainEventMetadataChangeClass; static void virDomainEventDispose(void *obj); static void virDomainEventLifecycleDispose(void *obj); @@ -79,6 +80,7 @@ static void virDomainEventDeviceAddedDispose(void *obj); static void virDomainEventMigrationIterationDispose(void *obj); static void virDomainEventJobCompletedDispose(void *obj); static void virDomainEventDeviceRemovalFailedDispose(void *obj); +static void virDomainEventMetadataChangeDispose(void *obj); static void virDomainEventDispatchDefaultFunc(virConnectPtr conn, @@ -266,6 +268,15 @@ struct _virDomainEventDeviceRemovalFailed { typedef struct _virDomainEventDeviceRemovalFailed virDomainEventDeviceRemovalFailed; typedef virDomainEventDeviceRemovalFailed *virDomainEventDeviceRemovalFailedPtr; +struct _virDomainEventMetadataCange { + virDomainEvent parent; + + int type; + char *nsuri; +}; +typedef struct _virDomainEventMetadataCange virDomainEventMetadataChange; +typedef virDomainEventMetadataChange *virDomainEventMetadataChangePtr; + static int @@ -385,6 +396,12 @@ virDomainEventsOnceInit(void) sizeof(virDomainEventDeviceRemovalFailed), virDomainEventDeviceRemovalFailedDispose))) return -1; + if (!(virDomainEventMetadataChangeClass = + virClassNew(virDomainEventClass, + "virDomainEventMetadataChange", + sizeof(virDomainEventMetadataChange), + virDomainEventMetadataChangeDispose))) + return -1; return 0; } @@ -573,6 +590,16 @@ virDomainEventJobCompletedDispose(void *obj) } +static void +virDomainEventMetadataChangeDispose(void *obj) +{ + virDomainEventMetadataChangePtr event = obj; + VIR_DEBUG("obj=%p", event); + + VIR_FREE(event->nsuri); +} + + static void * virDomainEventNew(virClassPtr klass, int eventID, @@ -1600,6 +1627,53 @@ virDomainEventTunableNewFromDom(virDomainPtr dom, } +static virObjectEventPtr +virDomainEventMetadataChangeNew(int id, + const char *name, + unsigned char *uuid, + int type, + const char *nsuri) +{ + virDomainEventMetadataChangePtr ev; + + if (virDomainEventsInitialize() < 0) + return NULL; + + if (!(ev = virDomainEventNew(virDomainEventMetadataChangeClass, + VIR_DOMAIN_EVENT_ID_METADATA_CHANGE, + id, name, uuid))) + return NULL; + + ev->type = type; + if (nsuri && VIR_STRDUP(ev->nsuri, nsuri) < 0) + goto error; + + return (virObjectEventPtr)ev; + + error: + virObjectUnref(ev); + return NULL; +} + +virObjectEventPtr +virDomainEventMetadataChangeNewFromObj(virDomainObjPtr obj, + int type, + const char *nsuri) +{ + return virDomainEventMetadataChangeNew(obj->def->id, obj->def->name, + obj->def->uuid, type, nsuri); +} + +virObjectEventPtr +virDomainEventMetadataChangeNewFromDom(virDomainPtr dom, + int type, + const char *nsuri) +{ + return virDomainEventMetadataChangeNew(dom->id, dom->name, dom->uuid, + type, nsuri); +} + + static void virDomainEventDispatchDefaultFunc(virConnectPtr conn, virObjectEventPtr event, @@ -1857,6 +1931,18 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; } + case VIR_DOMAIN_EVENT_ID_METADATA_CHANGE: + { + virDomainEventMetadataChangePtr metadataChangeEvent; + + metadataChangeEvent = (virDomainEventMetadataChangePtr)event; + ((virConnectDomainEventMetadataChangeCallback)cb)(conn, dom, + metadataChangeEvent->type, + metadataChangeEvent->nsuri, + cbopaque); + goto cleanup; + } + case VIR_DOMAIN_EVENT_ID_LAST: break; } diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 54fa879..1933f47 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -234,6 +234,16 @@ virDomainEventJobCompletedNewFromDom(virDomainPtr dom, virTypedParameterPtr params, int nparams); +virObjectEventPtr +virDomainEventMetadataChangeNewFromObj(virDomainObjPtr obj, + int type, + const char *nsuri); + +virObjectEventPtr +virDomainEventMetadataChangeNewFromDom(virDomainPtr dom, + int type, + const char *nsuri); + int virDomainEventStateRegister(virConnectPtr conn, virObjectEventStatePtr state, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2d23e46..3b8d227 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -558,6 +558,8 @@ virDomainEventLifecycleNew; virDomainEventLifecycleNewFromDef; virDomainEventLifecycleNewFromDom; virDomainEventLifecycleNewFromObj; +virDomainEventMetadataChangeNewFromDom; +virDomainEventMetadataChangeNewFromObj; virDomainEventMigrationIterationNewFromDom; virDomainEventMigrationIterationNewFromObj; virDomainEventPMSuspendDiskNewFromDom; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a7bc9f0..04a4b8c 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5379,6 +5379,12 @@ lxcDomainSetMetadata(virDomainPtr dom, driver->xmlopt, cfg->stateDir, cfg->configDir, flags); + if (ret == 0) { + virObjectEventPtr ev = NULL; + ev = virDomainEventMetadataChangeNewFromObj(vm, type, uri); + virObjectEventStateQueue(driver->domainEventState, ev); + } + virLXCDomainObjEndJob(driver, vm); cleanup: diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b359e77..2c9ef95 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18069,6 +18069,12 @@ qemuDomainSetMetadata(virDomainPtr dom, driver->xmlopt, cfg->stateDir, cfg->configDir, flags); + if (ret == 0) { + virObjectEventPtr ev = NULL; + ev = virDomainEventMetadataChangeNewFromObj(vm, type, uri); + qemuDomainEventQueue(driver, ev); + } + qemuDomainObjEndJob(driver, vm); cleanup: diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 46da06f..c161a56 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -355,6 +355,11 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog, void *evdata, void *opaque); static void +remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + +static void remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque); @@ -558,6 +563,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteDomainBuildEventCallbackDeviceRemovalFailed, sizeof(remote_domain_event_callback_device_removal_failed_msg), (xdrproc_t)xdr_remote_domain_event_callback_device_removal_failed_msg }, + { REMOTE_PROC_DOMAIN_EVENT_CALLBACK_METADATA_CHANGE, + remoteDomainBuildEventCallbackMetadataChange, + sizeof(remote_domain_event_callback_metadata_change_msg), + (xdrproc_t)xdr_remote_domain_event_callback_metadata_change_msg }, { REMOTE_PROC_STORAGE_POOL_EVENT_LIFECYCLE, remoteStoragePoolBuildEventLifecycle, sizeof(remote_storage_pool_event_lifecycle_msg), @@ -5121,7 +5130,7 @@ remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr prog AT void *evdata, void *opaque) { virConnectPtr conn = opaque; - remote_domain_event_callback_device_added_msg *msg = evdata; + remote_domain_event_callback_device_removal_failed_msg *msg = evdata; struct private_data *priv = conn->privateData; virDomainPtr dom; virObjectEventPtr event = NULL; @@ -5249,6 +5258,28 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog ATTRIBUTE static void +remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_callback_metadata_change_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virObjectEventPtr event = NULL; + + if (!(dom = get_nonnull_domain(conn, msg->dom))) + return; + + event = virDomainEventMetadataChangeNewFromDom(dom, msg->type, msg->nsuri ? *msg->nsuri : NULL); + + virObjectUnref(dom); + + remoteEventQueue(priv, event, msg->callbackID); +} + + +static void remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b846ef2..f268e1c 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3353,6 +3353,13 @@ struct remote_domain_set_guest_vcpus_args { }; +struct remote_domain_event_callback_metadata_change_msg { + int callbackID; + remote_nonnull_domain dom; + int type; + remote_string nsuri; +}; + /*----- Protocol. -----*/ /* Define the program number, protocol version and procedure numbers here. */ @@ -5952,5 +5959,11 @@ enum remote_procedure { * @priority: high * @acl: storage_vol:read */ - REMOTE_PROC_STORAGE_VOL_GET_INFO_FLAGS = 378 + REMOTE_PROC_STORAGE_VOL_GET_INFO_FLAGS = 378, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_CALLBACK_METADATA_CHANGE = 379 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 41bc3bd..2fc9e46 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2800,6 +2800,12 @@ struct remote_domain_set_guest_vcpus_args { int state; u_int flags; }; +struct remote_domain_event_callback_metadata_change_msg { + int callbackID; + remote_nonnull_domain dom; + int type; + remote_string nsuri +}; enum remote_procedure { REMOTE_PROC_CONNECT_OPEN = 1, REMOTE_PROC_CONNECT_CLOSE = 2, @@ -3179,4 +3185,5 @@ enum remote_procedure { REMOTE_PROC_NODE_DEVICE_EVENT_LIFECYCLE = 376, REMOTE_PROC_NODE_DEVICE_EVENT_UPDATE = 377, REMOTE_PROC_STORAGE_VOL_GET_INFO_FLAGS = 378, + REMOTE_PROC_DOMAIN_EVENT_CALLBACK_METADATA_CHANGE = 379, }; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index de92a01..6820298 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2721,6 +2721,12 @@ static int testDomainSetMetadata(virDomainPtr dom, privconn->caps, privconn->xmlopt, NULL, NULL, flags); + if (ret == 0) { + virObjectEventPtr ev = NULL; + ev = virDomainEventMetadataChangeNewFromObj(privdom, type, uri); + testObjectEventQueue(privconn, ev); + } + virDomainObjEndAPI(&privdom); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3a6fa5c..f8f5d9c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12750,6 +12750,29 @@ virshEventDeviceRemovalFailedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, virshEventPrint(opaque, &buf); } +VIR_ENUM_DECL(virshEventMetadataChangeType) +VIR_ENUM_IMPL(virshEventMetadataChangeType, + VIR_DOMAIN_METADATA_LAST, + N_("description"), + N_("title"), + N_("element")) + +static void +virshEventMetadataChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, + virDomainPtr dom, + int type, + const char *nsuri, + void *opaque) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + + virBufferAsprintf(&buf, _("event 'metdata-change' for domain %s: %s %s\n"), + virDomainGetName(dom), + UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)), + NULLSTR(nsuri)); + virshEventPrint(opaque, &buf); +} + static vshEventCallback vshEventCallbacks[] = { { "lifecycle", @@ -12796,6 +12819,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(virshEventJobCompletedPrint), }, { "device-removal-failed", VIR_DOMAIN_EVENT_CALLBACK(virshEventDeviceRemovalFailedPrint), }, + { "metadata-change", + VIR_DOMAIN_EVENT_CALLBACK(virshEventMetadataChangePrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 2.9.3

1 0

[libvirt] [PATCH 0/2] m4: Small cleanups
by Andrea Bolognani 22 Dec '16

22 Dec '16

2 6

[libvirt] [PATCH] m4/virt-gnutls: properly backup CFLAGS and LIBS for AC_CHECK_* macros
by Pavel Hrdina 22 Dec '16

22 Dec '16

Commit 943ddcb7120 partially fixed this bug in gnutls configure code. However we also need to backup and modify CFLAGS and do if for AC_CHECK_HEADERS as well. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build breaker rule. m4/virt-gnutls.m4 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 index 77122c1202..37adad85d8 100644 --- a/m4/virt-gnutls.m4 +++ b/m4/virt-gnutls.m4 @@ -54,15 +54,18 @@ AC_DEFUN([LIBVIRT_CHECK_GNUTLS],[ [set to 1 if it is known or assumed that GNUTLS uses gcrypt]) fi + OLD_CFLAGS="$CFLAGS" + OLD_LIBS="$LIBS" + CFLAGS="$CFLAGS $GNUTLS_CFLAGS" + LIBS="$LIBS $GNUTLS_LIBS" AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[ #include <gnutls/gnutls.h> ]]) - OLD_LIBS="$LIBS" - LIBS="$LIBS $GNUTLS_LIBS" AC_CHECK_FUNCS([gnutls_rnd]) AC_CHECK_FUNCS([gnutls_cipher_encrypt]) - LIBS=$OLD_LIBS + CFLAGS="$OLD_CFLAGS" + LIBS="$OLD_LIBS" fi ]) -- 2.11.0

1 0

[libvirt] [PATCH] m4/virt-lib: use correct format of package name for AC_ARG_* macros
by Pavel Hrdina 22 Dec '16

22 Dec '16

Introduced by commit 25034b3c40 and reused by commit 4519e94b743. This patch silences warning printed by configure: configure: WARNING: unrecognized options: --with-qemu-user Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- m4/virt-lib.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4 index 5c3fde258e..031f8890c0 100644 --- a/m4/virt-lib.m4 +++ b/m4/virt-lib.m4 @@ -414,7 +414,7 @@ AC_DEFUN([LIBVIRT_ARG_WITH], [ m4_pushdef([version_text], m4_ifnblank(min_version, [[ (>= ]]min_version[[)]])) m4_divert_text([DEFAULTS], [with_var][[=]][default_action]) - AC_ARG_WITH([check_name_dash], + AC_ARG_WITH([check_name_lc], [AS_HELP_STRING([[--]arg_var], [with ]]m4_dquote(help_name)m4_dquote(version_text)[[ support @<:@default=]]m4_dquote(default_action)[[@:>@])]) @@ -456,7 +456,7 @@ AC_DEFUN([LIBVIRT_ARG_WITH_ALT], [ m4_pushdef([with_var], [with_]check_name_lc) m4_divert_text([DEFAULTS], [with_var][[=]][default_action]) - AC_ARG_WITH([check_name_dash], + AC_ARG_WITH([check_name_lc], [AS_HELP_STRING([[--]arg_var], ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])]) @@ -494,7 +494,7 @@ AC_DEFUN([LIBVIRT_ARG_ENABLE], [ m4_pushdef([enable_var], [enable_]check_name_lc) m4_divert_text([DEFAULTS], [enable_var][[=]][default_action]) - AC_ARG_ENABLE([check_name_dash], + AC_ARG_ENABLE([check_name_lc], [AS_HELP_STRING([[--]arg_var], ]m4_dquote(help_desc)[[ @<:@default=]]m4_dquote(default_action)[[@:>@])]) -- 2.11.0

3 3

[libvirt] [PATCH] NEWS: Update after virtio console on ppc64 fix
by Andrea Bolognani 22 Dec '16

22 Dec '16

--- docs/news.html.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/news.html.in b/docs/news.html.in index 5a34674..5eea24f 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -52,6 +52,10 @@ for a qcow2 file backed storage that hasn't yet been opened on the domain </li> + <li>qemu: Make virtio console usable on ppc64 guests<br/> + The chardev detection code has been improved and can now handle this + configuration properly. + </li> </ul> </li> </ul> -- 2.7.4

2 2