- Devel - libvirt List Archives

[libvirt] [PATCH python v2 0/2] Bindings for storage pool lifecycle events
by Jovanka Gulicoska 16 Jun '16

16 Jun '16

Changes since v1: use double newline spacing, change LIBVIRT_CHECK_VERSION to 2.0.0 Python buindings and tests for storage pool lifecycle events API. Function storageDetailToString() is not implemented for now. Jovanka Gulicoska (2): Python binding for storage pool lifecycle events API event-test: Add storage pool lifecycle event tests examples/event-test.py | 18 +++++ generator.py | 2 + libvirt-override-virConnect.py | 35 ++++++++++ libvirt-override.c | 153 +++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 2 + 5 files changed, 210 insertions(+) -- 2.5.5

2 3

[libvirt] [PATCH v3 0/4] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 16 Jun '16

16 Jun '16

v2: http://www.redhat.com/archives/libvir-list/2016-June/msg01044.html Patches 3 and 4 from original already pushed. Changes since v2: Patch 1: (the two bullets were ACK'd, but 3rd introduced new change so repost) * Change to using /etc/pki/qemu as the default directory name * Add description for dh-params.pem * Added default_tls_x509_verify Patch 2: * Change to using /etc/pki/qemu-chardev * Change charTCP/chartcp to chardev * Added chardev_tls_x509_verify Patch 3: (former patch 5) * Added processing for verify-peer and set in .args output Patch 4: (was ACK'd, but...) * Needed update due to new argument to qemuBuildTLSx509BackendProps John Ferlan (4): conf: Add new default TLS X.509 certificate default directory conf: Introduce chartcp_tls_x509_cert_dir qemu: Add support for TLS X.509 path to TCP chardev backend qemu: Add the ability to hotplug the TLS X.509 environment src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 11 ++- src/qemu/qemu.conf | 83 ++++++++++++---- src/qemu/qemu_command.c | 109 ++++++++++++++++++++- src/qemu/qemu_command.h | 7 ++ src/qemu/qemu_conf.c | 59 +++++++++-- src/qemu/qemu_conf.h | 7 ++ src/qemu/qemu_hotplug.c | 30 +++++- src/qemu/qemu_monitor_json.c | 9 ++ src/qemu/test_libvirtd_qemu.aug.in | 5 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 ++++++++ tests/qemuxml2argvtest.c | 6 ++ .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 ++++++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 424 insertions(+), 28 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

1 4

[libvirt] [PATCH 0/3] Tiny cleanups
by Martin Kletzander 16 Jun '16

16 Jun '16

John suggested I clean up some things, so here they are. 2 out of 3 are trivial, but the first patch would look really really ugly if I wquashed them together (feel free to try). Martin Kletzander (3): qemu: Unify automatic coredump filenames qemu: Follow coding style convention qemu: Remove useless block in processWatchdogEvent src/qemu/qemu_driver.c | 117 +++++++++++++++++++++++++------------------------ 1 file changed, 60 insertions(+), 57 deletions(-) -- 2.9.0

2 4

[libvirt] [PATCH] qemu: Shorten domain name for watchdog coredump
by Martin Kletzander 16 Jun '16

16 Jun '16

Similarly to commit d294f6b0dff7, if the name is long enough, the filename can be longer than filesystem's limit. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1334237 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..80d1d209a80c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3906,6 +3906,10 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in { int ret; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + char *domname = virDomainObjGetShortName(vm); + + if (!domname) + goto cleanup; switch (action) { case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: @@ -3915,7 +3919,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in if (virAsprintf(&dumpfile, "%s/%s-%u", cfg->autoDumpPath, - vm->def->name, + domname, (unsigned int)time(NULL)) < 0) goto cleanup; @@ -3959,6 +3963,7 @@ static void processWatchdogEvent(virQEMUDriverPtr driver, virDomainObjPtr vm, in qemuDomainObjEndAsyncJob(driver, vm); cleanup: + VIR_FREE(domname); virObjectUnref(cfg); } -- 2.8.4

2 2

[libvirt] [PATCH] logging: remove concept of default log priority
by Daniel P. Berrange 16 Jun '16

16 Jun '16

The logging framework has categories which can be selectively enabled/disabled by setting a suitable LIBVIRT_LOG_FILTERS environment variable or config file setting. Along side that we also have the LIBVIRT_DEBUG environment variable which unconditionally enables every single category at DEBUG level. With the amount of logging produced by libvirt these days, the signal/noise ratio in the output from setting LIBVIRT_DEBUG is to poor for it to be useful. Originally the LIBVIRT_DEBUG env variable had a very specific use case - it resulted in logging of anything in our public API entrypoints. eg it turned on src/libvirt.c debugging and nothing else. Additionally it would always result in log messages being sent to stderr. When applied to any of the daemons, the log output no longers gets sent to stderr, but rather to whatever default log output has been configured by the daemon. If no log_outputs setting or LIBVIRT_LOG_OUTPUTS env is set, then messages will often go to the systemd journal or a /var/log/libvirt/libvirtd.log file rather than stderr. These factors have conspired to make the LIBVIRT_DEBUG env and/or default log priority to be pretty useless in the real world. This change attempts to take us back towards the original semantics of the LIBVIRT_DEBUG env variable as follows. If LIBVIRT_DEBUG is set to a plain integer, or log level string, then it will turn on logging for the "libvirt" log category at that level. Any other string will be parsed in the same way as LIBVIRT_LOG_FILTERS would be. In all cases use of LIBVIRT_DEBUG will result in an explicit output being added for stderr. This ensures that messages always go to stderr, even if other outputs are already configured. IOW, LIBVIRT_DEBUG=1 virsh or LIBVIRT_DEBUG=1 libvirtd will both result in printing logs of libvirt public API calls to stderr. Meanwhile setting LIBVIRT_DEBUG="1:qemu" is equivalent to setting LIBVIRT_LOG_FILTERS="1:qemu" and LIBVIRT_LOG_OUTPUTS="1:stderr" Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.c | 27 ++++++------ src/libvirt_private.syms | 1 + src/libxl/libxl_conf.c | 3 +- src/locking/lock_daemon.c | 29 ++++++------- src/logging/log_daemon.c | 29 ++++++------- src/lxc/lxc_process.c | 7 ---- src/util/vircommand.c | 4 -- src/util/virlog.c | 104 +++++++++++++++++++--------------------------- src/util/virlog.h | 11 ++--- tests/eventtest.c | 6 +-- 10 files changed, 97 insertions(+), 124 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index cc5190f..e88a982 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -668,6 +668,8 @@ daemonSetupLogging(struct daemonConfig *config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -684,9 +686,6 @@ daemonSetupLogging(struct daemonConfig *config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -695,11 +694,14 @@ daemonSetupLogging(struct daemonConfig *config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } /* * If no defined outputs, and either running @@ -711,7 +713,7 @@ daemonSetupLogging(struct daemonConfig *config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - virLogPriority priority = virLogGetDefaultPriority(); + virLogPriority priority = level; /* By default we don't want to log too much stuff into journald as * it may employ rate limiting and thus block libvirt execution. */ @@ -735,8 +737,7 @@ daemonSetupLogging(struct daemonConfig *config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/libvirtd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -753,14 +754,14 @@ daemonSetupLogging(struct daemonConfig *config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/libvirtd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a980a32..5586d8b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1801,6 +1801,7 @@ virLogProbablyLogMessage; virLogReset; virLogSetDefaultPriority; virLogSetFromEnv; +virLogSourceGetPriority; virLogUnlock; virLogVMessage; diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index d927b37..51d6037 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -52,6 +52,7 @@ #define VIR_FROM_THIS VIR_FROM_LIBXL VIR_LOG_INIT("libxl.libxl_conf"); +VIR_LOG_INIT_FULL("libxl.libxl_context", virLogLibXL); /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ #define LIBXL_X86_FEATURE_PAE_MASK 0x40 @@ -1724,7 +1725,7 @@ libxlDriverConfigNew(void) } VIR_FREE(log_file); - switch (virLogGetDefaultPriority()) { + switch (virLogSourceGetPriority(&virLogLibXL)) { case VIR_LOG_DEBUG: log_level = XTL_DEBUG; break; diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index f889a34..426fe6b 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -454,6 +454,8 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -470,9 +472,6 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -481,6 +480,15 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try @@ -491,7 +499,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:journald", level) < 0) goto error; virLogParseOutputs(tmp); VIR_FREE(tmp); @@ -508,8 +516,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/virtlockd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -527,26 +534,20 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/virtlockd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 90f8427..f344ba2 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -377,6 +377,8 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, bool verbose, bool godaemon) { + int level = VIR_LOG_WARN; + virLogReset(); /* @@ -393,9 +395,6 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, * level has been set, we must process variables in the opposite * order, each one overriding the previous. */ - if (config->log_level != 0) - virLogSetDefaultPriority(config->log_level); - virLogSetFromEnv(); if (virLogGetNbFilters() == 0) @@ -404,6 +403,15 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, if (virLogGetNbOutputs() == 0) virLogParseOutputs(config->log_outputs); + if (config->log_level != 0 || verbose) { + level = config->log_level; + if (verbose && level > VIR_LOG_INFO) + level = VIR_LOG_INFO; + virLogDefineFilter("libvirt", level, 0); + if (virLogGetNbOutputs() == 0) + virLogParseOutputs("1:stderr"); + } + /* * If no defined outputs, and either running * as daemon or not on a tty, then first try @@ -414,7 +422,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, (godaemon || !isatty(STDIN_FILENO))) { char *tmp; if (access("/run/systemd/journal/socket", W_OK) >= 0) { - if (virAsprintf(&tmp, "%d:journald", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:journald", level) < 0) goto error; virLogParseOutputs(tmp); VIR_FREE(tmp); @@ -431,8 +439,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, if (godaemon) { if (privileged) { if (virAsprintf(&tmp, "%d:file:%s/log/libvirt/virtlogd.log", - virLogGetDefaultPriority(), - LOCALSTATEDIR) == -1) + level, LOCALSTATEDIR) == -1) goto error; } else { char *logdir = virGetUserCacheDirectory(); @@ -450,26 +457,20 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, umask(old_umask); if (virAsprintf(&tmp, "%d:file:%s/virtlogd.log", - virLogGetDefaultPriority(), logdir) == -1) { + level, logdir) == -1) { VIR_FREE(logdir); goto error; } VIR_FREE(logdir); } } else { - if (virAsprintf(&tmp, "%d:stderr", virLogGetDefaultPriority()) < 0) + if (virAsprintf(&tmp, "%d:stderr", level) < 0) goto error; } virLogParseOutputs(tmp); VIR_FREE(tmp); } - /* - * Command line override for --verbose - */ - if ((verbose) && (virLogGetDefaultPriority() > VIR_LOG_INFO)) - virLogSetDefaultPriority(VIR_LOG_INFO); - return 0; error: diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 8981d9a..9fca007 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -918,9 +918,6 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, /* The controller may call ip command, so we have to retain PATH. */ virCommandAddEnvPassBlockSUID(cmd, "PATH", "/bin:/usr/bin"); - virCommandAddEnvFormat(cmd, "LIBVIRT_DEBUG=%d", - virLogGetDefaultPriority()); - if (virLogGetNbFilters() > 0) { filterstr = virLogGetFilters(); if (!filterstr) { @@ -943,10 +940,6 @@ virLXCProcessBuildControllerCmd(virLXCDriverPtr driver, virCommandAddEnvPair(cmd, "LIBVIRT_LOG_OUTPUTS", outputstr); VIR_FREE(outputstr); } - } else { - virCommandAddEnvFormat(cmd, - "LIBVIRT_LOG_OUTPUTS=%d:stderr", - virLogGetDefaultPriority()); } virCommandAddArgList(cmd, "--name", vm->def->name, NULL); diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 027cb64..07cd005 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -342,8 +342,6 @@ virFork(void) } else { /* child process */ - - int logprio; size_t i; /* Remove any error callback so errors in child now get sent @@ -354,9 +352,7 @@ virFork(void) /* Make sure any hook logging is sent to stderr, since child * process may close the logfile FDs */ - logprio = virLogGetDefaultPriority(); virLogReset(); - virLogSetDefaultPriority(logprio); /* Clear out all signal handlers from parent so nothing * unexpected can happen in our child once we unblock diff --git a/src/util/virlog.c b/src/util/virlog.c index 738eaac..82fb4dc 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -112,11 +112,6 @@ typedef virLogOutput *virLogOutputPtr; static virLogOutputPtr virLogOutputs; static int virLogNbOutputs; -/* - * Default priorities - */ -static virLogPriority virLogDefaultPriority = VIR_LOG_DEFAULT; - static int virLogResetFilters(void); static int virLogResetOutputs(void); static void virLogOutputToFd(virLogSourcePtr src, @@ -175,7 +170,6 @@ virLogOnceInit(void) return -1; virLogLock(); - virLogDefaultPriority = VIR_LOG_DEFAULT; if (VIR_ALLOC_QUIET(virLogRegex) >= 0) { if (regcomp(virLogRegex, VIR_LOG_REGEX, REG_EXTENDED) != 0) @@ -205,35 +199,10 @@ virLogReset(void) virLogLock(); virLogResetFilters(); virLogResetOutputs(); - virLogDefaultPriority = VIR_LOG_DEFAULT; virLogUnlock(); return 0; } -/** - * virLogSetDefaultPriority: - * @priority: the default priority level - * - * Set the default priority level, i.e. any logged data of a priority - * equal or superior to this level will be logged, unless a specific rule - * was defined for the log category of the message. - * - * Returns 0 if successful, -1 in case of error. - */ -int -virLogSetDefaultPriority(virLogPriority priority) -{ - if ((priority < VIR_LOG_DEBUG) || (priority > VIR_LOG_ERROR)) { - VIR_WARN("Ignoring invalid log level setting."); - return -1; - } - if (virLogInitialize() < 0) - return -1; - - virLogDefaultPriority = priority; - return 0; -} - /** * virLogResetFilters: @@ -472,7 +441,7 @@ virLogSourceUpdate(virLogSourcePtr source) { virLogLock(); if (source->serial < virLogFiltersSerial) { - unsigned int priority = virLogDefaultPriority; + unsigned int priority = VIR_LOG_DEFAULT; unsigned int flags = 0; size_t i; @@ -1310,18 +1279,6 @@ virLogParseFilters(const char *filters) /** - * virLogGetDefaultPriority: - * - * Returns the current logging priority level. - */ -virLogPriority -virLogGetDefaultPriority(void) -{ - return virLogDefaultPriority; -} - - -/** * virLogGetFilters: * * Returns a string listing the current filters, in the format originally @@ -1423,35 +1380,53 @@ virLogGetNbOutputs(void) /** - * virLogParseDefaultPriority: + * virLogParseDebug: * @priority: string defining the desired logging level * - * Parses and sets the default log priority level. It can take a string or - * number corresponding to the following levels: + * This method is a shortcut for setting a filter + * along with output to stderr. + * + * It can take one of the following strings or numbers: + * * 1: DEBUG * 2: INFO * 3: WARNING * 4: ERROR * + * in which case it will set the priority level on the + * "libvirt" log source filter. If it does not match any + * of these standard strings it will be treated as a full + * filter string. + * + * In all cases an output to stderr will be defined. + * * Returns 0 if successful, -1 in case of error. */ int -virLogParseDefaultPriority(const char *priority) +virLogParseDebug(const char *debug) { - int ret = -1; + unsigned int priority = VIR_LOG_DEFAULT; + if (STREQ(debug, "1") || STREQ(debug, "debug")) + priority = VIR_LOG_DEBUG; + else if (STREQ(debug, "2") || STREQ(debug, "info")) + priority = VIR_LOG_INFO; + else if (STREQ(debug, "3") || STREQ(debug, "warning")) + priority = VIR_LOG_WARN; + else if (STREQ(debug, "4") || STREQ(debug, "error")) + priority = VIR_LOG_ERROR; + + if (priority == VIR_LOG_DEFAULT) { + if (virLogParseFilters(debug) < 0) + return -1; + } else { + if (virLogDefineFilter("libvirt", priority, 0) < 0) + return -1; + } - if (STREQ(priority, "1") || STREQ(priority, "debug")) - ret = virLogSetDefaultPriority(VIR_LOG_DEBUG); - else if (STREQ(priority, "2") || STREQ(priority, "info")) - ret = virLogSetDefaultPriority(VIR_LOG_INFO); - else if (STREQ(priority, "3") || STREQ(priority, "warning")) - ret = virLogSetDefaultPriority(VIR_LOG_WARN); - else if (STREQ(priority, "4") || STREQ(priority, "error")) - ret = virLogSetDefaultPriority(VIR_LOG_ERROR); - else - VIR_WARN("Ignoring invalid log level setting"); + if (virLogParseOutputs("1:stderr") < 0) + return -1; - return ret; + return 0; } @@ -1471,7 +1446,7 @@ virLogSetFromEnv(void) debugEnv = virGetEnvAllowSUID("LIBVIRT_DEBUG"); if (debugEnv && *debugEnv) - virLogParseDefaultPriority(debugEnv); + virLogParseDebug(debugEnv); debugEnv = virGetEnvAllowSUID("LIBVIRT_LOG_FILTERS"); if (debugEnv && *debugEnv) virLogParseFilters(debugEnv); @@ -1495,3 +1470,10 @@ bool virLogProbablyLogMessage(const char *str) ret = true; return ret; } + + +int virLogSourceGetPriority(virLogSourcePtr source) +{ + virLogSourceUpdate(source); + return source->priority; +} diff --git a/src/util/virlog.h b/src/util/virlog.h index 3ad00d4..aace409 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -73,13 +73,14 @@ struct _virLogSource { * log statements in a file are conditionally disabled * at compile time due to configure options. */ -# define VIR_LOG_INIT(n) \ - static ATTRIBUTE_UNUSED virLogSource virLogSelf = { \ +# define VIR_LOG_INIT_FULL(n, _var) \ + static ATTRIBUTE_UNUSED virLogSource _var = { \ .name = "" n "", \ .priority = VIR_LOG_ERROR, \ .serial = 0, \ .flags = 0, \ }; +# define VIR_LOG_INIT(n) VIR_LOG_INIT_FULL(n, virLogSelf) /* * If configured with --enable-debug=yes then library calls @@ -174,8 +175,6 @@ int virLogGetNbFilters(void); int virLogGetNbOutputs(void); char *virLogGetFilters(void); char *virLogGetOutputs(void); -virLogPriority virLogGetDefaultPriority(void); -int virLogSetDefaultPriority(virLogPriority priority); void virLogSetFromEnv(void); int virLogDefineFilter(const char *match, virLogPriority priority, @@ -195,7 +194,7 @@ int virLogDefineOutput(virLogOutputFunc f, void virLogLock(void); void virLogUnlock(void); int virLogReset(void); -int virLogParseDefaultPriority(const char *priority); +int virLogParseDebug(const char *debug); int virLogParseFilters(const char *filters); int virLogParseOutputs(const char *output); int virLogPriorityFromSyslog(int priority); @@ -217,4 +216,6 @@ void virLogVMessage(virLogSourcePtr source, bool virLogProbablyLogMessage(const char *str); +int virLogSourceGetPriority(virLogSourcePtr source); + #endif diff --git a/tests/eventtest.c b/tests/eventtest.c index c4be606..0a31672 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -310,11 +310,7 @@ mymain(void) if (virThreadInitialize() < 0) return EXIT_FAILURE; - char *debugEnv = getenv("LIBVIRT_DEBUG"); - if (debugEnv && *debugEnv && (virLogParseDefaultPriority(debugEnv) == -1)) { - fprintf(stderr, "Invalid log level setting.\n"); - return EXIT_FAILURE; - } + virLogSetFromEnv(); virEventPollInit(); -- 2.5.5

4 5

[libvirt] [PATCH] A word error about net-dumpxml --inactive
by sannyshao 16 Jun '16

16 Jun '16

--- tools/virsh-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 5abcda3..fcf1f0b 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -282,7 +282,7 @@ static const vshCmdOptDef opts_network_dumpxml[] = { VIRSH_COMMON_OPT_NETWORK, {.name = "inactive", .type = VSH_OT_BOOL, - .help = N_("network information of an inactive domain") + .help = N_("network information of an inactive network") }, {.name = NULL} }; -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/6] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 16 Jun '16

16 Jun '16

v1: http://www.redhat.com/archives/libvir-list/2016-June/msg00824.html Based on Dan's review from patch 4, alter the methodology to use the libvirt qemu config file to add support for a 'default' and (at first) a 'chartcp' (I could use chardev, but I was concerned that would imply more options - udp, unix, etc.). I have started on the authentication portion of this (e.g. a passwordid= parameter pointing at a secret object), but I'm a bit held up by the need to have the secret key patches. I've separated those out and will post a separate set shortly as well to hopefully get some traction. For the chartcp, I went with the 'default' location for the /etc/pki path - that will at least test patch 1. I also tested those locally by removing the code in qemuxml2xmltest.c to specify the specific -vnc or -spice paths as the test has. John Ferlan (6): conf: Add new default TLS X.509 certificate default directory conf: Introduce chartcp_tls_x509_cert_dir qemu: Make qemuBuildShmemBackendStr private qemu: Add cfg pointer to various command line helpers qemu: Add support for TLS X.509 path to TCP chardev backend qemu: Add the ability to hotplug the TLS X.509 environment src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 9 +- src/qemu/qemu.conf | 52 ++++--- src/qemu/qemu_command.c | 158 ++++++++++++++++++--- src/qemu/qemu_command.h | 12 +- src/qemu/qemu_conf.c | 45 +++++- src/qemu/qemu_conf.h | 5 + src/qemu/qemu_hotplug.c | 29 +++- src/qemu/qemu_monitor_json.c | 9 ++ src/qemu/test_libvirtd_qemu.aug.in | 3 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 33 +++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 41 ++++++ tests/qemuxml2argvtest.c | 6 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 50 +++++++ tests/qemuxml2xmltest.c | 1 + 15 files changed, 399 insertions(+), 55 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

2 13

[libvirt] [PATCH 0/2] qemu: active blockjob error tweaks
by Cole Robinson 16 Jun '16

16 Jun '16

Just a couple error message tweaks/cleanups regarding active block jobs, noticed while looking at https://bugzilla.redhat.com/show_bug.cgi?id=1342276 Cole Robinson (2): qemu: More usage of qemuDomainDiskBlockJobIsActive qemu: migration: use consistent error message src/qemu/qemu_driver.c | 7 +------ src/qemu/qemu_hotplug.c | 6 +----- src/qemu/qemu_migration.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) -- 2.7.4

2 5

[libvirt] [PATCH 0/2] Don't add a pci-bridge unless needed on Q35/aarch64
by Laine Stump 16 Jun '16

16 Jun '16

I had these in a branch waiting for further work to make them more useful, and abologna asked about this topic, so I'm posting these two patches. Note that in most cases we'll still get a pci-bridge device added (since most devices are legacy PCI) but at least if the config doesn't have any unaddressed PCI devices, that won't happen. As patch 1 states, the dmi-to-pci-bridge will still be there in all cases for Q35/aarch64. That needs more work to eliminate. Laine Stump (2): qemu: don't be as insistent about adding dmi-to-pci-bridge or pci-bridge qemu: don't add pci-bridge to Q35/arm domains unless it's needed src/qemu/qemu_domain.c | 14 +++++++------- .../qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args | 1 - .../qemuxml2argv-aarch64-virtio-pci-default.args | 1 - tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args | 3 +-- .../qemuxml2xmlout-aarch64-virtio-pci-default.xml | 5 ----- tests/qemuxml2xmloutdata/qemuxml2xmlout-pcie-root.xml | 5 ----- 6 files changed, 8 insertions(+), 21 deletions(-) -- 2.5.5

2 4

[libvirt] [PATCH] util: Fix broken syntax-check
by John Ferlan 16 Jun '16

16 Jun '16

Commit id '743db933' broke at least one syntax check rule regard open/close braces and perhaps more with spacing. Just remove the braces Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as build breaker src/util/virauthconfig.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index b58937c..91c9c0c 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -123,9 +123,8 @@ int virAuthConfigLookup(virAuthConfigPtr auth, if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { VIR_FREE(authgroup); - if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0){ + if (virAsprintf(&authgroup, "auth-%s-%s", service, "default") < 0) goto cleanup; - } } if (!virKeyFileHasGroup(auth->keyfile, authgroup)) { -- 2.5.5

1 0

[libvirt] RFC: New CPU hot(un)plug API and XML
by Peter Krempa 16 Jun '16

16 Jun '16

Hi list, I'm planing on adding API that will be used instead of virDomainSetVcpus and will allow a more granular control of which virtual CPUs are enabled for a guest. The new approach will allow to use cpu hotplug properly with NUMA guests as the old APIs would not allow adding CPUs to very specific cgroups. The old APIs should still work fine with the current approach although the final implementation should also allow to unplug vcpus from the guest by using new qemu features. I'm still not sure though whether it will be possible to use this in a backward compatible fashion though depending how this stuff will exactly need to be set up in qemu. # API # As for the new API I'm thinking of the following design: int virDomainVcpu(virDomainPtr domain, unsigned int id, unsigned int flags); The flags for this API would be following: - usual domain modification impact: * VIR_DOMAIN_SET_VCPU_CURRENT * VIR_DOMAIN_SET_VCPU_LIVE * VIR_DOMAIN_SET_VCPU_CONFIG - for specifying the operation as the default operation would query the cpu state: * VIR_DOMAIN_SET_VCPU_ENABLE * VIR_DOMAIN_SET_VCPU_DISABLE - misc: * VIR_DOMAIN_SET_VCPU_GUEST - use the guest agent instead of ACPI hotplug * VIR_DOMAIN_SET_VCPU_NUMA_NODE - 'id' is the ID of a numa node where the cpu should be enabled/disabled rather than CPU id. This is a convenience flag that will allow to add cpu to a given numa node rather than having to find the correct ID. * VIR_DOMAIN_SET_VCPU_CORE - use thread level hotplug (see [1]). This makes sure that the CPU will be plugged in on platforms that require to plug in multiple threads at once. VIR_DOMAIN_SET_VCPU_NUMA_NODE and VIR_DOMAIN_SET_VCPU_GUEST are mutually exclusive as the guest agent doesn't report the guest numa node the CPU is belonging to . If the idea of one API that will both query and set is too nonconformist to our existing API design I have no problem adding Get/Set versions and/or explode the ADD/REMOVE flags into a separate parameter. # XML # The new API will require us to add new XML that will allow to track the state of VCPUs individually. Internally we now have a data structure allowing to keep the relevant data in one place. Currently we are setting data relevant to VCPUs in many places. <domain> [...] <vcpu current='1'>3</vcpu> [...] <cputune> <cpupin ... /> </cputune> [...] <cpu> <numa> <cell id='0' cpus='0' memory='102400' unit='KiB/> <cell id='1' cpus='1-2' memory='102400' unit='KiB/> </numa> As we'll be required to keep the state for every single cpu I'm thinking of adding a new subelement called '<vcpus>' to <domain>. This will have a '<vcpu>' subelement for every configured cpu. I'm specifically not going to add any of the cpupin or numa node ids to the /domain/vcpus/vcpu as input parameters to avoid introducing very compicated checking code that would be required to keep the data in sync. I'm thinking of adding the numa node id as an output only attribute since it's relevant to the hotplug case and it's misplaced otherwise. I certainly can add the duplicated data as output-only attributes. The XML with the new elements should look like: <domain> [...] <vcpu current='1'>3</vcpu> <vcpus> <vcpu id='0' state='enabled'/> <-- option 1, no extra data <vcpu id='1' state='disabled' cell='1'/> <--- option 2, just numa node, since it's non-obvious <vcpu id='2' state='disabled' cell='1' pin='1-2' scheduler='...'/>  </vcpus> [...] <cputune> <cpupin ... /> </cputune> [...] <cpu> <numa> <cell id='0' cpus='0' memory='102400' unit='KiB/> <cell id='1' cpus='1-2' memory='102400' unit='KiB/> </numa> # migration # To ensure migration compatibility a new libvirt will set a new migration feature flag in cases where a sparse topology was created by any means. Older versions of libvirt will reject it. As the new cpu data will be ignored by the parser of older libvirt we don't need to stop formatting them on migration. (fortunately schemas are not validated during migration) # qemu/platform implementation caveats # When starting the VM for the first time it might be necessary to start a throw-away qemu process to query some details that we'll need to pass in on a command line. I'm not sure if this is still necessary and I'll try to avoid it at all cost. [1] Some architectures (ppc64) don't directly support thread-level hotplug and thus require us to plug in a core which translates into multiple threads (8 in case of power 8). Possibly other yet unknown problems. Thanks for your feedback. Peter

3 4

[libvirt] [PATCH] syntax-check: drop prohibit_undesirable_word_seq
by Ján Tomko 16 Jun '16

16 Jun '16

This checks forbids using "can not" and checks the placement of some texinfo tags. Drop it since we do not use texinfo and the check takes almost twice as much as the rest of the checks. --- cfg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/cfg.mk b/cfg.mk index 297ca3a..d82070d 100644 --- a/cfg.mk +++ b/cfg.mk @@ -64,6 +64,7 @@ local-checks-to-skip = \ sc_prohibit_quote_without_use \ sc_prohibit_quotearg_without_use \ sc_prohibit_stat_st_blocks \ + sc_prohibit_undesirable_word_seq \ sc_root_tests \ sc_space_tab \ sc_sun_os_names \ -- 2.7.3

2 1

[libvirt] Patch review request for Red Hat Bugzilla Bug 1341866
by Ashish Mittal 15 Jun '16

15 Jun '16

Hi, This is a patch review request in response to the following bugzilla: Bug 1341866 RFE: Request to upstream libvirt dependencies for qemu based network block driver from Veritas (1) This patch is required to enable Veritas OpenFlame functionality on RedHat OSP8 platform. (2) Patch has been created on top of libvirt-1.2.17-13.el7.x86_64. Please let me know in case patch has to be rebased on top of the latest libvirt git master branch instead. Regards, Ashish

2 5

[libvirt] [PATCH v3 0/7] Introducing storage pool lifecycle event APIs
by Jovanka Gulicoska 15 Jun '16

15 Jun '16

Changes since v2 listed in every commit separately Introducing implementation of storage pool event APIs. Code changes follow network event APIs. Implemented functions: virStoragePoolEventRegisterAny(), virStoragePoolEventDeregisterAny(), virStoragePoolLifeCycleEventNew(), introduced STARTED, STOPPED, DEFINE, UNDEFINE and REFRESHED. STARTED signal is emiited in storagePoolCreateXML() and storagePoolCreate() DEFINED signal is emitted in storagePoolDefineXML() UNDEFINED signal is emitted in storagePoolUndefine() STOPPED signal is emitted in storagePoolDestroy() and storagePoolRefresh() REFRESHED signal is emitted in storagePoolRefresh() There are also test as well as unittests for the new functions and signals. This is part of a GSOC project: Asynchronous lifecycle events for storage objects As part of the project there should also be implementation for storage volume events. For now there's no signal when volumes are created or deleted, they can also be implemented, but probably the easiest way is to have apps watch for REFRESH signal, and later extend storage driver code to refresh a pool after volume APIs are called. Jovanka Gulicoska (7): Introduce storage lifecycle event APIs conf: add storage_event handling test: implement storage lifecycle event APIs remote: implement storage lifecycle event APIs storage: implement storage lifecycle event APIs event-test: support storage lifecycle event APIs virsh: Introduce virsh-pool command daemon/libvirtd.h | 2 + daemon/remote.c | 207 ++++++++++++++++++++++++++++++- examples/object-events/event-test.c | 73 +++++++++++ include/libvirt/libvirt-storage.h | 93 ++++++++++++++ src/Makefile.am | 5 + src/conf/storage_conf.h | 4 + src/conf/storage_event.c | 235 ++++++++++++++++++++++++++++++++++++ src/conf/storage_event.h | 58 +++++++++ src/datatypes.h | 13 ++ src/driver-storage.h | 13 ++ src/libvirt-storage.c | 125 +++++++++++++++++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 6 + src/remote/remote_driver.c | 128 ++++++++++++++++++++ src/remote/remote_protocol.x | 43 ++++++- src/remote_protocol-structs | 16 +++ src/storage/storage_driver.c | 110 +++++++++++++++++ src/test/test_driver.c | 71 +++++++++++ tests/objecteventtest.c | 177 +++++++++++++++++++++++++++ tools/virsh-pool.c | 184 ++++++++++++++++++++++++++++ 20 files changed, 1564 insertions(+), 4 deletions(-) create mode 100644 src/conf/storage_event.c create mode 100644 src/conf/storage_event.h -- 2.5.5

5 16

[libvirt] esx: What does "No storage volume with key or path" mean?
by Richard W.M. Jones 15 Jun '16

15 Jun '16

We've had a report of a particular vCenter server (using VMware clustering, we think) where virStorageVolInfo of a guest volume fails with: Storage volume not found: No storage volume with key or path '[...] ...' The error comes from esxVI_LookupFileInfoByDatastorePath: https://libvirt.org/git/?p=libvirt.git;a=blob;f=src/esx/esx_vi.c;h=f7eeeb5c… What does it mean? The reporter also said they could do some (frankly voodoo) moving guests around and then the error went away. We're not sure if that was just coincidence. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

1 1

[libvirt] [PATCH] vz: get rid of unused home state variable in private domain obj
by Nikolay Shirokovskiy 15 Jun '16

15 Jun '16

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy(a)virtuozzo.com> --- src/vz/vz_sdk.c | 16 ---------------- src/vz/vz_utils.h | 1 - 2 files changed, 17 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 2275572..3fe17e0 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -447,7 +447,6 @@ prlsdkDomObjFreePrivate(void *p) PrlHandle_Free(pdom->sdkdom); PrlHandle_Free(pdom->cache.stats); virCondDestroy(&pdom->cache.cond); - VIR_FREE(pdom->home); VIR_FREE(p); }; @@ -1484,7 +1483,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom) virDomainDefPtr def = NULL; vzDomObjPtr pdom = NULL; VIRTUAL_MACHINE_STATE domainState; - char *home = NULL; PRL_RESULT pret; PRL_UINT32 ram; @@ -1541,17 +1539,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom) pret = PrlVmCfg_GetEnvId(sdkdom, &envId); prlsdkCheckRetGoto(pret, error); - if (!(home = prlsdkGetStringParamVar(PrlVmCfg_GetHomePath, sdkdom))) - goto error; - - /* For VMs home is actually /directory/config.pvs */ - if (!IS_CT(def)) { - /* Get rid of /config.pvs in path string */ - char *s = strrchr(home, '/'); - if (s) - *s = '\0'; - } - pret = PrlVmCfg_GetAutoStart(sdkdom, &autostart); prlsdkCheckRetGoto(pret, error); if (autostart != PAO_VM_START_ON_LOAD && @@ -1588,8 +1575,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom) virDomainDefFree(dom->def); dom->def = def; pdom->id = envId; - VIR_FREE(pdom->home); - pdom->home = home; prlsdkConvertDomainState(domainState, envId, dom); @@ -1607,7 +1592,6 @@ prlsdkLoadDomain(vzDriverPtr driver, virDomainObjPtr dom) return 0; error: PrlHandle_Free(sdkdom); - VIR_FREE(home); virDomainDefFree(def); return -1; } diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index ba4d3c5..1e2ed30 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -103,7 +103,6 @@ typedef struct _vzCountersCache vzCountersCache; struct vzDomObj { int id; - char *home; PRL_HANDLE sdkdom; vzCountersCache cache; }; -- 1.8.3.1

2 1

[libvirt] [PATCH] check-spacing: fix error message
by Ján Tomko 15 Jun '16

15 Jun '16

The check for whitespace before comma or semicolon referred to comma as colon. --- build-aux/check-spacing.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/build-aux/check-spacing.pl b/build-aux/check-spacing.pl index f4fedbc..448acf2 100755 --- a/build-aux/check-spacing.pl +++ b/build-aux/check-spacing.pl @@ -138,7 +138,7 @@ foreach my $file (@ARGV) { if ($data =~ /\s[;,]/) { unless ($data =~ /\S; ; / || $data =~ /^\s+;/) { - print "Whitespace before (semi)colon:\n"; + print "Whitespace before semicolon or comma:\n"; print "$file:$.: $line"; $ret = 1; } -- 2.7.3

1 0

[libvirt] [PATCH 0/9] syntax-check: make spacing check faster
by Ján Tomko 15 Jun '16

15 Jun '16

Simplify some regexes to increase coverage and speed up the execution. Reduces (git ls-files "*.c" | xargs build-aux/bracket-spacing.pl) by half a second (from 1.9s to 1.33s), the effect on complete syntax-check is only ~150 ms. Ján Tomko (9): vbox: reformat multi-line error reports maint: remove whitespace from closing parentheses Rename virAssertCmpInt to testAssertEq Rename bracket-spacing.pl to check-spacing.pl check-spacing: rewrite whitespace check before (semi)colon check-spacing: rewrite regex for checking the closing parenthesis check-spacing: simplify keyword spacing check check-spacing: remove virAssertCmpInt exception check-spacing: use non-capturing groups build-aux/bracket-spacing.pl | 204 ------------------------------------------ build-aux/check-spacing.pl | 204 ++++++++++++++++++++++++++++++++++++++++++ cfg.mk | 6 +- src/qemu/qemu_command.c | 3 +- src/vbox/vbox_common.c | 8 +- src/vbox/vbox_snapshot_conf.c | 68 +++++++------- src/vz/vz_driver.c | 3 +- src/vz/vz_sdk.c | 3 +- tests/viratomictest.c | 52 +++++------ 9 files changed, 274 insertions(+), 277 deletions(-) delete mode 100755 build-aux/bracket-spacing.pl create mode 100755 build-aux/check-spacing.pl -- 2.7.3

2 18

[libvirt] [PATCH] maint: Switch to xz compressed PAX release archives
by Andrea Bolognani 15 Jun '16

15 Jun '16

This allows us to produce releases that are roughly a third in size, have no limitation on path lenght, and are still readable by all supported platforms. --- And what better time to switch than the 2.0.0 release? :) configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0114149..7d16e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AH_BOTTOM([#include <config-post.h>]) AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep dnl quiet about the fact that we intentionally cater to automake 1.9 -AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar subdir-objects]) +AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-pax no-dist-gzip dist-xz subdir-objects]) dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; dnl we don't really need the 'u' even in older toolchains. Then there is dnl older libtool, which spelled it AR_FLAGS -- 2.5.5

2 1

[libvirt] Bump tar format?
by Andrea Bolognani 15 Jun '16

15 Jun '16

Hi everyone, commit cc3d52e[1] has apparently broken 'make dist' for at least some platforms: Fedora 20 is fine[2], but both Fedora 21 and rawhide[3][4] are currently failing. My laptop is running Fedora 22 and can make dist just fine, which is of course very confusing. The issue is caused by the following tar error: tar: libvirt-1.2.18/tests/nodeinfodata/linux-deconfigured-cpus/ \ node/node0/cpu16/topology/core_siblings_list: \ link name is too long; not dumped There seem to be basically two ways to solve the failure: 1. rename the test case, making it shorter; 2. bump tar format from ustar, which has limitations on the length of file names, to posix/pax, which has no such limitations. I'm not a fan of the former option because short names are usually very opaque, see tests/nodeinfodata/linux-test[0-8] for some perfect examples. On the other hand, I'm not sure whether bumping the tar version would affect portability in a significant way: the automake documentation[5] reports that this format is very young and should probably be restricted to packages that target only very modern platforms but the GNU tar documentation[6], while containing some warnings as well, suggest that this format is going to become the default. Any suggestions on how to proceed? Cheers. [1] https://www.redhat.com/archives/libvir-list/2015-July/msg00662.html [2] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon -rpm/systems=libvirt-fedora-20/327/ [3] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon -rpm/systems=libvirt-fedora-21/327/ [4] https://ci.centos.org/view/libvirt-project/job/libvirt-daemon -rpm/systems=libvirt-fedora-rawhide/327/ [5] https://www.gnu.org/software/automake/manual/html_node/List-of -Automake-options.html [6] http://www.gnu.org/software/tar/manual/html_chapter/tar_8.html -- Andrea Bolognani Software Engineer - Virtualization Team

6 13

[libvirt] [PATCH] virHostCPUGetInfo: Fix build on non-Unix like systems
by Michal Privoznik 15 Jun '16

15 Jun '16

This function is plenty of ifdefs providing implementations for Linux, *BSD and OS-X. However, if we are being build for any other architecture, all that's left behind by preprocessor is just a error reporting call and return of -1. In that case, passed arguments are unused: ../../src/util/virhostcpu.c: In function 'virHostCPUGetInfo': ../../src/util/virhostcpu.c:966:33: error: unused parameter 'cpus' [-Werror=unused-parameter] unsigned int *cpus, ^~~~ Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virhostcpu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 00c09cd..a481be0 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -963,12 +963,12 @@ virHostCPUParseMapLinux(int max_cpuid, const char *path) int virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, - unsigned int *cpus, - unsigned int *mhz, - unsigned int *nodes, - unsigned int *sockets, - unsigned int *cores, - unsigned int *threads) + unsigned int *cpus ATTRIBUTE_UNUSED, + unsigned int *mhz ATTRIBUTE_UNUSED, + unsigned int *nodes ATTRIBUTE_UNUSED, + unsigned int *sockets ATTRIBUTE_UNUSED, + unsigned int *cores ATTRIBUTE_UNUSED, + unsigned int *threads ATTRIBUTE_UNUSED) { #ifdef __linux__ int ret = -1; -- 2.8.4

2 1

[libvirt] [PATCH 0/2] Speed up syntax-check
by Ján Tomko 15 Jun '16

15 Jun '16

Remove one inefficient regex not applicable to libvirt codebase and join non-reentrant functions into a single regex to reduce the time taken by the two slowest syntax-checks: 4.03 unmarked_diagnostics 4.03 vulnerable_makefile_CVE-2009-4029 4.03 size_of_brackets 4.03 spec_indentation 4.33 require_config_h_first 5.88 prohibit_nonreentrant 7.72 prohibit_undesirable_word_seq This reduces the overall 'make -j9 syntax-check' time for me from ~8s to ~4.5s. Ján Tomko (2): cfg.mk: override gnulib's undesirable_word_seq check cfg.mk: use a single regex for all non-reentrant functions Makefile.nonreentrant | 8 ++++++++ cfg.mk | 18 ++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) -- 2.7.3

2 4

[libvirt] [PATCH] A word error about S3/S4 operations for guest
by sannyshao 15 Jun '16

15 Jun '16

--- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 82b6aae..dd9f153 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1462,7 +1462,7 @@ <dl> <dt><code>pm</code></dt> <dd>These elements enable ('yes') or disable ('no') BIOS support - for S3 (suspend-to-disk) and S4 (suspend-to-mem) ACPI sleep + for S3 (suspend-to-mem) and S4 (suspend-to-disk) ACPI sleep states. If nothing is specified, then the hypervisor will be left with its default value.</dd> </dl> -- 1.8.3.1

2 1

[libvirt] [RFC PATCH 0/4] Add new function about block backup
by Rudy Zhang 15 Jun '16

15 Jun '16

Add new function about block backup, it supports the drive-backup function in qemu, it supports three modes: full, top, incremental. How to use it? As usual, we must do the full backup at first, if it's successfull, next time, we can do the incremental backup, because it has the bitmap to trace the dirty io. The incermental backup is faster. If backup fail at some time, we must do the full backup again, only in this way, we can keep the backup data correctly. Rudy Zhang (4): Introduce virDomainBlockBackup API qemu drive support block backup. virsh: support blockbackup in virsh command libvirt-test: libvirt test supports drive-backup docs/apibuild.py | 3 +- include/libvirt/libvirt-domain.h | 15 ++ src/conf/domain_conf.h | 12 ++ src/driver-hypervisor.h | 9 + src/libvirt-domain.c | 56 ++++++ src/libvirt_public.syms | 5 + src/qemu/qemu_blockjob.c | 2 + src/qemu/qemu_capabilities.c | 4 + src/qemu/qemu_capabilities.h | 5 + src/qemu/qemu_driver.c | 197 +++++++++++++++++++++ src/qemu/qemu_monitor.c | 59 ++++++ src/qemu/qemu_monitor.h | 23 +++ src/qemu/qemu_monitor_json.c | 124 +++++++++++++ src/qemu/qemu_monitor_json.h | 23 +++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 17 +- src/remote_protocol-structs | 9 + tests/qemucaps2xmldata/all_1.6.0-1.caps | 1 + tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 1 + tools/virsh-domain.c | 149 ++++++++++++++++ 20 files changed, 713 insertions(+), 2 deletions(-) -- 2.6.4

4 8

[libvirt] [PATCH 0/6] libxl: add support of pvusb controller
by Chunyan Liu 15 Jun '16

15 Jun '16

This patch series is to add pvusb controller support in libxl driver. It should be applied on previous pvusb device support patch series. Chunyan Liu (6): extend usb controller model to support xen pvusb libxl: support USB controllers in creation time libxl: support usb controller hotplug libxl: check available controller and port when hotplugging USB device xenconfig: add conversion of usb controller config to and from xml xlconfigtest: add test for usb controller conversion docs/formatdomain.html.in | 6 +- docs/schemas/domaincommon.rng | 4 + src/conf/domain_conf.c | 4 + src/conf/domain_conf.h | 4 + src/libxl/libxl_conf.c | 94 +++++++++++++++++ src/libxl/libxl_conf.h | 4 + src/libxl/libxl_driver.c | 176 +++++++++++++++++++++++++++++++ src/qemu/qemu_command.c | 4 + src/xenconfig/xen_xl.c | 203 ++++++++++++++++++++++++++++++++++++ tests/xlconfigdata/test-usbctrl.cfg | 13 +++ tests/xlconfigdata/test-usbctrl.xml | 32 ++++++ tests/xlconfigtest.c | 1 + 12 files changed, 544 insertions(+), 1 deletion(-) create mode 100644 tests/xlconfigdata/test-usbctrl.cfg create mode 100644 tests/xlconfigdata/test-usbctrl.xml -- 2.1.4

5 12

[libvirt] [PATCH V2 0/4] libxl: support pvusb
by Chunyan Liu 14 Jun '16

14 Jun '16

This patch series is to support pvusb in libxl driver. --- Changes in v2: * add LIBXL_HAVE_PVUSB check * add convertion of domxml USB config to/from xl.cfg * address other comments Chunyan Liu (4): libxl: support creating guest with USB hostdev libxl: support hotplug USB host device Add convertion domxml USB config to/from xl.cfg xlconfigtest: add test on USB convertion src/libxl/libxl_conf.c | 74 ++++++++++++++++++++ src/libxl/libxl_conf.h | 5 ++ src/libxl/libxl_domain.c | 16 ++++- src/libxl/libxl_driver.c | 144 +++++++++++++++++++++++++++++++++++++- src/xenconfig/xen_xl.c | 151 ++++++++++++++++++++++++++++++++++++++++ tests/xlconfigdata/test-usb.cfg | 13 ++++ tests/xlconfigdata/test-usb.xml | 35 ++++++++++ tests/xlconfigtest.c | 1 + 8 files changed, 435 insertions(+), 4 deletions(-) create mode 100644 tests/xlconfigdata/test-usb.cfg create mode 100644 tests/xlconfigdata/test-usb.xml -- 2.1.4

4 15

[libvirt] [PATCH V3 0/6] libxl: Add support for UEFI using OVMF
by Jim Fehlig 14 Jun '16

14 Jun '16

This is essentially a V3 of https://www.redhat.com/archives/libvir-list/2016-April/msg01358.html To avoid code duplication in that series, I proposed adding a virFirmware object that could be used by multiple drivers https://www.redhat.com/archives/libvir-list/2016-May/msg01370.html mprivozn ACK'ed that series, but I deferred committing it until 1.3.5 was released since it's not all that useful without accompanying use by another driver. Jim Fehlig (6): driver config: Introduce virFirmware object libxl: add default firmwares to driver config object libxl: introduce libxl_capabilities.{ch} libxl: implement connectGetDomainCapabilities xenconfig: support bios=ovmf xl.cfg libxl: Add support for ovmf firmware po/POTFILES.in | 2 + src/Makefile.am | 12 +- src/libvirt_private.syms | 6 + src/libxl/libxl_capabilities.c | 598 +++++++++++++++++++++++++++++ src/libxl/libxl_capabilities.h | 57 +++ src/libxl/libxl_conf.c | 460 ++-------------------- src/libxl/libxl_conf.h | 22 +- src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 75 ++++ src/qemu/qemu_capabilities.c | 22 +- src/qemu/qemu_capabilities.h | 5 +- src/qemu/qemu_conf.c | 127 +----- src/qemu/qemu_conf.h | 7 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/util/virfirmware.c | 137 +++++++ src/util/virfirmware.h | 51 +++ src/xenconfig/xen_xl.c | 37 +- tests/Makefile.am | 5 + tests/domaincapsschemadata/libxl-xenfv.xml | 68 ++++ tests/domaincapsschemadata/libxl-xenpv.xml | 58 +++ tests/domaincapstest.c | 64 ++- tests/testutils.c | 16 + tests/testutils.h | 2 + tests/testutilsxen.h | 1 + tests/xlconfigdata/test-fullvirt-ovmf.cfg | 26 ++ tests/xlconfigdata/test-fullvirt-ovmf.xml | 58 +++ tests/xlconfigtest.c | 90 ++++- 28 files changed, 1415 insertions(+), 600 deletions(-) create mode 100644 src/libxl/libxl_capabilities.c create mode 100644 src/libxl/libxl_capabilities.h create mode 100644 src/util/virfirmware.c create mode 100644 src/util/virfirmware.h create mode 100644 tests/domaincapsschemadata/libxl-xenfv.xml create mode 100644 tests/domaincapsschemadata/libxl-xenpv.xml create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf.cfg create mode 100644 tests/xlconfigdata/test-fullvirt-ovmf.xml -- 2.1.4

4 14

[libvirt] [PATCH python 0/2] Bindings for storage pool lifecycle events
by Jovanka Gulicoska 14 Jun '16

14 Jun '16

Python buindings and tests for storage pool lifecycle events API. Function storageDetailToString() is not implemented for now. Jovanka Gulicoska (2): Python binding for storage pool lifecycle events API event-test: Add storage pool lifecycle event tests examples/event-test.py | 18 +++++ generator.py | 2 + libvirt-override-virConnect.py | 35 ++++++++++ libvirt-override.c | 153 +++++++++++++++++++++++++++++++++++++++++ sanitytest.py | 3 +- 5 files changed, 210 insertions(+), 1 deletion(-) -- 2.5.5

3 7

[libvirt] [PATCH] virt-host-validate: improve tests for arm/aarch64
by Riku Voipio 14 Jun '16

14 Jun '16

ARM/Aarch64 /proc/cpuinfo has no virtualization related flags. Refactor the Qemu/KVM test a bit: 1) run the "for hardware virtualization" test only on plaforms with known cpuinfo flags (x86, s390) 2) test for /dev/kvm also on platforms where no cpu flags are set Finally Add a more generic error hint message for non-x86 plaforms when /dev/kvm is missing. Signed-off-by: Riku Voipio <riku.voipio(a)linaro.org> --- tools/virt-host-validate-qemu.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index 56ec3c7..520c8ed 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -32,8 +32,9 @@ int virHostValidateQEMU(void) virBitmapPtr flags; int ret = 0; bool hasHwVirt = false; - - virHostMsgCheck("QEMU", "%s", _("for hardware virtualization")); + bool hasVirtFlag = false; + char *kvmhint = _("Check that CPU and firmware supports virtualization " + "and kvm module is loaded"); if (!(flags = virHostValidateGetCPUFlags())) return -1; @@ -41,12 +42,16 @@ int virHostValidateQEMU(void) switch (virArchFromHost()) { case VIR_ARCH_I686: case VIR_ARCH_X86_64: + hasVirtFlag = true; + kvmhint =_("Check that the 'kvm-intel' or 'kvm-amd' modules are " + "loaded & the BIOS has enabled virtualization"); if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SVM) || virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_VMX)) hasHwVirt = true; break; case VIR_ARCH_S390: case VIR_ARCH_S390X: + hasVirtFlag = true; if (virBitmapIsBitSet(flags, VIR_HOST_VALIDATE_CPU_FLAG_SIE)) hasHwVirt = true; break; @@ -54,21 +59,27 @@ int virHostValidateQEMU(void) hasHwVirt = false; } - if (hasHwVirt) { - virHostMsgPass(); + if (hasVirtFlag) { + virHostMsgCheck("QEMU", "%s", _("for hardware virtualization")); + if (hasHwVirt) + virHostMsgPass(); + else { + virHostMsgFail(VIR_HOST_VALIDATE_FAIL, + _("Only emulated CPUs are available, performance will be significantly limited")); + ret = -1; + } + } + + if (hasHwVirt || !hasVirtFlag) { if (virHostValidateDeviceExists("QEMU", "/dev/kvm", VIR_HOST_VALIDATE_FAIL, - _("Check that the 'kvm-intel' or 'kvm-amd' modules are " - "loaded & the BIOS has enabled virtualization")) < 0) + kvmhint) <0) ret = -1; else if (virHostValidateDeviceAccessible("QEMU", "/dev/kvm", VIR_HOST_VALIDATE_FAIL, _("Check /dev/kvm is world writable or you are in " "a group that is allowed to access it")) < 0) ret = -1; - } else { - virHostMsgFail(VIR_HOST_VALIDATE_WARN, - _("Only emulated CPUs are available, performance will be significantly limited")); } virBitmapFree(flags); -- 2.1.4

3 5

[libvirt] [PATCH python] Post-release version bump to 2.0.0
by Daniel P. Berrange 14 Jun '16

14 Jun '16

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed under trivial rule. setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 956609d..099b1e0 100755 --- a/setup.py +++ b/setup.py @@ -305,7 +305,7 @@ class my_clean(clean): _c_modules, _py_modules = get_module_lists() setup(name = 'libvirt-python', - version = '1.3.5', + version = '2.0.0', url = 'http://www.libvirt.org', maintainer = 'Libvirt Maintainers', maintainer_email = 'libvir-list(a)redhat.com', -- 2.5.5

1 0

[libvirt] [PATCH] docs: document rng backend path restrictions of older libvirt
by Ján Tomko 14 Jun '16

14 Jun '16

Commit 67f2b72 removed the path restrictions for rng backend, along with the documentation of the restriction. Restore the documentation for users still using older libvirt. https://bugzilla.redhat.com/show_bug.cgi?id=1074464 --- docs/formatdomain.html.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index daa0891..17e563c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -6356,9 +6356,10 @@ qemu-kvm -net nic,model=? /dev/null This backend type expects a non-blocking character device as input. The file name is specified as contents of the - <code>backend</code> element. When no file name is specified - the hypervisor default is used. For qemu, the default is - /dev/random + <code>backend</code> element. Since 1.3.4 + any path is accepted. Before that /dev/random and /dev/hwrng were + the only accepted paths. When no file name is specified the hypervisor + default is used. For qemu, the default is /dev/random </dd> <dt><code>egd</code></dt> -- 2.7.3

2 1

[libvirt] [PATCH v2 0/6] Introducing storage pool lifecycle event APIs
by Jovanka Gulicoska 14 Jun '16

14 Jun '16

Changes follow comments on v1 patches. Introducing implementation of storage pool event APIs. Code changes follow network event APIs. Implemented functions: virStoragePoolEventRegisterAny(), virStoragePoolEventDeregisterAny(), virStoragePoolLifeCycleEventNew(), introduced STARTED, STOPPED, DEFINE, UNDEFINE and REFRESHED. STARTED signal is emiited in storagePoolCreateXML() and storagePoolCreate() DEFINED signal is emitted in storagePoolDefineXML() UNDEFINED signal is emitted in storagePoolUndefine() STOPPED signal is emitted in storagePoolDestroy() and storagePoolRefresh() REFRESHED signal is emitted in storagePoolRefresh() There are also test as well as unittests for the new functions and signals. This is part of a GSOC project: Asynchronous lifecycle events for storage objects As part of the project there should also be implementation for storage volume events. For now there's no signal when volumes are created or deleted, they can also be implemented, but probably the easiest way is to have apps watch for REFRESH signal, and later extend storage driver code to refresh a pool after volume APIs are called. Jovanka Gulicoska (6): Introduce storage lifecycle event APIs conf: add storage_event handling test: implement storage lifecycle event APIs remote: implement storage lifecycle event APIs storage: implement storage lifecycle event APIs event-test: support storage lifecycle event APIs daemon/libvirtd.h | 2 + daemon/remote.c | 201 +++++++++++++++++++++++++++++- examples/object-events/event-test.c | 46 ++++++- include/libvirt/libvirt-storage.h | 94 ++++++++++++++ src/Makefile.am | 5 + src/conf/storage_conf.h | 4 + src/conf/storage_event.c | 237 ++++++++++++++++++++++++++++++++++++ src/conf/storage_event.h | 60 +++++++++ src/datatypes.h | 13 ++ src/driver-storage.h | 14 +++ src/libvirt-storage.c | 125 +++++++++++++++++++ src/libvirt_private.syms | 5 + src/libvirt_public.syms | 7 ++ src/remote/remote_driver.c | 128 +++++++++++++++++++ src/remote/remote_protocol.x | 43 ++++++- src/remote_protocol-structs | 16 +++ src/storage/storage_driver.c | 110 +++++++++++++++++ src/test/test_driver.c | 71 +++++++++++ tests/objecteventtest.c | 177 +++++++++++++++++++++++++++ 19 files changed, 1355 insertions(+), 3 deletions(-) create mode 100644 src/conf/storage_event.c create mode 100644 src/conf/storage_event.h -- 2.5.5

3 18

[libvirt] Enabling libvirt admin API
by Erik Skultety 14 Jun '16

14 Jun '16

It's been a while since an RFE for getting and setting specific daemon configuration parameters[1] during runtime landed in bugzilla. Although there was only need for dynamic reconfiguration of number of connected clients allowed in the original request, the plan Dan proposed was to implement a separate libvirt administration library, specifying some ideas regarding the functionality that the first version should support. These of course needed a fair amount of helper functions (before any API could be introduced), so a decision to explicitly disable creation of the admin socket (also neither distributing the .so nor the header) until the interface is capable to do something more than just connecting/disconnecting, listing servers and polling for library version has been made. Besides the dynamic reconfiguration of the logging parameters which has been waiting in the list (presumably needs a fresh rebase onto the current master) due to being related and dependent on the logging level refactor[2] (I CCed Daniel as he might have an update on this), the remaining requirements on the interface have been met already. So I was wondering if we could manage to enable it in the upcoming release, as well as getting it to 7.3 (thus not delaying the RFC anymore). I'd like to hear your opinions on this matter, possibly because I might have missed something that would cause the "official" release of the feature to be prolonged even more. [1] https://bugzilla.redhat.com/show_bug.cgi?id=735385 [2] https://www.redhat.com/archives/libvir-list/2016-May/msg00760.html Regards, Erik

3 2

[libvirt] Libvirt multi queue support
by Naor Shlomo 14 Jun '16

14 Jun '16

Hello experts, Could anyone please tell me if Multi Queue it fully supported in Libvirt and if so what version contains it? Thanks, Naor

3 9

[libvirt] libvirt disk labels and QEMU drive host alias generation
by Kashyap Chamarthy 14 Jun '16

14 Jun '16

Summary ------- It seems like libvirt is generating the same QEMU drive host alias ('drive-virtio-disk%d') for different two disk labels (vdb, vdb1). [Refer the contextual root cause analysis discussion at the end with Laine & Peter.] Let's take a quick example to demonstrate the issue. On a guest that is shut down, attach a couplee of disks with labels 'vdb', and 'vdb1' $ sudo virsh attach-disk cvm1 \ /export/vmimages/1.raw vdb --config $ sudo virsh attach-disk cvm1 \ /export/vmimages/1.raw vdb1 --config $ virsh domblklist cvm1 Target Source ------------------------------------------------ vda /var/lib/libvirt/images/cirros-0.3.3-x86_64-disk.img vdb /export/vmimages/1.raw vdb1 /export/vmimages/1.raw Which results in guest XML: [...] <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/export/vmimages/1.raw'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/export/vmimages/1.raw'/> <target dev='vdb1' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </disk> [...] Sarting the guest (error message manually wrapped) fails, as $ virsh start cvm1 error: Failed to start domain cvm1 error: internal error: process exited while connecting to monitor: qemu-system-x86_64: -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1: Duplicate ID 'drive-virtio-disk1' for drive It results in QEMU CLI: -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x7,drive=drive-virtio-disk1,id=virtio-disk1 \ -drive file=/export/vmimages/1.raw,format=raw,if=none,id=drive-virtio-disk1 \ -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x8,drive=drive-virtio-disk1,id=virtio-disk1 \ Root cause analysis discussion from IRC from Friday --------------------------------------------------- [laine] The problem is that the "alias" libvirt generates based on the target device name should be unique, but it isn't. I can see why it's doing that. When putting the index of the disk it's processing within the entries into drive-virtio-disk%d, it learns the index by calling virDiskNameToIndex(). It's going through a list of disks, 0, 1, 2, 3, etc creating the alias. But at each index, it calls this other function to learn the index, and that function just searches for the first entry that matches the name. If they *really* don't know the index (because they only have a pointer to the entry) they should just search for the entry with the matching *address in memory* Haven't stepped through it carefully, but it looks like "vdb" and "vdb1" lead to the same id, and also "vdb" and "sdb" [pkrempa] The alias generator calls virDiskNameToIndex() which calls virDiskNameParse(). virDiskNameParse() parses the name including the partition number and returns it. virDiskNameToIndex() discards the partition number and returns the disk index. If we accept both 'sdb' and 'sdb1' but generate the same alias then that's a bug. -- /kashyap

3 3

[libvirt] [PATCH 0/6] Some patches for native TLS encrypted chardev TCP support
by John Ferlan 14 Jun '16

14 Jun '16

Not fully complete yet as I need the key secret from the LUKS encryption support series; however, I figured I would post what I have that is at least "separable". This set of patches is in support of: https://bugzilla.redhat.com/show_bug.cgi?id=1300776 What's missing is the ability to provide an AES secret/key/passphrase in order to generate the qemu "passwordid=tlskey0" option. John Ferlan (6): caps: Add capability for tls-x509-creds docs: Clarify chardev protocol qemu: Refactor qemuDomainAttachChrDevice error paths conf: Add new tlsx509 attribute for tcp chardev qemu: Add support for TLS X.509 path qemu: Add the ability to hotplug the TLS X.509 environment docs/formatdomain.html.in | 36 +++++++- docs/schemas/domaincommon.rng | 12 +++ src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 15 +++ src/conf/domain_conf.h | 1 + src/conf/virchrdev.c | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 101 +++++++++++++++++++++ src/qemu/qemu_command.h | 6 ++ src/qemu/qemu_hotplug.c | 47 ++++++++-- src/qemu/qemu_monitor_json.c | 9 ++ src/security/security_dac.c | 11 ++- src/security/security_selinux.c | 10 ++ src/security/virt-aa-helper.c | 12 ++- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argv-serial-tcp-tlsx509-chardev.args | 32 +++++++ .../qemuxml2argv-serial-tcp-tlsx509-chardev.xml | 42 +++++++++ tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml | 51 +++++++++++ tests/qemuxml2xmltest.c | 1 + 25 files changed, 385 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-tlsx509-chardev.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-tcp-tlsx509-chardev.xml -- 2.5.5

2 11

[libvirt] [PATCH 1/6] add VirtualBox 5 support to file vbox/vbox_tmpl.c
by Martin Pietsch 14 Jun '16

14 Jun '16

--- src/vbox/vbox_tmpl.c | 290 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 183 insertions(+), 107 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 7a8205d..79ce001 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -69,6 +69,8 @@ # include "vbox_CAPI_v4_3.h" #elif VBOX_API_VERSION == 4003004 # include "vbox_CAPI_v4_3_4.h" +#elif VBOX_API_VERSION == 5000000 +# include "vbox_CAPI_v5_0.h" #else # error "Unsupport VBOX_API_VERSION" #endif @@ -228,18 +230,18 @@ static void nsIDtoChar(unsigned char *uuid, const nsID *iid) memcpy(uuidinterim, iid, VIR_UUID_BUFLEN); virUUIDFormat(uuidinterim, uuidstrsrc); - uuidstrdst[0] = uuidstrsrc[6]; - uuidstrdst[1] = uuidstrsrc[7]; - uuidstrdst[2] = uuidstrsrc[4]; - uuidstrdst[3] = uuidstrsrc[5]; - uuidstrdst[4] = uuidstrsrc[2]; - uuidstrdst[5] = uuidstrsrc[3]; - uuidstrdst[6] = uuidstrsrc[0]; - uuidstrdst[7] = uuidstrsrc[1]; + uuidstrdst[0] = uuidstrsrc[6]; + uuidstrdst[1] = uuidstrsrc[7]; + uuidstrdst[2] = uuidstrsrc[4]; + uuidstrdst[3] = uuidstrsrc[5]; + uuidstrdst[4] = uuidstrsrc[2]; + uuidstrdst[5] = uuidstrsrc[3]; + uuidstrdst[6] = uuidstrsrc[0]; + uuidstrdst[7] = uuidstrsrc[1]; - uuidstrdst[8] = uuidstrsrc[8]; + uuidstrdst[8] = uuidstrsrc[8]; - uuidstrdst[9] = uuidstrsrc[11]; + uuidstrdst[9] = uuidstrsrc[11]; uuidstrdst[10] = uuidstrsrc[12]; uuidstrdst[11] = uuidstrsrc[9]; uuidstrdst[12] = uuidstrsrc[10]; @@ -267,18 +269,18 @@ static void nsIDFromChar(nsID *iid, const unsigned char *uuid) virUUIDFormat(uuid, uuidstrsrc); - uuidstrdst[0] = uuidstrsrc[6]; - uuidstrdst[1] = uuidstrsrc[7]; - uuidstrdst[2] = uuidstrsrc[4]; - uuidstrdst[3] = uuidstrsrc[5]; - uuidstrdst[4] = uuidstrsrc[2]; - uuidstrdst[5] = uuidstrsrc[3]; - uuidstrdst[6] = uuidstrsrc[0]; - uuidstrdst[7] = uuidstrsrc[1]; + uuidstrdst[0] = uuidstrsrc[6]; + uuidstrdst[1] = uuidstrsrc[7]; + uuidstrdst[2] = uuidstrsrc[4]; + uuidstrdst[3] = uuidstrsrc[5]; + uuidstrdst[4] = uuidstrsrc[2]; + uuidstrdst[5] = uuidstrsrc[3]; + uuidstrdst[6] = uuidstrsrc[0]; + uuidstrdst[7] = uuidstrsrc[1]; - uuidstrdst[8] = uuidstrsrc[8]; + uuidstrdst[8] = uuidstrsrc[8]; - uuidstrdst[9] = uuidstrsrc[11]; + uuidstrdst[9] = uuidstrsrc[11]; uuidstrdst[10] = uuidstrsrc[12]; uuidstrdst[11] = uuidstrsrc[9]; uuidstrdst[12] = uuidstrsrc[10]; @@ -621,13 +623,12 @@ _vboxIIDFromArrayItem(vboxGlobalData *data, vboxIIDUnion *iidu, # if VBOX_API_VERSION < 4000000 /* Only 3.x will use this function. */ static bool vboxGetDeviceDetails(const char *deviceName, - PRUint32 *aMaxPortPerInst, - PRUint32 *aMaxSlotPerPort, - PRUint32 storageBus, - PRInt32 *deviceInst, - PRInt32 *devicePort, - PRInt32 *deviceSlot) -{ + PRUint32 *aMaxPortPerInst, + PRUint32 *aMaxSlotPerPort, + PRUint32 storageBus, + PRInt32 *deviceInst, + PRInt32 *devicePort, + PRInt32 *deviceSlot) { int total = 0; PRUint32 maxPortPerInst = 0; PRUint32 maxSlotPerPort = 0; @@ -829,8 +830,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin machine->vtbl->GetDVDDrive(machine, &dvdDrive); if (dvdDrive) { - IDVDImage *dvdImage = NULL; - PRUnichar *dvdfileUtf16 = NULL; + IDVDImage *dvdImage = NULL; + PRUnichar *dvdfileUtf16 = NULL; vboxIID dvduuid = VBOX_IID_INITIALIZER; vboxIID dvdemptyuuid = VBOX_IID_INITIALIZER; @@ -873,10 +874,10 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin } } else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { if (type == VIR_STORAGE_TYPE_FILE && src) { - IHardDisk *hardDisk = NULL; + IHardDisk *hardDisk = NULL; PRUnichar *hddfileUtf16 = NULL; vboxIID hdduuid = VBOX_IID_INITIALIZER; - PRUnichar *hddEmpty = NULL; + PRUnichar *hddEmpty = NULL; /* Current Limitation: Harddisk can't be connected to * Secondary Master as Secondary Master is always used * for CD/DVD Drive, so don't connect the harddisk if it @@ -930,8 +931,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin VIR_DEBUG("Not connecting harddisk to hdc as hdc" " is taken by CD/DVD Drive"); } else { - PRInt32 channel = 0; - PRInt32 device = 0; + PRInt32 channel = 0; + PRInt32 device = 0; PRUnichar *hddcnameUtf16 = NULL; char *hddcname; @@ -941,13 +942,13 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin if (STREQ(def->disks[i]->dst, "hda")) { channel = 0; - device = 0; + device = 0; } else if (STREQ(def->disks[i]->dst, "hdb")) { channel = 0; - device = 1; + device = 1; } else if (STREQ(def->disks[i]->dst, "hdd")) { channel = 1; - device = 1; + device = 1; } rc = machine->vtbl->AttachHardDisk(machine, @@ -982,8 +983,8 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin if (floppyDrive) { rc = floppyDrive->vtbl->SetEnabled(floppyDrive, 1); if (NS_SUCCEEDED(rc)) { - IFloppyImage *floppyImage = NULL; - PRUnichar *fdfileUtf16 = NULL; + IFloppyImage *floppyImage = NULL; + PRUnichar *fdfileUtf16 = NULL; vboxIID fduuid = VBOX_IID_INITIALIZER; vboxIID fdemptyuuid = VBOX_IID_INITIALIZER; @@ -1038,7 +1039,7 @@ static void _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { size_t i; - nsresult rc = 0; + nsresult rc; PRUint32 maxPortPerInst[StorageBus_Floppy + 1] = {}; PRUint32 maxSlotPerPort[StorageBus_Floppy + 1] = {}; @@ -1110,14 +1111,14 @@ _vboxAttachDrivesOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machin ? "True" : "False")); if (type == VIR_STORAGE_TYPE_FILE && src) { - IMedium *medium = NULL; - PRUnichar *mediumUUID = NULL; + IMedium *medium = NULL; + PRUnichar *mediumUUID = NULL; PRUnichar *mediumFileUtf16 = NULL; - PRUint32 storageBus = StorageBus_Null; - PRUint32 deviceType = DeviceType_Null; - PRInt32 deviceInst = 0; - PRInt32 devicePort = 0; - PRInt32 deviceSlot = 0; + PRUint32 storageBus = StorageBus_Null; + PRUint32 deviceType = DeviceType_Null; + PRInt32 deviceInst = 0; + PRInt32 devicePort = 0; + PRInt32 deviceSlot = 0; VBOX_UTF8_TO_UTF16(src, &mediumFileUtf16); @@ -1311,7 +1312,9 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, ISnapshot *snapshot) { vboxGlobalData *data = dom->conn->privateData; +# if VBOX_API_VERSION < 5000000 IConsole *console = NULL; +# endif /*VBOX_API_VERSION < 5000000*/ IProgress *progress = NULL; PRUint32 state; nsresult rc; @@ -1344,16 +1347,22 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, } rc = VBOX_SESSION_OPEN(domiid.value, machine); +# if VBOX_API_VERSION < 5000000 if (NS_SUCCEEDED(rc)) rc = data->vboxSession->vtbl->GetConsole(data->vboxSession, &console); +# endif /*VBOX_API_VERSION < 5000000*/ if (NS_FAILED(rc)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("could not open VirtualBox session with domain %s"), dom->name); goto cleanup; } - +# if VBOX_API_VERSION < 5000000 rc = console->vtbl->RestoreSnapshot(console, snapshot, &progress); +# elif VBOX_API_VERSION >= 5000000 /*VBOX_API_VERSION < 5000000*/ + rc = machine->vtbl->RestoreSnapshot(machine, snapshot, &progress); +# endif /*VBOX_API_VERSION >= 5000000*/ + if (NS_FAILED(rc) || !progress) { if (rc == VBOX_E_INVALID_VM_STATE) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", @@ -1378,7 +1387,9 @@ _vboxDomainSnapshotRestore(virDomainPtr dom, cleanup: VBOX_RELEASE(progress); +# if VBOX_API_VERSION < 5000000 VBOX_RELEASE(console); +# endif /*VBOX_API_VERSION < 5000000*/ VBOX_SESSION_CLOSE(); vboxIIDUnalloc(&domiid); return ret; @@ -1406,8 +1417,8 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRUint32 state) { virDomainPtr dom = NULL; - int event = 0; - int detail = 0; + int event = 0; + int detail = 0; vboxDriverLock(g_pVBoxGlobalData); @@ -1415,7 +1426,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, DEBUGPRUnichar("machineId", machineId); if (machineId) { - char *machineIdUtf8 = NULL; + char *machineIdUtf8 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); @@ -1426,31 +1437,31 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, virObjectEventPtr ev; if (state == MachineState_Starting) { - event = VIR_DOMAIN_EVENT_STARTED; + event = VIR_DOMAIN_EVENT_STARTED; detail = VIR_DOMAIN_EVENT_STARTED_BOOTED; } else if (state == MachineState_Restoring) { - event = VIR_DOMAIN_EVENT_STARTED; + event = VIR_DOMAIN_EVENT_STARTED; detail = VIR_DOMAIN_EVENT_STARTED_RESTORED; } else if (state == MachineState_Paused) { - event = VIR_DOMAIN_EVENT_SUSPENDED; + event = VIR_DOMAIN_EVENT_SUSPENDED; detail = VIR_DOMAIN_EVENT_SUSPENDED_PAUSED; } else if (state == MachineState_Running) { - event = VIR_DOMAIN_EVENT_RESUMED; + event = VIR_DOMAIN_EVENT_RESUMED; detail = VIR_DOMAIN_EVENT_RESUMED_UNPAUSED; } else if (state == MachineState_PoweredOff) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; } else if (state == MachineState_Stopping) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_DESTROYED; } else if (state == MachineState_Aborted) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_CRASHED; } else if (state == MachineState_Saving) { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SAVED; } else { - event = VIR_DOMAIN_EVENT_STOPPED; + event = VIR_DOMAIN_EVENT_STOPPED; detail = VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN; } @@ -1525,8 +1536,8 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, PRUnichar *machineId, PRBool registered) { virDomainPtr dom = NULL; - int event = 0; - int detail = 0; + int event = 0; + int detail = 0; vboxDriverLock(g_pVBoxGlobalData); @@ -1534,7 +1545,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, DEBUGPRUnichar("machineId", machineId); if (machineId) { - char *machineIdUtf8 = NULL; + char *machineIdUtf8 = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); @@ -1551,10 +1562,10 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, * to show the VIR_DOMAIN_EVENT_UNDEFINED event */ if (registered) { - event = VIR_DOMAIN_EVENT_DEFINED; + event = VIR_DOMAIN_EVENT_DEFINED; detail = VIR_DOMAIN_EVENT_DEFINED_ADDED; } else { - event = VIR_DOMAIN_EVENT_UNDEFINED; + event = VIR_DOMAIN_EVENT_UNDEFINED; detail = VIR_DOMAIN_EVENT_UNDEFINED_REMOVED; } @@ -1750,7 +1761,7 @@ vboxConnectDomainEventRegister(virConnectPtr conn, virFreeCallback freecb) { vboxGlobalData *data = conn->privateData; - int vboxRet = -1; + int vboxRet = -1; nsresult rc; int ret = -1; @@ -1854,7 +1865,7 @@ static int vboxConnectDomainEventRegisterAny(virConnectPtr conn, virFreeCallback freecb) { vboxGlobalData *data = conn->privateData; - int vboxRet = -1; + int vboxRet = -1; nsresult rc; int ret = -1; @@ -2160,26 +2171,26 @@ _dumpIDEHDDsOld(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - PRInt32 hddNum = 0; - IHardDisk *hardDiskPM = NULL; - IHardDisk *hardDiskPS = NULL; - IHardDisk *hardDiskSS = NULL; - const char *hddBus = "IDE"; - PRUnichar *hddBusUtf16 = NULL; + PRInt32 hddNum = 0; + IHardDisk *hardDiskPM = NULL; + IHardDisk *hardDiskPS = NULL; + IHardDisk *hardDiskSS = NULL; + const char *hddBus = "IDE"; + PRUnichar *hddBusUtf16 = NULL; /* dump IDE hdds if present */ VBOX_UTF8_TO_UTF16(hddBus, &hddBusUtf16); def->ndisks = 0; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 0, &hardDiskPM); if (hardDiskPM) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 0, 1, &hardDiskPS); if (hardDiskPS) def->ndisks++; - machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); + machine->vtbl->GetHardDisk(machine, hddBusUtf16, 1, 1, &hardDiskSS); if (hardDiskSS) def->ndisks++; @@ -2199,8 +2210,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskPM) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskPM->vtbl->imedium.GetLocation((IMedium *)hardDiskPM, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2221,8 +2232,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskPS) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskPS->vtbl->imedium.GetLocation((IMedium *)hardDiskPS, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2243,8 +2254,8 @@ _dumpIDEHDDsOld(virDomainDefPtr def, if (hardDiskSS) { PRUnichar *hddlocationUtf16 = NULL; - char *hddlocation = NULL; - PRUint32 hddType = HardDiskType_Normal; + char *hddlocation = NULL; + PRUint32 hddType = HardDiskType_Normal; hardDiskSS->vtbl->imedium.GetLocation((IMedium *)hardDiskSS, &hddlocationUtf16); VBOX_UTF16_TO_UTF8(hddlocationUtf16, &hddlocation); @@ -2269,10 +2280,10 @@ _dumpDVD(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) { - IDVDDrive *dvdDrive = NULL; - IDVDImage *dvdImage = NULL; + IDVDDrive *dvdDrive = NULL; + IDVDImage *dvdImage = NULL; PRUnichar *locationUtf16 = NULL; - char *location = NULL; + char *location = NULL; /* dump CDROM/DVD if the drive is attached and has DVD/CD in it */ @@ -2323,8 +2334,8 @@ _dumpDVD(virDomainDefPtr def, static int _attachDVD(vboxGlobalData *data, IMachine *machine, const char *src) { - IDVDDrive *dvdDrive = NULL; - IDVDImage *dvdImage = NULL; + IDVDDrive *dvdDrive = NULL; + IDVDImage *dvdImage = NULL; PRUnichar *dvdfileUtf16 = NULL; vboxIID dvduuid = VBOX_IID_INITIALIZER; vboxIID dvdemptyuuid = VBOX_IID_INITIALIZER; @@ -2410,10 +2421,10 @@ _dumpFloppy(virDomainDefPtr def, { IFloppyDrive *floppyDrive = NULL; IFloppyImage *floppyImage = NULL; - PRUnichar *locationUtf16 = NULL; - char *location = NULL; - PRBool enabled = PR_FALSE; - PRUint32 state = DriveState_Null; + PRUnichar *locationUtf16 = NULL; + char *location = NULL; + PRBool enabled = PR_FALSE; + PRUint32 state = DriveState_Null; /* dump Floppy if the drive is attached and has floppy in it */ machine->vtbl->GetFloppyDrive(machine, &floppyDrive); @@ -2466,8 +2477,8 @@ static int _attachFloppy(vboxGlobalData *data, IMachine *machine, const char *src) { IFloppyDrive *floppyDrive; - IFloppyImage *floppyImage = NULL; - PRUnichar *fdfileUtf16 = NULL; + IFloppyImage *floppyImage = NULL; + PRUnichar *fdfileUtf16 = NULL; vboxIID fduuid = VBOX_IID_INITIALIZER; vboxIID fdemptyuuid = VBOX_IID_INITIALIZER; nsresult rc; @@ -2812,7 +2823,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m { vboxIID iid = VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 = NULL; - nsresult rc = -1; + nsresult rc; VBOX_UTF8_TO_UTF16(def->name, &machineNameUtf16); vboxIIDFromUUID(&iid, def->uuid); @@ -2825,7 +2836,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m iid.value, machine); #elif VBOX_API_VERSION < 4000000 /* 3002000 <= VBOX_API_VERSION < 4000000 */ - PRBool override = PR_FALSE; + PRBool override = PR_FALSE; rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, machineNameUtf16, NULL, @@ -2834,7 +2845,7 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m override, machine); #elif VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 4002000 - PRBool override = PR_FALSE; + PRBool override = PR_FALSE; rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, machineNameUtf16, @@ -2843,12 +2854,18 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m override, machine); #else /* VBOX_API_VERSION >= 4002000 */ - char *createFlags = NULL; + const char *flagsUUIDPrefix = "UUID="; + const char *flagsForceOverwrite = "forceOverwrite=0"; + const char *flagsSeparator = ","; + char createFlags[strlen(flagsUUIDPrefix) + VIR_UUID_STRING_BUFLEN + strlen(flagsSeparator) + strlen(flagsForceOverwrite) + 1]; PRUnichar *createFlagsUtf16 = NULL; - if (virAsprintf(&createFlags, - "UUID=%s,forceOverwrite=0", uuidstr) < 0) - goto cleanup; + snprintf(createFlags, sizeof(createFlags), "%s%s%s%s", + flagsUUIDPrefix, + uuidstr, + flagsSeparator, + flagsForceOverwrite + ); VBOX_UTF8_TO_UTF16(createFlags, &createFlagsUtf16); rc = data->vboxObj->vtbl->CreateMachine(data->vboxObj, NULL, @@ -2858,8 +2875,6 @@ _virtualboxCreateMachine(vboxGlobalData *data, virDomainDefPtr def, IMachine **m nsnull, createFlagsUtf16, machine); - cleanup: - VIR_FREE(createFlags); #endif /* VBOX_API_VERSION >= 4002000 */ } VBOX_UTF16_FREE(machineNameUtf16); @@ -2874,7 +2889,12 @@ _virtualboxCreateHardDisk(IVirtualBox *vboxObj, PRUnichar *format, /* In vbox 2.2 and 3.0, this function will create a IHardDisk object. * In vbox 3.1 and later, this function will create a IMedium object. */ +#if VBOX_API_VERSION < 5000000 return vboxObj->vtbl->CreateHardDisk(vboxObj, format, location, hardDisk); +#elif VBOX_API_VERSION >= 5000000 /*VBOX_API_VERSION >= 5000000*/ + return vboxObj->vtbl->CreateMedium(vboxObj, format, location, AccessMode_ReadWrite, DeviceType_HardDisk, hardDisk); +#endif /*VBOX_API_VERSION >= 5000000*/ + } static nsresult @@ -3366,7 +3386,23 @@ _sessionGetMachine(ISession *session, IMachine **machine) static nsresult _consoleSaveState(IConsole *console, IProgress **progress) { +#if VBOX_API_VERSION < 5000000 return console->vtbl->SaveState(console, progress); +#else /*VBOX_API_VERSION < 5000000*/ + IMachine *machine; + nsresult rc; + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->SaveState(machine, progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + return rc; + +#endif /*VBOX_API_VERSION >= 5000000*/ } static nsresult @@ -3414,7 +3450,25 @@ static nsresult _consoleTakeSnapshot(IConsole *console, PRUnichar *name, PRUnichar *description, IProgress **progress) { +#if VBOX_API_VERSION < 5000000 return console->vtbl->TakeSnapshot(console, name, description, progress); +#else + IMachine *machine; + nsresult rc; + PRUnichar *id = NULL; + bool bpause = true; /*NO live snapshot*/ + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->TakeSnapshot(machine, name, description, bpause, &id, progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + VBOX_RELEASE(machine); + return rc; +#endif /* VBOX_API_VERSION >= 5000000 */ } static nsresult @@ -3422,9 +3476,24 @@ _consoleDeleteSnapshot(IConsole *console, vboxIIDUnion *iidu, IProgress **progre { #if VBOX_API_VERSION < 3001000 return console->vtbl->DiscardSnapshot(console, IID_MEMBER(value), progress); -#else /* VBOX_API_VERSION >= 3001000 */ +#elif VBOX_API_VERSION >= 3001000 && VBOX_API_VERSION < 5000000 /* VBOX_API_VERSION >= 3001000 */ return console->vtbl->DeleteSnapshot(console, IID_MEMBER(value), progress); -#endif /* VBOX_API_VERSION >= 3001000 */ +#else /* VBOX_API_VERSION >= 5000000 */ + IMachine *machine; + nsresult rc; + + rc = console->vtbl->GetMachine(console, &machine); + + if (NS_SUCCEEDED(rc)) + rc = machine->vtbl->DeleteSnapshot(machine, IID_MEMBER(value), progress); + else + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unable to get machine from console. (error %d)"), rc); + + VBOX_RELEASE(machine); + + return rc; +#endif /* VBOX_API_VERSION >= 5000000 */ } static nsresult @@ -4342,11 +4411,18 @@ _displayGetScreenResolution(IDisplay *display ATTRIBUTE_UNUSED, #elif VBOX_API_VERSION < 4003000 return display->vtbl->GetScreenResolution(display, screenId, width, height, bitsPerPixel); -#else /* VBOX_API_VERSION >= 4003000 */ +#elif VBOX_API_VERSION < 5000000 /* VBOX_API_VERSION >= 4003000 */ return display->vtbl->GetScreenResolution(display, screenId, width, height, bitsPerPixel, xOrigin, yOrigin); -#endif /* VBOX_API_VERSION >= 4003000 */ +#else /*VBOX_API_VERSION >= 5000000 */ + PRUint32 gms; + + return display->vtbl->GetScreenResolution(display, screenId, width, + height, bitsPerPixel, + xOrigin, yOrigin, &gms); +#endif /* VBOX_API_VERSION >= 5000000 */ + } static nsresult @@ -4357,10 +4433,10 @@ _displayTakeScreenShotPNGToArray(IDisplay *display ATTRIBUTE_UNUSED, PRUint32 *screenDataSize ATTRIBUTE_UNUSED, PRUint8** screenData ATTRIBUTE_UNUSED) { -#if VBOX_API_VERSION < 4000000 +#if VBOX_API_VERSION < 4000000 || VBOX_API_VERSION >= 5000000 vboxUnsupported(); return 0; -#else /* VBOX_API_VERSION >= 4000000 */ +#else /* VBOX_API_VERSION >= 4000000 && VBOX_API_VERSION < 5000000 */ return display->vtbl->TakeScreenShotPNGToArray(display, screenId, width, height, screenDataSize, screenData); -- 2.7.4

2 8

[libvirt] [PATCH] docs: Fix syntax-check
by John Ferlan 14 Jun '16

14 Jun '16

Commit id '42ff399a' broke syntax-check by not encasing <dt> elements in <code>xxx</code> Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed under build breaker rule. docs/downloads.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 899671a..f213b29 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -55,12 +55,12 @@ <dl> - <dt>major</dt> + <dt><code>major</code></dt> <dd>incremented by 1 for the first release of the year (the Jan 15th release)</dd> - <dt>minor</dt> + <dt><code>minor</code></dt> <dd>incremented by 1 for each monthly release from git master</dd> - <dt>micro</dt> + <dt><code>micro</code></dt> <dd>always 0 for releases from git master, incremented by 1 for each stable maintenance release</dd> </dl> -- 2.5.5

1 0

[libvirt] [PATCH v2] Bump release to 2.0.0 and document release schedule & versioning
by Daniel P. Berrange 14 Jun '16

14 Jun '16

This bumps the release number of 2.0.0, to reflect the switch to a new time based release versioning scheme. The downloads page is updated to describe our policies for release schedules and release version numbering The stable release docs are changed to reflect the fact that the stable version numbers are now just 3 digits long instead of 4. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- docs/downloads.html.in | 51 +++++++++++++++++++++++++++++++++++++++++++---- docs/formatdomain.html.in | 6 +++--- src/libvirt_lxc.syms | 2 +- src/libxl/libxl_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 6 files changed, 54 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 827d9db..0114149 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.3.6], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 13a6db1..899671a 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -32,20 +32,63 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="schedule">Primary release schedule</a></h2> + + + Libvirt follows a time based plan, with releases made once a month + on the 1st of each month give or take a few days. The only exception + is at the start of the year where there are two 6 weeks gaps (first + release in the middle of Jan, then skip the Feb release), giving + a total of 11 releases a year. + + + <h2><a name="numbering">Release numbering</a></h2> + + + Since libvirt 2.0.0, a time based version numbering rule + is applied. As such, the changes in version number have + do not have any implications with respect to the scope of + features or bugfixes included, the stability of the code, + or the API / ABI compatibility (libvirt API / ABI is guaranteed + stable forever). The rules applied for changing the libvirt + version number are: + + + <dl> + <dt>major</dt> + <dd>incremented by 1 for the first release of the year (the + Jan 15th release)</dd> + <dt>minor</dt> + <dd>incremented by 1 for each monthly release from git master</dd> + <dt>micro</dt> + <dd>always 0 for releases from git master, incremented by 1 + for each stable maintenance release</dd> + </dl> + + + Prior to 2.0.0, the major/minor numbers were incremented + fairly arbitrarily, and maintenance releases appended a + fourth digit. + + <h2><a name="maintenance">Maintenance releases</a></h2> In the git repository are several stable maintenance branches, matching the - pattern <code>vmajor.minor.micro-maint</code>; + pattern <code>vmajor.minor-maint</code>; these branches are forked off the corresponding - <code>vmajor.minor.micro</code> formal + <code>vmajor.minor.0</code> formal release, and may have further releases of the - form <code>vmajor.minor.micro.rel</code>. + form <code>vmajor.minor.micro</code>. These maintenance branches should only contain bug fixes, and no new features, backported from the master branch, and are supported as long as at least one downstream distribution expresses interest in a given branch. These maintenance - branches are considered during CVE analysis. + branches are considered during CVE analysis. In contrast + to the primary releases which are made once a month, there + is no formal schedule for the maintenance releases, which + are made whenever there is a need to make available key + bugfixes to downstream consumers. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0ad2bbc..daa0891 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2574,7 +2574,7 @@ if <code>discard</code> is set to "ignore"). NB enabling the detection is a compute intensive operation, but can save file space and/or time on slow media. - Since 1.3.6 + Since 2.0.0 </li> <li> The optional <code>iothread</code> attribute assigns the @@ -5372,7 +5372,7 @@ qemu-kvm -net nic,model=? /dev/null of the first forward dev will be used. </dd> - <dt><code>socket</code> since 1.3.6 (QEMU only)</dt> + <dt><code>socket</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type tells a graphics server to listen on unix socket. @@ -5388,7 +5388,7 @@ qemu-kvm -net nic,model=? /dev/null attribute all <code>listen</code> elements are ignored. </dd> - <dt><code>none</code> since 1.3.6 (QEMU only)</dt> + <dt><code>none</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type doesn't have any other attribute. Libvirt supports diff --git a/src/libvirt_lxc.syms b/src/libvirt_lxc.syms index 56c24c0..9b418ee 100644 --- a/src/libvirt_lxc.syms +++ b/src/libvirt_lxc.syms @@ -21,7 +21,7 @@ LIBVIRT_LXC_1.0.4 { virDomainLxcEnterSecurityLabel; } LIBVIRT_LXC_1.0.2; -LIBVIRT_LXC_1.3.6 { +LIBVIRT_LXC_2.0.0 { global: virDomainLxcEnterCGroup; } LIBVIRT_LXC_1.0.4; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9e9957e..0644f60 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5700,7 +5700,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ - .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 1.3.6 */ + .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */ }; static virConnectDriver libxlConnectDriver = { diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index bb0d1b9..bb96fa0 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2756,7 +2756,7 @@ static virHypervisorDriver vzHypervisorDriver = { .domainIsUpdated = vzDomainIsUpdated, /* 1.2.21 */ .domainGetVcpusFlags = vzDomainGetVcpusFlags, /* 1.2.21 */ .domainGetMaxVcpus = vzDomainGetMaxVcpus, /* 1.2.21 */ - .domainSetUserPassword = vzDomainSetUserPassword, /* 1.3.6 */ + .domainSetUserPassword = vzDomainSetUserPassword, /* 2.0.0 */ .connectDomainEventRegisterAny = vzConnectDomainEventRegisterAny, /* 1.2.10 */ .connectDomainEventDeregisterAny = vzConnectDomainEventDeregisterAny, /* 1.2.10 */ .nodeGetCPUMap = vzNodeGetCPUMap, /* 1.2.8 */ -- 2.5.5

2 3

[libvirt] [PATCH] Change 1.3.6 occurrences to 2.0.0 to follow version bump
by Martin Kletzander 14 Jun '16

14 Jun '16

Version was bumped but documentation (and comments) didn't follow the numbering. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed as trivial. docs/formatdomain.html.in | 6 +++--- src/libxl/libxl_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0ad2bbcc90a2..daa089117d38 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2574,7 +2574,7 @@ if <code>discard</code> is set to "ignore"). NB enabling the detection is a compute intensive operation, but can save file space and/or time on slow media. - Since 1.3.6 + Since 2.0.0 </li> <li> The optional <code>iothread</code> attribute assigns the @@ -5372,7 +5372,7 @@ qemu-kvm -net nic,model=? /dev/null of the first forward dev will be used. </dd> - <dt><code>socket</code> since 1.3.6 (QEMU only)</dt> + <dt><code>socket</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type tells a graphics server to listen on unix socket. @@ -5388,7 +5388,7 @@ qemu-kvm -net nic,model=? /dev/null attribute all <code>listen</code> elements are ignored. </dd> - <dt><code>none</code> since 1.3.6 (QEMU only)</dt> + <dt><code>none</code> since 2.0.0 (QEMU only)</dt> <dd> This listen type doesn't have any other attribute. Libvirt supports diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9e9957e739e0..0644f6046742 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5700,7 +5700,7 @@ static virHypervisorDriver libxlHypervisorDriver = { .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.6 */ .nodeGetSecurityModel = libxlNodeGetSecurityModel, /* 1.2.16 */ .domainInterfaceAddresses = libxlDomainInterfaceAddresses, /* 1.3.5 */ - .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 1.3.6 */ + .connectGetDomainCapabilities = libxlConnectGetDomainCapabilities, /* 2.0.0 */ }; static virConnectDriver libxlConnectDriver = { diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index bb0d1b99b67c..bb96fa07da10 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2756,7 +2756,7 @@ static virHypervisorDriver vzHypervisorDriver = { .domainIsUpdated = vzDomainIsUpdated, /* 1.2.21 */ .domainGetVcpusFlags = vzDomainGetVcpusFlags, /* 1.2.21 */ .domainGetMaxVcpus = vzDomainGetMaxVcpus, /* 1.2.21 */ - .domainSetUserPassword = vzDomainSetUserPassword, /* 1.3.6 */ + .domainSetUserPassword = vzDomainSetUserPassword, /* 2.0.0 */ .connectDomainEventRegisterAny = vzConnectDomainEventRegisterAny, /* 1.2.10 */ .connectDomainEventDeregisterAny = vzConnectDomainEventDeregisterAny, /* 1.2.10 */ .nodeGetCPUMap = vzNodeGetCPUMap, /* 1.2.8 */ -- 2.8.4

2 2

[libvirt] [PATCH v2] vz: get additional error information from job correctly
by Maxim Nestratov 14 Jun '16

14 Jun '16

Function logPrlEventErrorHelper is made void and now it only prints an information (if any) from event. If there is no addition information (i.e. an error returned when asked), we don't rewrite original error code with secondary one. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_sdk.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 99c5d4a..54c56e9 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -99,19 +99,13 @@ logPrlErrorHelper(PRL_RESULT err, const char *filename, } \ } while (0) -static PRL_RESULT +static void logPrlEventErrorHelper(PRL_HANDLE event, const char *filename, const char *funcname, size_t linenr) { - PRL_RESULT ret, retCode; char *msg1 = NULL, *msg2 = NULL; PRL_UINT32 len = 0; - int err = -1; - if ((ret = PrlEvent_GetErrCode(event, &retCode))) { - logPrlError(ret); - return ret; - } PrlEvent_GetErrString(event, PRL_TRUE, PRL_FALSE, NULL, &len); @@ -130,13 +124,9 @@ logPrlEventErrorHelper(PRL_HANDLE event, const char *filename, virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INTERNAL_ERROR, filename, funcname, linenr, _("%s %s"), msg1, msg2); - err = 0; - cleanup: VIR_FREE(msg1); VIR_FREE(msg2); - - return err; } static PRL_RESULT @@ -146,12 +136,12 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, { PRL_RESULT ret, retCode; - if ((ret = PrlJob_Wait(job, timeout))) { + if (PRL_FAILED(ret = PrlJob_Wait(job, timeout))) { logPrlErrorHelper(ret, filename, funcname, linenr); goto cleanup; } - if ((ret = PrlJob_GetRetCode(job, &retCode))) { + if (PRL_FAILED(ret = PrlJob_GetRetCode(job, &retCode))) { logPrlErrorHelper(ret, filename, funcname, linenr); goto cleanup; } @@ -159,17 +149,26 @@ getJobResultHelper(PRL_HANDLE job, unsigned int timeout, PRL_HANDLE *result, if (retCode) { PRL_HANDLE err_handle; + ret = retCode; + /* Sometimes it's possible to get additional error info. */ - if ((ret = PrlJob_GetError(job, &err_handle))) { + if (PRL_FAILED(retCode = PrlJob_GetError(job, &err_handle))) { logPrlErrorHelper(ret, filename, funcname, linenr); + if (PRL_ERR_NO_DATA != retCode) + logPrlError(retCode); goto cleanup; } - if (logPrlEventErrorHelper(err_handle, filename, funcname, linenr)) - logPrlErrorHelper(retCode, filename, funcname, linenr); + if (PRL_FAILED(retCode = PrlEvent_GetErrCode(err_handle, &retCode))) { + logPrlErrorHelper(ret, filename, funcname, linenr); + if (PRL_ERR_NO_DATA != retCode) + logPrlError(retCode); + goto cleanup; + } + + logPrlEventErrorHelper(err_handle, filename, funcname, linenr); PrlHandle_Free(err_handle); - ret = retCode; } else { ret = PrlJob_GetResult(job, result); if (PRL_FAILED(ret)) { -- 2.4.3

2 2

[libvirt] [PATCH] qemu: Obtain job before checking if domain is live
by Martin Kletzander 14 Jun '16

14 Jun '16

Since obtaining a job can wait for another job to finish, the state might change in the meantime. And checking it more than once is pointless. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..e677440c20b2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5388,16 +5388,16 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) goto cleanup; if (flags & VIR_DOMAIN_VCPU_GUEST) { + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("vCPU count provided by the guest agent can only be " "requested for live domains")); - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; @@ -17796,10 +17796,13 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_WAKEUP) && @@ -17808,7 +17811,7 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s", _("Unable to suspend domain due to " "missing system_wakeup monitor command")); - goto cleanup; + goto endjob; } if (vm->def->pm.s3 || vm->def->pm.s4) { @@ -17817,29 +17820,20 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, target == VIR_NODE_SUSPEND_TARGET_HYBRID)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("S3 state is disabled for this domain")); - goto cleanup; + goto endjob; } if (vm->def->pm.s4 == VIR_TRISTATE_BOOL_NO && target == VIR_NODE_SUSPEND_TARGET_DISK) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("S4 state is disabled for this domain")); - goto cleanup; + goto endjob; } } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; - if (!virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is not running")); - goto endjob; - } - qemuDomainObjEnterAgent(vm); ret = qemuAgentSuspend(priv->agent, target); qemuDomainObjExitAgent(vm); @@ -17942,15 +17936,15 @@ qemuDomainQemuAgentCommand(virDomainPtr domain, if (virDomainQemuAgentCommandEnsureACL(domain->conn, vm->def) < 0) goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); - goto cleanup; + goto endjob; } - if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; - if (!qemuDomainAgentAvailable(vm, true)) goto endjob; -- 2.8.4

2 2

[libvirt] Switch to a time based version number rule
by Daniel P. Berrange 14 Jun '16

14 Jun '16

Currently libvirt uses a 3 digit version number, except when it uses a 4 digit version number. We have the following rules - major - no one has any clue about when we should bump this - minor - bump this when some "significant"[*] features appear - micro - bump this on each new release - extra - bump this for stable branch releases [*] for a definition of "significant" that no one knows Now consider our actual requirements - A number that increments on each monthly release - A number that can be incremented for stable branch releases Ok, the micro + extra digits deal with our two actual requirements, so one may ask what is the point of the major + minor digits ? In 11 years of libvirt development we've only bumped the major digit once, and we didn't have any real reason why we chose to the bump the major digit, instead of continuing to bump the minor digit. It just felt like we ought to have a 1.0 release after 7+ years. Our decisions about when to bump the minor digit have not been that much less arbitray. We just look at what features are around and randomly decide if any feel "big enough" to justify a minor digit bump. Way back in the early days of libvirt, we had exactly this kind of mess when deciding /when/ to actually make releases. Sometimes we'd release after a month, sometimes after 3 months, completely arbitrarily based on whether the chances felt "big enough" to justify a release. Feature based release schedules are insanity and so we wised up and adopted the time base release schedule where we release monthly (except over xmas/new year period). I venture to suggest that the reasons for switching from feature to time based release schedules, also apply to version numbers. IOW we should switch to a time based version number change rule, instead of a feature based version number change rule. So what I'm suggesting is that we adopt the following rule - major: bumped for the first release of each year - minor: bumped for every major release - micro: bumped for stable branch releases Rather than wait until next January to adopt this rule, I'd suggest we pretend that it is January now, and thus switch our next version number to be 2.0.0, and jump to 3.0.0 in January 2017. IOW, over the next 2 years we'll do the following releases off master: - Jul 1, 2016 - 2.0.0 - Aug 1, 2016 - 2.1.0 - Sep 1, 2016 - 2.2.0 - Oct 1, 2016 - 2.3.0 - Nov 1, 2016 - 2.4.0 - Dec 1, 2016 - 2.5.0 - Jan 15, 2017 - 3.0.0 - Mar 1, 2017 - 3.1.0 - Apr 1, 2017 - 3.2.0 - May 1, 2017 - 3.3.0 - Jun 1, 2017 - 3.4.0 - Jul 1, 2017 - 3.5.0 - Aug 1, 2017 - 3.6.0 - Sep 1, 2017 - 3.7.0 - Oct 1, 2017 - 3.8.0 - Nov 1, 2017 - 3.9.0 - Dec 1, 2017 - 3.10.0 - Jan 15, 2018 - 4.0.0 - Mar 1, 2018 - 4.1.0 - Apr 1, 2018 - 4.2.0 - .... The stable release branch naming would just use the first major + minor digit in its name.. eg the stable branch for 2.3.0 would use v2.3-maint and do stable releases 2.3.1, 2.3.2, 2.3.3, etc. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

8 16

[libvirt] [PATCH] qemu: Allow ACPI shutdown only for running domains
by Martin Kletzander 14 Jun '16

14 Jun '16

If the domain is not running, but for example the CPUs are stopped, the ACPI event gets queued and resume of the domain will just shut it off. https://bugzilla.redhat.com/show_bug.cgi?id=1216281 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index efb3f854fb10..eb38843c62d8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2042,7 +2042,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; -- 2.8.4

2 1

[libvirt] [PATCH] Bump release to 2.0.0 and document release schedule & versioning
by Daniel P. Berrange 14 Jun '16

14 Jun '16

This bumps the release number of 2.0.0, to reflect the switch to a new time based release versioning scheme. The downloads page is updated to describe our policies for release schedules and release version numbering The stable release docs are changed to reflect the fact that the stable version numbers are now just 3 digits long instead of 4. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- docs/downloads.html.in | 59 ++++++++++++++++++++++++++++++++++++++++++++++---- src/libvirt_lxc.syms | 2 +- 3 files changed, 57 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 827d9db..0114149 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.3.6], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [2.0.0], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) diff --git a/docs/downloads.html.in b/docs/downloads.html.in index 13a6db1..32cc2ec 100644 --- a/docs/downloads.html.in +++ b/docs/downloads.html.in @@ -32,20 +32,71 @@ <li><a href="http://libvirt.org/sources/libvirt-git-snapshot.tar.gz">libvirt.org HTTP server</a></li> </ul> + <h2><a name="schedule">Primary release schedule</a></h2> + + + Libvirt follows a time based plan, with releases made once a month + on the 1st of each month give or take a few days. The only exception + is at the start of the year where there are two 6 weeks gaps, giving + a total of 11 releases a year. Expect to see releases on approx: + + + <ul> + <li>Jan 15th</li> + <li>Mar 1st</li> + <li>Apr 1st</li> + <li>May 1st</li> + <li>Jun 1st</li> + <li>Jul 1st</li> + <li>Aug 1st</li> + <li>Sep 1st</li> + <li>Oct 1st</li> + <li>Nov 1st</li> + <li>Dec 1st</li> + </ul> + + <h2><a name="numbering">Release numbering</a></h2> + + + Since libvirt 2.0.0, a time based version numbering rule + is applied. As such, the changes in version number have + do not have any implications wrt the scope of features + or bugfixes included, the stability of the code, or the + API / ABI compatibility (libvirt API / ABI is guaranteed + stable forever). The rules applied for changing the libvirt + version number are: + + + <ul> + <li><code>major</code> - incremented by 1 for the first release of the year (the Jan 15th release)</li> + <li><code>minor</code> - incremented by 1 for each monthly release from git master</li> + <li><code>micro</code> - always 0 for releases from git master, incremented by 1 for each stable maintenance release</li> + </ul> + + + Prior to to 2.0.0 the major/minor numbers were incremented + fairly arbitrarily, and maintenance releases appended a + fourth digit. + + <h2><a name="maintenance">Maintenance releases</a></h2> In the git repository are several stable maintenance branches, matching the - pattern <code>vmajor.minor.micro-maint</code>; + pattern <code>vmajor.minor-maint</code>; these branches are forked off the corresponding - <code>vmajor.minor.micro</code> formal + <code>vmajor.minor.0</code> formal release, and may have further releases of the - form <code>vmajor.minor.micro.rel</code>. + form <code>vmajor.minor.micro</code>. These maintenance branches should only contain bug fixes, and no new features, backported from the master branch, and are supported as long as at least one downstream distribution expresses interest in a given branch. These maintenance - branches are considered during CVE analysis. + branches are considered during CVE analysis. In contrast + to the primary releases which are made once a month, there + is no formal schedule for the maintenance releases, which + are made whenever there is a need to make available key + bugfixes to downstream consumers. diff --git a/src/libvirt_lxc.syms b/src/libvirt_lxc.syms index 56c24c0..9b418ee 100644 --- a/src/libvirt_lxc.syms +++ b/src/libvirt_lxc.syms @@ -21,7 +21,7 @@ LIBVIRT_LXC_1.0.4 { virDomainLxcEnterSecurityLabel; } LIBVIRT_LXC_1.0.2; -LIBVIRT_LXC_1.3.6 { +LIBVIRT_LXC_2.0.0 { global: virDomainLxcEnterCGroup; } LIBVIRT_LXC_1.0.4; -- 2.5.5

5 6

[libvirt] [PATCH] cputest: Get rid of the array of test functions
by Jiri Denemark 14 Jun '16

14 Jun '16

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/cputest.c | 134 +++++++++++++++++++++----------------------------------- 1 file changed, 51 insertions(+), 83 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index f68a3ec..0175d01 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -54,31 +54,9 @@ enum cpuTestBoolWithError { YES = 1 }; -enum api { - API_COMPARE, - API_GUEST_DATA, - API_BASELINE, - API_UPDATE, - API_HAS_FEATURE, - API_HOST_CPUID, - API_GUEST_CPUID, - API_JSON_CPUID, -}; - -static const char *apis[] = { - "compare", - "guest data", - "baseline", - "update", - "has feature", - "host CPUID", - "guest CPUID", - "json CPUID", -}; struct data { const char *arch; - enum api api; const char *host; const char *name; const char **models; @@ -475,7 +453,7 @@ cpuTestHasFeature(const void *arg) static int -cpuTestCPUID(const void *arg) +cpuTestCPUID(bool guest, const void *arg) { const struct data *data = arg; int ret = -1; @@ -497,7 +475,7 @@ cpuTestCPUID(const void *arg) goto cleanup; cpu->arch = hostData->arch; - if (data->api == API_GUEST_CPUID) { + if (guest) { cpu->type = VIR_CPU_TYPE_GUEST; cpu->match = VIR_CPU_MATCH_EXACT; cpu->fallback = VIR_CPU_FALLBACK_FORBID; @@ -510,7 +488,7 @@ cpuTestCPUID(const void *arg) if (virAsprintf(&result, "cpuid-%s-%s", data->host, - data->api == API_HOST_CPUID ? "host" : "guest") < 0) + guest ? "guest" : "host") < 0) goto cleanup; ret = cpuTestCompareXML(data->arch, cpu, result, false); @@ -525,6 +503,20 @@ cpuTestCPUID(const void *arg) } +static int +cpuTestHostCPUID(const void *arg) +{ + return cpuTestCPUID(false, arg); +} + + +static int +cpuTestGuestCPUID(const void *arg) +{ + return cpuTestCPUID(true, arg); +} + + #if WITH_QEMU && WITH_YAJL static int cpuTestJSONCPUID(const void *arg) @@ -573,52 +565,6 @@ cpuTestJSONCPUID(const void *arg) #endif -static int (*cpuTest[])(const void *) = { - cpuTestCompare, - cpuTestGuestData, - cpuTestBaseline, - cpuTestUpdate, - cpuTestHasFeature, - cpuTestCPUID, - cpuTestCPUID, -#if WITH_QEMU && WITH_YAJL - cpuTestJSONCPUID, -#else - NULL, -#endif -}; - - -static int -cpuTestRun(const char *name, const struct data *data) -{ - char *label = NULL; - char *tmp; - - if (virAsprintf(&label, "CPU %s(%s): %s", apis[data->api], data->arch, name) < 0) - return -1; - - tmp = virTestLogContentAndReset(); - VIR_FREE(tmp); - - if (virTestRun(label, cpuTest[data->api], data) < 0) { - if (virTestGetDebug()) { - char *log; - if ((log = virTestLogContentAndReset()) && - strlen(log) > 0) - VIR_TEST_DEBUG("\n%s\n", log); - VIR_FREE(log); - } - - VIR_FREE(label); - return -1; - } - - VIR_FREE(label); - return 0; -} - - static const char *model486[] = { "486" }; static const char *nomodel[] = { "nomodel" }; static const char *models[] = { "qemu64", "core2duo", "Nehalem" }; @@ -640,23 +586,45 @@ mymain(void) #define DO_TEST(arch, api, name, host, cpu, \ models, nmodels, preferred, flags, result) \ do { \ - static struct data data = { \ - arch, api, host, cpu, models, \ + struct data data = { \ + arch, host, cpu, models, \ models == NULL ? NULL : #models, \ nmodels, preferred, flags, result \ }; \ - if (cpuTestRun(name, &data) < 0) \ + char *testLabel; \ + char *tmp; \ + \ + tmp = virTestLogContentAndReset(); \ + VIR_FREE(tmp); \ + \ + if (virAsprintf(&testLabel, "%s(%s): %s", \ + #api, arch, name) < 0) { \ ret = -1; \ + break; \ + } \ + \ + if (virTestRun(testLabel, api, &data) < 0) { \ + if (virTestGetDebug()) { \ + char *log; \ + if ((log = virTestLogContentAndReset()) && \ + strlen(log) > 0) \ + VIR_TEST_DEBUG("\n%s\n", log); \ + VIR_FREE(log); \ + } \ + ret = -1; \ + } \ + \ + VIR_FREE(testLabel); \ } while (0) #define DO_TEST_COMPARE(arch, host, cpu, result) \ - DO_TEST(arch, API_COMPARE, \ + DO_TEST(arch, cpuTestCompare, \ host "/" cpu " (" #result ")", \ host, cpu, NULL, 0, NULL, 0, result) #define DO_TEST_UPDATE(arch, host, cpu, result) \ do { \ - DO_TEST(arch, API_UPDATE, \ + DO_TEST(arch, cpuTestUpdate, \ cpu " on " host, \ host, cpu, NULL, 0, NULL, 0, 0); \ DO_TEST_COMPARE(arch, host, host "+" cpu, result); \ @@ -673,19 +641,19 @@ mymain(void) if (virAsprintf(&label, "%s%s", name, suffix) < 0) { \ ret = -1; \ } else { \ - DO_TEST(arch, API_BASELINE, label, NULL, "baseline-" name, \ - NULL, 0, NULL, flags, result); \ + DO_TEST(arch, cpuTestBaseline, label, NULL, \ + "baseline-" name, NULL, 0, NULL, flags, result); \ } \ VIR_FREE(label); \ } while (0) #define DO_TEST_HASFEATURE(arch, host, feature, result) \ - DO_TEST(arch, API_HAS_FEATURE, \ + DO_TEST(arch, cpuTestHasFeature, \ host "/" feature " (" #result ")", \ host, feature, NULL, 0, NULL, 0, result) #define DO_TEST_GUESTDATA(arch, host, cpu, models, preferred, result) \ - DO_TEST(arch, API_GUEST_DATA, \ + DO_TEST(arch, cpuTestGuestData, \ host "/" cpu " (" #models ", pref=" #preferred ")", \ host, cpu, models, \ models == NULL ? 0 : sizeof(models) / sizeof(char *), \ @@ -695,7 +663,7 @@ mymain(void) # define DO_TEST_CPUID_JSON(arch, host, json) \ do { \ if (json) { \ - DO_TEST(arch, API_JSON_CPUID, host, host, \ + DO_TEST(arch, cpuTestJSONCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ } \ } while (0) @@ -705,9 +673,9 @@ mymain(void) #define DO_TEST_CPUID(arch, host, json) \ do { \ - DO_TEST(arch, API_HOST_CPUID, host, host, \ + DO_TEST(arch, cpuTestHostCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ - DO_TEST(arch, API_GUEST_CPUID, host, host, \ + DO_TEST(arch, cpuTestGuestCPUID, host, host, \ NULL, NULL, 0, NULL, 0, 0); \ DO_TEST_CPUID_JSON(arch, host, json); \ } while (0) -- 2.8.4

2 1

[libvirt] [PATCH] Fix build without xen
by Martin Kletzander 14 Jun '16

14 Jun '16

Commit 11567cf66f36 introduced an include which will only work when building with xen (particularly libxl). However, that file is supposed to be includable from anywhere (as with other testutils* files. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Pushed under the build-breaker rule. tests/testutilsxen.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h index 8b997c32325c..2facf5e5afa5 100644 --- a/tests/testutilsxen.h +++ b/tests/testutilsxen.h @@ -2,7 +2,9 @@ # define _TESTUTILSXEN_H_ # include "capabilities.h" -# include "libxl/libxl_capabilities.h" +# ifdef WITH_LIBXL +# include "libxl/libxl_capabilities.h" +# endif virCapsPtr testXenCapsInit(void); -- 2.8.4

1 0

[libvirt] [PATCH] virt-host-validate: fix build with clang
by Roman Bogorodskiy 14 Jun '16

14 Jun '16

Building with clang 3.8 triggers the following error: CC virt_host_validate-virt-host-validate-qemu.o virt-host-validate-qemu.c:36:11: error: initializing 'char *' with an expression of type 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] char *kvmhint = _("Check that CPU and firmware supports virtualization " ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ virt-host-validate-qemu.c:46:17: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] kvmhint = _("Check that the 'kvm-intel' or 'kvm-amd' modules are " ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 2 errors generated. Fix by using 'const' for kvmhint declaration. --- Pushed under the build-breaker rule. tools/virt-host-validate-qemu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index 66377e1..2aa396e 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -33,8 +33,8 @@ int virHostValidateQEMU(void) int ret = 0; bool hasHwVirt = false; bool hasVirtFlag = false; - char *kvmhint = _("Check that CPU and firmware supports virtualization " - "and kvm module is loaded"); + const char *kvmhint = _("Check that CPU and firmware supports virtualization " + "and kvm module is loaded"); if (!(flags = virHostValidateGetCPUFlags())) return -1; -- 2.7.4

1 0

[libvirt] [PATCH v5 0/2] Add support for zero-write detection
by Martin Kletzander 13 Jun '16

13 Jun '16

v5: - Reword documentation - Use detect_zeroes=on if it is unmap but discard=ignore - Use detect-zeroes on qemu cmdline instead of detect_zeroes v4: - Changed docs per Peter's review - https://www.redhat.com/archives/libvir-list/2016-June/msg00113.html v3: - I know Peter said he'll review it, but there are conflicts every once in a while, so rebased version will apply cleanly for a while - And it's actually not that big of a change to wait for some bigger things to be designed, I believe =) - https://www.redhat.com/archives/libvir-list/2016-April/msg01926.html v2: - use 'zeroes' instead of 'zeros' - https://www.redhat.com/archives/libvir-list/2016-February/msg01146.html v1: - https://www.redhat.com/archives/libvir-list/2015-December/msg00511.html Martin Kletzander (2): conf: Add support of zero-detection for disks qemu: Add support for zero-detection writes docs/formatdomain.html.in | 12 ++++++ docs/schemas/domaincommon.rng | 12 ++++++ src/conf/domain_conf.c | 19 ++++++++- src/conf/domain_conf.h | 11 ++++++ src/libvirt_private.syms | 2 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 24 ++++++++++++ tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 + .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml | 1 + tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 + .../qemuxml2argv-disk-drive-detect-zeroes.args | 27 +++++++++++++ .../qemuxml2argv-disk-drive-detect-zeroes.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 3 ++ .../qemuxml2xmlout-disk-drive-detect-zeroes.xml | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 166 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.xml create mode 120000 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-detect-zeroes.xml -- 2.8.3

2 3

[libvirt] [ruby-libvirt 1/2] Add .gitignore
by Guido Günther 13 Jun '16

13 Jun '16

--- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f033dcf --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +ext/libvirt/extconf.h +ext/libvirt/_libvirt.so +ext/libvirt/Makefile +ext/libvirt/mkmf.log +*.o +*~ -- 2.8.1

2 2