- Devel - libvirt List Archives

[libvirt] [PATCHv2 0/7] saner readdir usage
by Eric Blake 29 Apr '14

29 Apr '14

This extends the work started by Nataneal to cover the entire tree. Basically, readdir() is awkward to use correctly: to properly check for (unlikely) errors, one must pre-set errno. Forcing everything to go through a wrapper ensures that all our uses will be consistent; this also fixes several bugs in some of the call sites. Eric Blake (5): conf: use virDirRead API util: use virDirRead API drivers: use virDirRead API storage: use virDirRead API enforce sane readdir usage Natanael Copa (2): util: introduce virDirRead wrapper for readdir nodeinfo: use virDirRead API cfg.mk | 6 +++ src/conf/domain_conf.c | 5 ++- src/conf/network_conf.c | 11 +++--- src/conf/nwfilter_conf.c | 6 +-- src/conf/storage_conf.c | 6 +-- src/libvirt_private.syms | 1 + src/nodeinfo.c | 31 +++++---------- src/openvz/openvz_conf.c | 9 +---- src/parallels/parallels_storage.c | 11 ++++-- src/qemu/qemu_driver.c | 5 ++- src/qemu/qemu_hostdev.c | 7 ++-- src/secret/secret_driver.c | 6 +-- src/storage/storage_backend.c | 8 ++-- src/storage/storage_backend_fs.c | 6 ++- src/storage/storage_backend_iscsi.c | 5 ++- src/storage/storage_backend_scsi.c | 10 +++-- src/util/vircgroup.c | 28 ++++++++------ src/util/virfile.c | 76 +++++++++++++++++++++++-------------- src/util/virfile.h | 4 ++ src/util/virnetdevtap.c | 10 +---- src/util/virpci.c | 20 +++++----- src/util/virscsi.c | 9 +++-- src/util/virusb.c | 7 +++- src/util/virutil.c | 4 +- src/xen/xen_inotify.c | 7 +++- src/xen/xm_internal.c | 3 +- 26 files changed, 170 insertions(+), 131 deletions(-) -- 1.9.0

3 14

[libvirt] [PATCH] xen: ensure /usr/sbin/xend exists before checking status
by Jim Fehlig 28 Apr '14

28 Apr '14

With xend on the way out, installations may not even have /usr/sbin/xend, which results in the following error when the drivers are probed 2014-04-28 18:21:19.271+0000: 22129: error : virCommandWait:2426 : internal error: Child process (/usr/sbin/xend status) unexpected exit status 127: libvirt: error : cannot execute binary /usr/sbin/xend: No such file or directory Check for existence of /usr/sbin/xend before trying to run it with the 'status' option. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 19 ++++++++++++------- src/xen/xen_driver.c | 13 ++++++++----- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e5ed0f2..8ee61c7 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -223,7 +223,6 @@ static bool libxlDriverShouldLoad(bool privileged) { bool ret = false; - virCommandPtr cmd; int status; char *output = NULL; @@ -236,7 +235,7 @@ libxlDriverShouldLoad(bool privileged) if (!virFileExists(HYPERVISOR_CAPABILITIES)) { VIR_INFO("Disabling driver as " HYPERVISOR_CAPABILITIES " does not exist"); - return false; + return ret; } /* * Don't load if not running on a Xen control domain (dom0). It is not @@ -256,14 +255,20 @@ libxlDriverShouldLoad(bool privileged) } /* Don't load if legacy xen toolstack (xend) is in use */ - cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); - if (virCommandRun(cmd, &status) == 0 && status == 0) { - VIR_INFO("Legacy xen tool stack seems to be in use, disabling " - "libxenlight driver."); + if (virFileExists("/usr/sbin/xend")) { + virCommandPtr cmd; + + cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); + if (virCommandRun(cmd, &status) == 0 && status == 0) { + VIR_INFO("Legacy xen tool stack seems to be in use, disabling " + "libxenlight driver."); + } else { + ret = true; + } + virCommandFree(cmd); } else { ret = true; } - virCommandFree(cmd); return ret; } diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 2ffb06b..bd51909 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -315,13 +315,16 @@ xenUnifiedProbe(void) static bool xenUnifiedXendProbe(void) { - virCommandPtr cmd; bool ret = false; - cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); - if (virCommandRun(cmd, NULL) == 0) - ret = true; - virCommandFree(cmd); + if (virFileExists("/usr/sbin/xend")) { + virCommandPtr cmd; + + cmd = virCommandNewArgList("/usr/sbin/xend", "status", NULL); + if (virCommandRun(cmd, NULL) == 0) + ret = true; + virCommandFree(cmd); + } return ret; } -- 1.8.1.4

2 2

[libvirt] [PATCH] tests: remove hostdevmgr directory on cleanup
by Martin Kletzander 28 Apr '14

28 Apr '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/virhostdevtest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 089014e..de4cdde 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -65,6 +65,9 @@ myCleanup(void) } if (mgr) { + if (mgr->stateDir && !getenv("LIBVIRT_SKIP_CLEANUP")) + virFileDeleteTree(mgr->stateDir); + virObjectUnref(mgr->activePCIHostdevs); virObjectUnref(mgr->inactivePCIHostdevs); virObjectUnref(mgr->activeUSBHostdevs); -- 1.9.2

2 1

[libvirt] [RFC PATCH v2 0/3] qemu: RDMA live migration support
by mrhines＠linux.vnet.ibm.com 28 Apr '14

28 Apr '14

From: "Michael R. Hines" <mrhines(a)us.ibm.com> Changes since v1: 1. This series uses 'rdma' instead of 'x-rdma', even though QEMU has has not yet renamed URI for live migraiton yet, but this series is just an RFC, so at least we can get some agreement. 2. We've fixed the job stats to be in the right place instead of breaking the hard-coded api. Michael R. Hines (3): qemu: Expose additional timing metrics for 'setup' and 'mbps' qemu: RDMA migration support using 'rdma' URI qemu: memory pre-pinning support for RDMA migration include/libvirt/libvirt.h.in | 16 ++++ src/qemu/qemu_capabilities.c | 13 ++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 ++ src/qemu/qemu_driver.c | 14 ++++ src/qemu/qemu_migration.c | 174 +++++++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 5 +- src/qemu/qemu_monitor.h | 14 ++++ src/qemu/qemu_monitor_json.c | 8 ++ src/util/viruri.c | 7 +- tools/virsh-domain.c | 7 ++ 12 files changed, 244 insertions(+), 26 deletions(-) -- 1.8.1.2

6 19

[libvirt] [PATCH] Disable libvirtd by default when building on Win32
by Daniel P. Berrange 28 Apr '14

28 Apr '14

We don't support building libvirtd on Win32 since we lack the fork/exec feature needed for the stateful drivers. Disable this by default, so users can just do 'mingw32-configure' with no special args required. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- autobuild.sh | 6 ++---- configure.ac | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index f682b51..4d9f616 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -85,8 +85,7 @@ if test -x /usr/bin/i686-w64-mingw32-gcc ; then --host=i686-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ --enable-expensive-tests \ - --enable-werror \ - --without-libvirtd + --enable-werror make make install @@ -105,8 +104,7 @@ if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then --host=x86_64-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ --enable-expensive-tests \ - --enable-werror \ - --without-libvirtd + --enable-werror make make install diff --git a/configure.ac b/configure.ac index ea85851..3371b46 100644 --- a/configure.ac +++ b/configure.ac @@ -175,6 +175,7 @@ case $host in *-*-linux*) with_linux=yes ;; *-*-darwin*) with_osx=yes ;; *-*-freebsd*) with_freebsd=yes ;; + *-*-mingw* | *-*-msvc* ) with_win=yes ;; esac if test $with_linux = no; then @@ -194,6 +195,11 @@ fi AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) +# We don't support the daemon yet +if test "$with_win" = "yes" ; then + with_libvirtd=no +fi + # The daemon requires remote support. Likewise, if we are not using # RPC, we don't need several libraries. if test "$with_remote" = "no" ; then -- 1.9.0

2 1

[libvirt] [PATCH v2] Don't use SO_REUSEADDR on Win32 platforms
by Daniel P. Berrange 28 Apr '14

28 Apr '14

SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT on Linux/BSD. ie it allows 2 apps to listen to the same port at once. Thus we must not set it on Win32 platforms See http://msdn.microsoft.com/en-us/library/windows/desktop/ms740621.aspx Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_private.syms | 1 + src/rpc/virnetsocket.c | 7 ++----- src/util/virportallocator.c | 4 +--- src/util/virutil.c | 23 +++++++++++++++++++++++ src/util/virutil.h | 1 + 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 5788468..ee2f57b 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2059,6 +2059,7 @@ virSetCloseExec; virSetDeviceUnprivSGIO; virSetInherit; virSetNonBlock; +virSetSockReuseAddr; virSetUIDGID; virSetUIDGIDWithCaps; virStrIsPrint; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2e94a6c..a7e1783 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -255,8 +255,7 @@ int virNetSocketNewListenTCP(const char *nodename, goto error; } - int opt = 1; - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + if (virSetSockReuseAddr(fd) < 0) { virReportSystemError(errno, "%s", _("Unable to enable port reuse")); goto error; } @@ -460,15 +459,13 @@ int virNetSocketNewConnectTCP(const char *nodename, runp = ai; while (runp) { - int opt = 1; - if ((fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol)) < 0) { virReportSystemError(errno, "%s", _("Unable to create socket")); goto error; } - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + if (virSetSockReuseAddr(fd) < 0) { VIR_WARN("Unable to enable port reuse"); } diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index ed7bdc2..b68133a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -116,7 +116,6 @@ static int virPortAllocatorBindToPort(bool *used, struct sockaddr* addr; size_t addrlen; int v6only = 1; - int reuse = 1; int ret = -1; int fd = -1; bool ipv6 = false; @@ -143,8 +142,7 @@ static int virPortAllocatorBindToPort(bool *used, goto cleanup; } - if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&reuse, - sizeof(reuse)) < 0) { + if (virSetSockReuseAddr(fd) < 0) { virReportSystemError(errno, "%s", _("Unable to set socket reuse addr flag")); goto cleanup; diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..65b10b8 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -136,6 +136,29 @@ int virSetCloseExec(int fd) return virSetInherit(fd, false); } +#ifdef WIN32 +int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED) +{ + /* + * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT + * on Linux/BSD. ie it allows 2 apps to listen to the same + * port at once which is certainly not what we want here. + * + * Win32 sockets have Linux/BSD-like SO_REUSEADDR behaviour + * by default, so we can be a no-op. + * + * http://msdn.microsoft.com/en-us/library/windows/desktop/ms740621.aspx + */ + return 0; +} +#else +int virSetSockReuseAddr(int fd) +{ + int opt = 1; + return setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); +#endif +} + int virPipeReadUntilEOF(int outfd, int errfd, char **outbuf, char **errbuf) { diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..2bb74e2 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -42,6 +42,7 @@ int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; int virSetInherit(int fd, bool inherit) ATTRIBUTE_RETURN_CHECK; int virSetCloseExec(int fd) ATTRIBUTE_RETURN_CHECK; +int virSetSockReuseAddr(int fd) ATTRIBUTE_RETURN_CHECK; int virPipeReadUntilEOF(int outfd, int errfd, char **outbuf, char **errbuf); -- 1.9.0

2 2

[libvirt] [PATCH] Remove bogus ATTRIBUTE_NONNULL from virFirewallAddRuleFull
by Daniel P. Berrange 28 Apr '14

28 Apr '14

The virFirewallAddRuleFull method originally had a single compulsory virFirewallQueryCallback parameter. During dev work though the ignoreErrors parameter was added and the callback parameter made optional. The ATTRIBUTE_NONNULL annotation was never removed though. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virfirewall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index 5ca66fa..1129219 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -59,7 +59,7 @@ virFirewallRulePtr virFirewallAddRuleFull(virFirewallPtr firewall, virFirewallQueryCallback cb, void *opaque, ...) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_SENTINEL; + ATTRIBUTE_SENTINEL; void virFirewallRemoveRule(virFirewallPtr firewall, virFirewallRulePtr rule); -- 1.9.0

2 1

[libvirt] [PATCH] Recheck disk backing chains after snapshot
by Jiri Denemark 28 Apr '14

28 Apr '14

When a snapshot operation finishes we have to recheck the backing chain of all disks involved in the snapshot. And we need to do that even if the operation failed because some of the disks might have changed if QEMU did not support transactions. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Notes: - BlockRebase and BlockCommit already recheck the backing chain when we get an event about a completed block job (in qemuProcessHandleBlockJob) src/qemu/qemu_driver.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67ba487..492fcc1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12942,6 +12942,7 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, bool persist = false; bool reuse = (flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); + virErrorPtr orig_err = NULL; if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_OPERATION_INVALID, @@ -13033,6 +13034,17 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver, } cleanup: + /* recheck backing chains of all disks involved in the snapshot */ + orig_err = virSaveLastError(); + for (i = 0; i < snap->def->ndisks; i++) { + if (snap->def->disks[i].snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) + continue; + qemuDomainDetermineDiskChain(driver, vm, vm->def->disks[i], true); + } + if (orig_err) { + virSetError(orig_err); + virFreeError(orig_err); + } if (ret == 0 || !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_TRANSACTION)) { if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0 || -- 1.9.2

3 3

[libvirt] [PATCH v2] libxl: Support PV consoles
by Ian Campbell 28 Apr '14

28 Apr '14

Currently the driver only exposes the ability to connect to the serial console of a Xen guest, which doesn't work for a PV guest. Since for an HVM guest the serial devices are duplicated as consoles it is sufficient to just use the console devices unconditionally. Tested with the following bit of config XML: <domain type='xen'> ... <devices> <console type='pty'> <target type='xen'/> </console> </devices> </domain> I have observed and tested this on ARM but I believe it also applies to x86 PV guests. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Clark Laughlin <clark.laughlin(a)linaro.org> --- v2: Just use nconsoles unconditionally, they contain serial too --- src/libxl/libxl_driver.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a6ae8a1..535e7da 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3780,6 +3780,7 @@ libxlDomainOpenConsole(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; + libxl_console_type console_type = LIBXL_CONSOLE_TYPE_UNKNOWN; virDomainChrDefPtr chr = NULL; libxlDomainObjPrivatePtr priv; char *console = NULL; @@ -3807,8 +3808,8 @@ libxlDomainOpenConsole(virDomainPtr dom, priv = vm->privateData; - if (vm->def->nserials) - chr = vm->def->serials[0]; + if (vm->def->nconsoles) + chr = vm->def->consoles[0]; if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3824,7 +3825,12 @@ libxlDomainOpenConsole(virDomainPtr dom, goto cleanup; } - ret = libxl_primary_console_get_tty(priv->ctx, vm->def->id, &console); + console_type = + (chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL ? + LIBXL_CONSOLE_TYPE_SERIAL : LIBXL_CONSOLE_TYPE_PV); + + ret = libxl_console_get_tty(priv->ctx, vm->def->id, chr->target.port, + console_type, &console); if (ret) goto cleanup; -- 1.7.10.4

5 10

[libvirt] [PATCH] add flag to enforce hugepage backing of guest RAM
by Marcelo Tosatti 27 Apr '14

27 Apr '14

Add an element named "strict-hugepages" to control whether to refuse guest initialization in case hugepage allocation cannot be performed. Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index ff50214..e79f5e6 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -632,6 +632,9 @@ <dt><code>hugepages</code></dt> <dd>This tells the hypervisor that the guest should have its memory allocated using hugepages instead of the normal native page size.</dd> + <dt><code>strict-hugepages</code></dt> + <dd>This tells the hypervisor that the guest should refuse to start + in case of failure to allocate guest memory with hugepages</dd> <dt><code>nosharepages</code></dt> <dd>Instructs hypervisor to disable shared pages (memory merge, KSM) for this domain. <span class="since">Since 1.0.6</span></dd> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 28e24f9..f16ef0b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11226,6 +11226,9 @@ virDomainDefParseXML(xmlDocPtr xml, if (virXPathBoolean("boolean(./memoryBacking/locked)", ctxt)) def->mem.locked = true; + if ((node = virXPathNode("./memoryBacking/stricthugepages", ctxt))) + def->mem.strict_hugepages = true; + /* Extract blkio cgroup tunables */ if (virXPathUInt("string(./blkiotune/weight)", ctxt, &def->blkio.weight) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d8f2e49..8ea5cf0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1977,6 +1977,7 @@ struct _virDomainDef { unsigned long long max_balloon; /* in kibibytes */ unsigned long long cur_balloon; /* in kibibytes */ bool hugepage_backed; + bool strict_hugepages; bool nosharepages; bool locked; int dump_core; /* enum virDomainMemDump */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 96b8825..3f8d0a4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -12133,10 +12133,9 @@ cleanup: return def; } - -static int qemuParseProcFileStrings(int pid_value, - const char *name, - char ***list) +int qemuParseProcFileStrings(int pid_value, + const char *name, + char ***list) { char *path = NULL; int ret = -1; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index de7683d..bcdfefa 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -226,7 +226,9 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps, char **pidfile, virDomainChrSourceDefPtr *monConfig, bool *monJSON); - +int qemuParseProcFileStrings(int pid_value, + const char *name, + char ***list); int qemuDomainAssignAddresses(virDomainDefPtr def, virQEMUCapsPtr qemuCaps, virDomainObjPtr obj) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8bcd98e..cb8298e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <signal.h> #include <sys/stat.h> +#include <stdlib.h> #if defined(__linux__) # include <linux/capability.h> #elif defined(__FreeBSD__) @@ -3507,6 +3508,95 @@ error: } +/* + * Returns bool: whether to fail guest initialization. + * + */ +static bool qemuValidateStrictHugepage(virDomainObjPtr vm, virQEMUDriverConfigPtr cfg) +{ + bool ret = false; + char **maps = NULL; + int i; + char *buf; + + if (!vm->def->mem.strict_hugepages) + return ret; + + ret = true; + + if (!vm->def->mem.hugepage_backed || !cfg->hugepagePath) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("strict huge pages depends on huge pages")); + return ret; + } + + buf = malloc(strlen(cfg->hugepagePath) + 50); + + /* The parser requires /proc/pid, which only exists on platforms + * like Linux where pid_t fits in int. */ + if ((int) vm->pid != vm->pid || + qemuParseProcFileStrings(vm->pid, "maps", &maps) < 0) + goto cleanup; + + for (i = 0; maps && maps[i]; i++) { + char *endptr; + unsigned long start, end; + const char *map = maps[i]; + bool found = false; + + sprintf(buf, "%s/qemu_back_mem.pc.ram.", cfg->hugepagePath); + if (strstr(map,buf) != NULL) + found = true; + + sprintf(buf, "%s/kvm.", cfg->hugepagePath); + if (strstr(map,buf) != NULL) + found = true; + + if (!found) + continue; + + errno = 0; + start = strtol(map, &endptr, 16); + if ((errno == ERANGE && (start == LONG_MAX || start == LONG_MIN)) + || (errno != 0 && start == 0)) { + continue; + } + + if (endptr && *endptr == '-') + endptr++; + + if (!*endptr) + continue; + + errno = 0; + end = strtol(endptr, NULL, 16); + if ((errno == ERANGE && (end == LONG_MAX || end == LONG_MIN)) + || (errno != 0 && end == 0)) { + continue; + } + + if (end-start >= vm->def->mem.max_balloon * 1024) { + ret = false; + break; + } + } + + if (ret) { + /* FIXME: is VIR_ERR_NO_MEMORY to be used exclusively + * to reference libvirt allocation failures? + */ + virReportError(VIR_ERR_NO_MEMORY, "%s", + _("guest memory not hugetlbfs backed")); + } + +cleanup: + for (i = 0; maps && maps[i]; i++) + VIR_FREE(maps[i]); + free(buf); + return ret; +} + + static bool qemuValidateCpuMax(virDomainDefPtr def, virQEMUCapsPtr qemuCaps) { @@ -4071,6 +4161,13 @@ int qemuProcessStart(virConnectPtr conn, goto cleanup; } + /* enforce strict hugepage */ + if (qemuValidateStrictHugepage(vm, cfg)) { + VIR_WARN("Failure to allocate hugepage backing for %s, exiting", + vm->def->name); + goto cleanup; + } + /* set default link states */ /* qemu doesn't support setting this on the command line, so * enter the monitor */

4 21

[libvirt] [PATCH] build: -avoid-version on libvirt_driver_nwfilter
by Dwight Engen 27 Apr '14

27 Apr '14

This fixes the following make rpm warning: warning: Installed (but unpackaged) file(s) found: /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so.0 /usr/lib64/libvirt/connection-driver/libvirt_driver_nwfilter.so.0.0.0 Signed-off-by: Dwight Engen <dwight.engen(a)oracle.com> --- src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index dd0abe7..e9dc9e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1543,6 +1543,7 @@ libvirt_driver_nwfilter_la_SOURCES = libvirt_driver_nwfilter_la_LIBADD = libvirt_driver_nwfilter_impl.la if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_nwfilter.la +libvirt_driver_nwfilter_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) else ! WITH_DRIVER_MODULES noinst_LTLIBRARIES += libvirt_driver_nwfilter.la # Stateful, so linked to daemon instead -- 1.9.0

2 1

[libvirt] [PATCHv2 0/4] network: fix active status & usage of inactive networks
by Laine Stump 25 Apr '14

25 Apr '14

The original patch series is here: https://www.redhat.com/archives/libvir-list/2014-April/msg00454.html This repost addresses problems pointed out by John Ferlan in his review (and other things that I thought better of during the revisions). All 4 patches are required to address https://bugzilla.redhat.com/show_bug.cgi?id=880483 The reported problem is that an interface using a currently-inactive macvtap/hostdev network can be attached to a domain (addressed by 4/4). In order to make fixing that problem less, well, problematic, the automatic inactivation of all macvtap/hostdev networks any time libvirtd is restart must be addressed, and that is done in 1/4-3/4. Part of fixing the latter problem is changing the network driver to use /var/run for its status XML rather than /var/lib (2/4), which could cause problems during upgrade (also addressed in 2/4) and in a more limited sense downgrade (see the comments in 2/4 for why I decided to not address those problems). Laine Stump (4): network: create statedir during driver initialization network: change location of network state xml files network: set macvtap/hostdev networks active if their state file exists network: centralize check for active network during interface attach src/conf/network_conf.c | 1 + src/lxc/lxc_driver.c | 21 +---- src/lxc/lxc_process.c | 18 +---- src/network/bridge_driver.c | 189 ++++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_command.c | 18 +---- src/qemu/qemu_hotplug.c | 11 +-- 6 files changed, 166 insertions(+), 92 deletions(-) -- 1.9.0

3 15

[libvirt] [PATCH 0/3] Use virFileFindResource for libvirtd/virtlockd autostart
by Daniel P. Berrange 25 Apr '14

25 Apr '14

This small series converts the two places where we autostart libvirtd/virtlockd over to use virFileFindResource so that ./tools/virsh -c qemu:///session will use the daemons from the source tree instead of /usr/sbin Daniel P. Berrange (3): Use virFileFindResource to locate libvirtd daemon Use virFileFindResource to locate virtlockd daemon Make autostart of virtlockd actually work src/locking/lock_daemon.c | 20 +++++++++++++++++++ src/locking/lock_driver_lockd.c | 25 +++++++---------------- src/remote/remote_driver.c | 44 ++++++----------------------------------- 3 files changed, 33 insertions(+), 56 deletions(-) -- 1.9.0

2 10

[libvirt] [PATCH] Don't use SO_REUSEADDR on Win32 platforms
by Daniel P. Berrange 25 Apr '14

25 Apr '14

SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT on Linux/BSD. ie it allows 2 apps to listen to the same port at once. Thus we must not set it on Win32 platforms See http://msdn.microsoft.com/en-us/library/windows/desktop/ms740621.aspx Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 16 ++++++++++++++++ src/util/virportallocator.c | 9 +++++++++ 2 files changed, 25 insertions(+) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2e94a6c..65efdb6 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -255,11 +255,18 @@ int virNetSocketNewListenTCP(const char *nodename, goto error; } +#ifndef WIN32 + /* + * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT + * on Linux/BSD. ie it allows 2 apps to listen to the same + * port at once. Thus we must not set it on Win32 platforms + */ int opt = 1; if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { virReportSystemError(errno, "%s", _("Unable to enable port reuse")); goto error; } +#endif #ifdef IPV6_V6ONLY if (runp->ai_family == PF_INET6) { @@ -460,7 +467,9 @@ int virNetSocketNewConnectTCP(const char *nodename, runp = ai; while (runp) { +#ifndef WIN32 int opt = 1; +#endif if ((fd = socket(runp->ai_family, runp->ai_socktype, runp->ai_protocol)) < 0) { @@ -468,9 +477,16 @@ int virNetSocketNewConnectTCP(const char *nodename, goto error; } +#ifndef WIN32 + /* + * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT + * on Linux/BSD. ie it allows 2 apps to listen to the same + * port at once. Thus we must not set it on Win32 platforms + */ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { VIR_WARN("Unable to enable port reuse"); } +#endif if (connect(fd, runp->ai_addr, runp->ai_addrlen) >= 0) break; diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index ed7bdc2..0f22ea1 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -116,7 +116,9 @@ static int virPortAllocatorBindToPort(bool *used, struct sockaddr* addr; size_t addrlen; int v6only = 1; +#ifndef WIN32 int reuse = 1; +#endif int ret = -1; int fd = -1; bool ipv6 = false; @@ -143,12 +145,19 @@ static int virPortAllocatorBindToPort(bool *used, goto cleanup; } +#ifndef WIN32 + /* + * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT + * on Linux/BSD. ie it allows 2 apps to listen to the same + * port at once. Thus we must not set it on Win32 platforms + */ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&reuse, sizeof(reuse)) < 0) { virReportSystemError(errno, "%s", _("Unable to set socket reuse addr flag")); goto cleanup; } +#endif if (ipv6 && setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void*)&v6only, sizeof(v6only)) < 0) { -- 1.9.0

2 1

[libvirt] [PATCH] build: add nwfilterxml2firewalldata to dist
by Dwight Engen 25 Apr '14

25 Apr '14

Signed-off-by: Dwight Engen <dwight.engen(a)oracle.com> --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index ba79d64..4a5e14b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -96,6 +96,7 @@ EXTRA_DIST = \ nodedevschematest \ nodeinfodata \ nwfilterschematest \ + nwfilterxml2firewalldata \ nwfilterxml2xmlin \ nwfilterxml2xmlout \ oomtrace.pl \ -- 1.9.0

2 1

[libvirt] [PATCH] libxl: Support PV consoles
by Ian Campbell 25 Apr '14

25 Apr '14

Currently the driver only exposes the ability to connect to the serial console of a Xen guest, which doesn't work for a PV guest. Instead look for a PV console first and a serial console second, if an HVM guest has a PV console then it is a good bet that it is preferred, I think. Tested with the following bit of config XML: <domain type='xen'> ... <devices> <console type='pty'> <target type='xen'/> </console> </devices> </domain> I have observed and tested this on ARM but I believe it also applies to x86 PV guests. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> Cc: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Clark Laughlin <clark.laughlin(a)linaro.org> --- src/libxl/libxl_driver.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a6ae8a1..bcf3595 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -3780,6 +3780,7 @@ libxlDomainOpenConsole(virDomainPtr dom, { virDomainObjPtr vm = NULL; int ret = -1; + libxl_console_type console_type = LIBXL_CONSOLE_TYPE_UNKNOWN; virDomainChrDefPtr chr = NULL; libxlDomainObjPrivatePtr priv; char *console = NULL; @@ -3807,8 +3808,15 @@ libxlDomainOpenConsole(virDomainPtr dom, priv = vm->privateData; - if (vm->def->nserials) + if (!chr && vm->def->nconsoles) { + chr = vm->def->consoles[0]; + console_type = LIBXL_CONSOLE_TYPE_PV; + } + + if (!chr && vm->def->nserials) { chr = vm->def->serials[0]; + console_type = LIBXL_CONSOLE_TYPE_SERIAL; + } if (!chr) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -3824,7 +3832,8 @@ libxlDomainOpenConsole(virDomainPtr dom, goto cleanup; } - ret = libxl_primary_console_get_tty(priv->ctx, vm->def->id, &console); + ret = libxl_console_get_tty(priv->ctx, vm->def->id, chr->target.port, + console_type, &console); if (ret) goto cleanup; -- 1.7.10.4

3 2

[libvirt] Schedule for next release 1.2.4
by Daniel Veillard 25 Apr '14

25 Apr '14

Sorry about the late notice, I forgot about the end of month coming. It seems we are trying a lot of patches in right now, but it would be good to not drift too much, so I am suggesting to enter the freeze on Monday morning. This mean I could push 1.2.4 either on Friday if everything looks really good or wait till May 5 for things to settle. I hope this suits everybody and sorry for late warning ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] qemu: Avoid overflow when setting migration speed on inactive domains
by Jiri Denemark 25 Apr '14

25 Apr '14

Commit c4206d7 fixed the overflow for running domains. However, we need a similar check when setting migration speed on inactive domains. At first look, it may seem the check in c4206d7 is now redundant but qemuDomainMigrateSetMaxSpeed is not the only caller of qemuMonitorSetMigrationSpeed so we need to check the bandwidth in both places. https://bugzilla.redhat.com/show_bug.cgi?id=1083483 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 67ba487..69a7053 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11927,6 +11927,13 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (virDomainMigrateSetMaxSpeedEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (bandwidth > QEMU_DOMAIN_MIG_BANDWIDTH_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + QEMU_DOMAIN_MIG_BANDWIDTH_MAX + 1ULL); + goto cleanup; + } + if (virDomainObjIsActive(vm)) { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; -- 1.9.2

2 2

[libvirt] [PATCH v5 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 25 Apr '14

25 Apr '14

Hello, This is patchset v5 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v4: * add disks and ndisks parameter to specify disks to be frozen/thawed * make fsfreeze requests nestable * change api version to 1.2.4 (v4: https://www.redhat.com/archives/libvir-list/2014-March/msg01674.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. <updated> The APIs take disks and ndisks parameters, which is a list of disk names to be frozen/thawed. If the option is not provided, every mounted filesystem is frozen/thawed. The fsfreeze can be nestable. When fsfreeze requests to a disk are issued multiple times, it is not thawed until the fsthaw requests are issued as many times as the freeze requests. Currently, qemu driver doesn't support disks parameter because the guest agent doesn't have means to specify disks to be frozen/thawed. Hence, it just counts depth of fsfreeze per domain, not per disk, so far. </updated> The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status and make fsfreeze/thaw nestable qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 10 +++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 14 ++++ src/libvirt.c | 92 ++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_domain.c | 6 ++ src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 159 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 30 +++++++- src/remote_protocol-structs | 18 +++++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 128 ++++++++++++++++++++++++++++++++++ tools/virsh.pod | 23 ++++++ 15 files changed, 483 insertions(+), 17 deletions(-)

3 17

[libvirt] [PATCH 0/9] Standardize on lookup of resources in build dir
by Daniel P. Berrange 25 Apr '14

25 Apr '14

Instead of having a bunch of custom override functions for each different area of code, standardize on one set of helper APIs for loading resources. This is derived from Nehal's proposal, based on my / Eric's feedback https://www.redhat.com/archives/libvir-list/2014-March/msg01544.html Daniel P. Berrange (5): Add helpers for resolving path to resources in build tree Activate build dir overrides in libvirtd, virtlockd & tests Use virFileFindResource to locate lock manager plugins Use virFileFindResource to locate driver plugins Use virFileFindResource to locate CPU map XML Nehal J Wani (4): Use virFileFindResource to locate iohelper for virFileWrapperFdNew Use virFileFindResource to locate libvirt_lxc for capabilities Use virFileFindResource to locate parthelper for storage backend Use virFileFindResource to locate iohelper for fdstream daemon/libvirtd.c | 31 +----------- src/Makefile.am | 2 + src/cpu/cpu_map.c | 31 ++++-------- src/cpu/cpu_map.h | 3 -- src/driver.c | 26 +++-------- src/driver.h | 1 - src/fdstream.c | 21 ++++----- src/fdstream.h | 3 -- src/libvirt_private.syms | 4 +- src/locking/lock_daemon.c | 2 + src/locking/lock_manager.c | 28 ++++------- src/locking/lock_manager.h | 1 - src/lxc/lxc_conf.c | 14 +++++- src/storage/storage_backend_disk.c | 31 +++++++++--- src/util/virfile.c | 96 +++++++++++++++++++++++++++++++++++++- src/util/virfile.h | 11 +++++ tests/cputest.c | 14 ------ tests/fdstreamtest.c | 3 -- tests/qemuxml2argvtest.c | 7 --- tests/qemuxmlnstest.c | 7 --- tests/testutils.c | 2 + tests/virdrivermoduletest.c | 2 - 22 files changed, 187 insertions(+), 153 deletions(-) -- 1.9.0

3 20

[libvirt] [PATCH] build: avoid 'index' as variable name
by Eric Blake 25 Apr '14

25 Apr '14

Once again, gcc 4.4.7 (hello RHEL) rears its ugly head: conf/domain_conf.c: In function 'virDomainDiskBackingStoreFormat': conf/domain_conf.c:14940: error: declaration of 'index' shadows a global declaration [-Wshadow] /usr/include/string.h:489: error: shadowed declaration is here [-Wshadow] * src/conf/domain_conf.c (virDomainDiskBackingStoreFormat): Pacify older gcc. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/conf/domain_conf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a558b1b..c655bcf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14937,7 +14937,7 @@ static int virDomainDiskBackingStoreFormat(virBufferPtr buf, virStorageSourcePtr backingStore, const char *backingStoreRaw, - unsigned int index) + unsigned int idx) { const char *type; const char *format; @@ -14965,7 +14965,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, } virBufferAsprintf(buf, "<backingStore type='%s' index='%u'>\n", - type, index); + type, idx); virBufferAdjustIndent(buf, 2); virBufferAsprintf(buf, "<format type='%s'/>\n", format); @@ -14973,7 +14973,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, virDomainDiskBackingStoreFormat(buf, backingStore->backingStore, backingStore->backingStoreRaw, - index + 1) < 0) + idx + 1) < 0) return -1; virBufferAdjustIndent(buf, -2); -- 1.7.1

2 1

[libvirt] [PATCH] Add test suite for viralloc APIs
by Daniel P. Berrange 25 Apr '14

25 Apr '14

In debugging a crash on OOM, I thought that the virInsert APIs might be at fault, but couldn't isolate them as a cause. While the viralloc APIs are used in many test suites, this is as a side-effect, they are not directly tested :-) Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/Makefile.am | 5 + tests/viralloctest.c | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 392 insertions(+) create mode 100644 tests/viralloctest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 122bf6c..c13cc15 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -140,6 +140,7 @@ test_programs = virshtest sockettest \ viratomictest \ utiltest shunloadtest \ virtimetest viruritest virkeyfiletest \ + viralloctest \ virauthconfigtest \ virbitmaptest \ vircgrouptest \ @@ -929,6 +930,10 @@ virkeyfiletest_SOURCES = \ virkeyfiletest.c testutils.h testutils.c virkeyfiletest_LDADD = $(LDADDS) +viralloctest_SOURCES = \ + viralloctest.c testutils.h testutils.c +viralloctest_LDADD = $(LDADDS) + virauthconfigtest_SOURCES = \ virauthconfigtest.c testutils.h testutils.c virauthconfigtest_LDADD = $(LDADDS) diff --git a/tests/viralloctest.c b/tests/viralloctest.c new file mode 100644 index 0000000..abdd871 --- /dev/null +++ b/tests/viralloctest.c @@ -0,0 +1,387 @@ +/* + * viralloctest.c: Test memory allocation APIs + * + * Copyright (C) 2014 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + */ + +#include <config.h> + +#include <viralloc.h> + +#include "testutils.h" + +#define VIR_FROM_THIS VIR_FROM_NONE + +typedef struct testDummyStruct { + int a; + int b; +} testDummyStruct; + +static int +testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + int ret = -1; + + if (VIR_ALLOC(t) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + if (t->a != 0 || + t->b != 0) { + fprintf(stderr, "Allocated ram was not zerod\n"); + goto cleanup; + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testAllocArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "Allocated ram block %zu was not zerod\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testReallocArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_REALLOC_N(t, nt + 5) < 0) + goto cleanup; + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + if (VIR_REALLOC_N(t, nt) < 0) + goto cleanup; + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + if (VIR_REALLOC_N(t, nt - 5) < 0) + goto cleanup; + + for (i = 0; i < (nt - 5); i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testExpandArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_EXPAND_N(t, nt, 5) < 0) + goto cleanup; + + for (i = 0; i < (nt - 5); i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + for (i = (nt - 5); i < nt; i++) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "New ram block %zu was not zerod\n", i); + goto cleanup; + } + } + + VIR_SHRINK_N(t, nt, 5); + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_SHRINK_N(t, nt, 5); + + for (i = 0; i < nt; i++) { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testResizeArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct *t; + size_t nt = 10, at, i; + int ret = -1; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + at = nt; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + t[i].a = 10; + t[i].b = 20; + } + + if (VIR_RESIZE_N(t, at, nt, 8) < 0) + goto cleanup; + + if (at != 18) { + fprintf(stderr, "Expected allocation of 16 not %zu\n", at); + goto cleanup; + } + + for (i = 0; i < at; i++) { + if (i >= nt) { + if (t[i].a != 0 || + t[i].b != 0) { + fprintf(stderr, "New ram block %zu was not zerod\n", i); + goto cleanup; + } + } else { + if (t[i].a != 10 || + t[i].b != 20) { + fprintf(stderr, "Reallocated ram block %zu lost data\n", i); + goto cleanup; + } + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +testInsertArray(const void *opaque ATTRIBUTE_UNUSED) +{ + testDummyStruct **t; + size_t nt = 10, i; + int ret = -1; + testDummyStruct *n = (void *)0xff; + + if (VIR_ALLOC_N(t, nt) < 0) + return -1; + + if (t == NULL) { + fprintf(stderr, "Allocation succeeded by pointer is NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) + t[i] = (void*)0x50; + + if (VIR_INSERT_ELEMENT(t, 3, nt, n) < 0) { + if (nt != 10) { + fprintf(stderr, "Expecting array size 10 after OOM not %zu\n", nt); + goto cleanup; + } + goto cleanup; + } + + if (nt != 11) { + fprintf(stderr, "Expecting array size 11 not %zu\n", nt); + goto cleanup; + } + + if (n != NULL) { + fprintf(stderr, "Expecting element to be set to NULL\n"); + goto cleanup; + } + + for (i = 0; i < nt; i++) { + void *expect = i == 3 ? (void *)0xff : (void*)0x50; + if (t[i] != expect) { + fprintf(stderr, "Expecting %p at offset %zu not %p\n", + expect, i, t[i]); + goto cleanup; + } + } + + VIR_FREE(t); + + if (t != NULL) { + fprintf(stderr, "Pointer is still set after free\n"); + goto cleanup; + } + + ret = 0; + cleanup: + VIR_FREE(t); + return ret; +} + + +static int +mymain(void) +{ + int ret = 0; + + if (virtTestRun("alloc scalar", testAllocScalar, NULL) < 0) + ret = -1; + if (virtTestRun("alloc array", testAllocArray, NULL) < 0) + ret = -1; + if (virtTestRun("realloc array", testReallocArray, NULL) < 0) + ret = -1; + if (virtTestRun("expand array", testExpandArray, NULL) < 0) + ret = -1; + if (virtTestRun("resize array", testResizeArray, NULL) < 0) + ret = -1; + if (virtTestRun("insert array", testInsertArray, NULL) < 0) + ret = -1; + + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; +} + +VIRT_TEST_MAIN(mymain) -- 1.9.0

4 6

[libvirt] [PATCH 0/4] Add support for addressing backing stores by index
by Jiri Denemark 25 Apr '14

25 Apr '14

Jiri Denemark (4): qemuDomainBlockCommit: Don't track top_canon path separately qemuDomainBlockCommit: Track virStorageSourcePtr for base virStorageFileChainLookup: Return virStorageSourcePtr Add support for addressing backing stores by index src/libvirt.c | 13 ++++++- src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 57 +++++++++++++++------------- src/util/virstoragefile.c | 97 +++++++++++++++++++++++++++++++++++++---------- src/util/virstoragefile.h | 14 +++++-- tests/virstoragetest.c | 86 ++++++++++++++++++++++++++++++----------- 6 files changed, 193 insertions(+), 75 deletions(-) -- 1.9.2

2 12

[libvirt] [RFC]How to improve KVM VM resource assignment and per-vm process/thread scheduling.
by Huangpeng (Peter) 25 Apr '14

25 Apr '14

Hi, ALL Currently kvm hypervisor have lots of features depend on linux standard apis, like vcpupin/mempin/processpin etc. But in the real production environment, we need an automated resource assign and/or scheduling, is there any plan to implement it? resource assignment requirements like: cpu eligible by the VMs In case it is eligible, whether it is in use if it is in use, whether it is dedicated to one VM, or can be shared by many VMs In case of Shared CPU need to configure oversubscription ratio used ratio info So does memory, I/O device assignment requirements. per-vm process/thread scheduling requirements like: On hypervisor side, VMs use vhost-net, virtio-scsi devices have qemu io-thread, vhost-net thread, ovs thread, hNIC interrupt context(hirq/softirq), you shoud place there threads on the same numa node to gain best performance, another important thing, you should balance these threads' cpuload on all the numa cores to avoid unbalance between vcpu usable resources. Thanks. Peter Huang

1 0

[libvirt] [PATCH] virsh: Move 'cpu-baseline' to host command group
by Li Yang 25 Apr '14

25 Apr '14

As manual said, 'cpu-baseline' isn't specific to a domain, it should not belong to domain command group, and it's used for host usually, so move it to host command group. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 115 ------------------------------------------------- tools/virsh-host.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 115 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..16a8854 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6223,115 +6223,6 @@ cmdCPUCompare(vshControl *ctl, const vshCmd *cmd) return ret; } -/* - * "cpu-baseline" command - */ -static const vshCmdInfo info_cpu_baseline[] = { - {.name = "help", - .data = N_("compute baseline CPU") - }, - {.name = "desc", - .data = N_("Compute baseline CPU for a set of given CPUs.") - }, - {.name = NULL} -}; - -static const vshCmdOptDef opts_cpu_baseline[] = { - {.name = "file", - .type = VSH_OT_DATA, - .flags = VSH_OFLAG_REQ, - .help = N_("file containing XML CPU descriptions") - }, - {.name = "features", - .type = VSH_OT_BOOL, - .help = N_("Show features that are part of the CPU model type") - }, - {.name = NULL} -}; - -static bool -cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) -{ - const char *from = NULL; - bool ret = false; - char *buffer; - char *result = NULL; - char **list = NULL; - unsigned int flags = 0; - int count = 0; - - xmlDocPtr xml = NULL; - xmlNodePtr *node_list = NULL; - xmlXPathContextPtr ctxt = NULL; - virBuffer buf = VIR_BUFFER_INITIALIZER; - size_t i; - - if (vshCommandOptBool(cmd, "features")) - flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; - - if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) - return false; - - if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) - return false; - - /* add a separate container around the xml */ - virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); - if (virBufferError(&buf)) - goto no_memory; - - VIR_FREE(buffer); - buffer = virBufferContentAndReset(&buf); - - - if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) - goto cleanup; - - if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", - ctxt, &node_list)) == -1) - goto cleanup; - - if (count == 0) { - vshError(ctl, _("No host CPU specified in '%s'"), from); - goto cleanup; - } - - list = vshCalloc(ctl, count, sizeof(const char *)); - - for (i = 0; i < count; i++) { - if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { - vshSaveLibvirtError(); - goto cleanup; - } - } - - result = virConnectBaselineCPU(ctl->conn, - (const char **)list, count, flags); - - if (result) { - vshPrint(ctl, "%s", result); - ret = true; - } - - cleanup: - xmlXPathFreeContext(ctxt); - xmlFreeDoc(xml); - VIR_FREE(result); - if (list != NULL && count > 0) { - for (i = 0; i < count; i++) - VIR_FREE(list[i]); - } - VIR_FREE(list); - VIR_FREE(buffer); - VIR_FREE(node_list); - - return ret; - - no_memory: - vshError(ctl, "%s", _("Out of memory")); - ret = false; - goto cleanup; -} /* * "cpu-stats" command @@ -11472,12 +11363,6 @@ const vshCmdDef domManagementCmds[] = { .flags = 0 }, #endif - {.name = "cpu-baseline", - .handler = cmdCPUBaseline, - .opts = opts_cpu_baseline, - .info = info_cpu_baseline, - .flags = 0 - }, {.name = "cpu-compare", .handler = cmdCPUCompare, .opts = opts_cpu_compare, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..8273654 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -38,6 +38,7 @@ #include "virxml.h" #include "virtypedparam.h" #include "virstring.h" +#include "virfile.h" /* * "capabilities" command @@ -939,6 +940,115 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto cleanup; } +/* + * "cpu-baseline" command + */ +static const vshCmdInfo info_cpu_baseline[] = { + {.name = "help", + .data = N_("compute baseline CPU") + }, + {.name = "desc", + .data = N_("Compute baseline CPU for a set of given CPUs.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_cpu_baseline[] = { + {.name = "file", + .type = VSH_OT_DATA, + .flags = VSH_OFLAG_REQ, + .help = N_("file containing XML CPU descriptions") + }, + {.name = "features", + .type = VSH_OT_BOOL, + .help = N_("Show features that are part of the CPU model type") + }, + {.name = NULL} +}; + +static bool +cmdCPUBaseline(vshControl *ctl, const vshCmd *cmd) +{ + const char *from = NULL; + bool ret = false; + char *buffer; + char *result = NULL; + char **list = NULL; + unsigned int flags = 0; + int count = 0; + + xmlDocPtr xml = NULL; + xmlNodePtr *node_list = NULL; + xmlXPathContextPtr ctxt = NULL; + virBuffer buf = VIR_BUFFER_INITIALIZER; + size_t i; + + if (vshCommandOptBool(cmd, "features")) + flags |= VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES; + + if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) + return false; + + if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) + return false; + + /* add a separate container around the xml */ + virBufferStrcat(&buf, "<container>", buffer, "</container>", NULL); + if (virBufferError(&buf)) + goto no_memory; + + VIR_FREE(buffer); + buffer = virBufferContentAndReset(&buf); + + + if (!(xml = virXMLParseStringCtxt(buffer, from, &ctxt))) + goto cleanup; + + if ((count = virXPathNodeSet("//cpu[not(ancestor::cpus)]", + ctxt, &node_list)) == -1) + goto cleanup; + + if (count == 0) { + vshError(ctl, _("No host CPU specified in '%s'"), from); + goto cleanup; + } + + list = vshCalloc(ctl, count, sizeof(const char *)); + + for (i = 0; i < count; i++) { + if (!(list[i] = virXMLNodeToString(xml, node_list[i]))) { + vshSaveLibvirtError(); + goto cleanup; + } + } + + result = virConnectBaselineCPU(ctl->conn, + (const char **)list, count, flags); + + if (result) { + vshPrint(ctl, "%s", result); + ret = true; + } + + cleanup: + xmlXPathFreeContext(ctxt); + xmlFreeDoc(xml); + VIR_FREE(result); + if (list != NULL && count > 0) { + for (i = 0; i < count; i++) + VIR_FREE(list[i]); + } + VIR_FREE(list); + VIR_FREE(buffer); + VIR_FREE(node_list); + + return ret; + + no_memory: + vshError(ctl, "%s", _("Out of memory")); + ret = false; + goto cleanup; +} const vshCmdDef hostAndHypervisorCmds[] = { {.name = "capabilities", .handler = cmdCapabilities, @@ -952,6 +1062,12 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_cpu_models, .flags = 0 }, + {.name = "cpu-baseline", + .handler = cmdCPUBaseline, + .opts = opts_cpu_baseline, + .info = info_cpu_baseline, + .flags = 0 + }, {.name = "freecell", .handler = cmdFreecell, .opts = opts_freecell, -- 1.7.1

1 0

[libvirt] [PATCH] libxl: add migration support
by Jim Fehlig 25 Apr '14

25 Apr '14

This patch adds initial migration support to the libxl driver, using the VIR_DRV_FEATURE_MIGRATION_PARAMS family of migration functions. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- V3 of patch to add migration support to the libxl driver. V2 is here https://www.redhat.com/archives/libvir-list/2014-March/msg00880.html Patches 1-12 in the original series have been pushed, leaving only this patch to complete the migration support. This version adds a simple, extensible messaging protocol to coordinate transfer of migration data between libxl hosts. Michal Privoznik noted the even simpler protocol in V2 was not extensible, which in the end was a good point IMO so I've tried to address that with V3. Comments welcome. Thanks! po/POTFILES.in | 1 + src/Makefile.am | 3 +- src/libxl/libxl_conf.h | 6 + src/libxl/libxl_domain.h | 1 + src/libxl/libxl_driver.c | 221 +++++++++++ src/libxl/libxl_migration.c | 920 ++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_migration.h | 78 ++++ 7 files changed, 1229 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 122b853..5618631 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,6 +73,7 @@ src/lxc/lxc_process.c src/libxl/libxl_domain.c src/libxl/libxl_driver.c src/libxl/libxl_conf.c +src/libxl/libxl_migration.c src/network/bridge_driver.c src/network/bridge_driver_linux.c src/node_device/node_device_driver.c diff --git a/src/Makefile.am b/src/Makefile.am index 21d56fc..f0dd4ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -702,7 +702,8 @@ XENAPI_DRIVER_SOURCES = \ LIBXL_DRIVER_SOURCES = \ libxl/libxl_conf.c libxl/libxl_conf.h \ libxl/libxl_domain.c libxl/libxl_domain.h \ - libxl/libxl_driver.c libxl/libxl_driver.h + libxl/libxl_driver.c libxl/libxl_driver.h \ + libxl/libxl_migration.c libxl/libxl_migration.h UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 24e1720..b798567 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -43,6 +43,9 @@ # define LIBXL_VNC_PORT_MIN 5900 # define LIBXL_VNC_PORT_MAX 65535 +# define LIBXL_MIGRATION_PORT_MIN 49152 +# define LIBXL_MIGRATION_PORT_MAX 49216 + # define LIBXL_CONFIG_DIR SYSCONFDIR "/libvirt/libxl" # define LIBXL_AUTOSTART_DIR LIBXL_CONFIG_DIR "/autostart" # define LIBXL_STATE_DIR LOCALSTATEDIR "/run/libvirt/libxl" @@ -115,6 +118,9 @@ struct _libxlDriverPrivate { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr reservedVNCPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; }; diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 979ce2a..9d48049 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -69,6 +69,7 @@ struct _libxlDomainObjPrivate { virChrdevsPtr devs; libxl_evgen_domain_death *deathW; libxlDriverPrivatePtr driver; + unsigned short migrationPort; struct libxlDomainJobObj job; }; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a6ae8a1..acf68b8 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -45,6 +45,7 @@ #include "libxl_domain.h" #include "libxl_driver.h" #include "libxl_conf.h" +#include "libxl_migration.h" #include "xen_xm.h" #include "xen_sxpr.h" #include "virtypedparam.h" @@ -209,6 +210,7 @@ libxlStateCleanup(void) virObjectUnref(libxl_driver->xmlopt); virObjectUnref(libxl_driver->domains); virObjectUnref(libxl_driver->reservedVNCPorts); + virObjectUnref(libxl_driver->migrationPorts); virObjectEventStateFree(libxl_driver->domainEventState); virSysinfoDefFree(libxl_driver->hostsysinfo); @@ -296,6 +298,13 @@ libxlStateInitialize(bool privileged, LIBXL_VNC_PORT_MAX))) goto error; + /* Allocate bitmap for migration port reservation */ + if (!(libxl_driver->migrationPorts = + virPortAllocatorNew(_("migration"), + LIBXL_MIGRATION_PORT_MIN, + LIBXL_MIGRATION_PORT_MAX))) + goto error; + if (!(libxl_driver->domains = virDomainObjListNew())) goto error; @@ -4120,6 +4129,7 @@ libxlConnectSupportsFeature(virConnectPtr conn, int feature) switch (feature) { case VIR_DRV_FEATURE_TYPED_PARAM_STRING: + case VIR_DRV_FEATURE_MIGRATION_PARAMS: return 1; default: return 0; @@ -4298,6 +4308,212 @@ libxlNodeDeviceReset(virNodeDevicePtr dev) return ret; } +static char * +libxlDomainMigrateBegin3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + const char *xmlin = NULL; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &xmlin) < 0) + return NULL; + + if (!(vm = libxlDomObjFromDomain(domain))) + return NULL; + + if (virDomainMigrateBegin3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationBegin(domain->conn, vm, xmlin); +} + +static int +libxlDomainMigratePrepare3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + char **uri_out, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainDefPtr def = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri_in = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto error; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri_in) < 0) + + goto error; + + if (!(def = libxlDomainMigrationPrepareDef(driver, dom_xml, dname))) + goto error; + + if (virDomainMigratePrepare3ParamsEnsureACL(dconn, def) < 0) + goto error; + + if (libxlDomainMigrationPrepare(dconn, def, uri_in, uri_out) < 0) + goto error; + + return 0; + + error: + virDomainDefFree(def); + return -1; +} + +static int +libxlDomainMigratePerform3Params(virDomainPtr dom, + const char *dconnuri, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm = NULL; + const char *dom_xml = NULL; + const char *dname = NULL; + const char *uri = NULL; + int ret = -1; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + goto cleanup; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_XML, + &dom_xml) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0 || + virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_URI, + &uri) < 0) + + goto cleanup; + + if (!(vm = libxlDomObjFromDomain(dom))) + goto cleanup; + + if (virDomainMigratePerform3ParamsEnsureACL(dom->conn, vm->def) < 0) + goto cleanup; + + if (libxlDomainMigrationPerform(driver, vm, dom_xml, dconnuri, + uri, dname, flags) < 0) + goto cleanup; + + ret = 0; + + cleanup: + if (vm) + virObjectUnlock(vm); + return ret; +} + +static virDomainPtr +libxlDomainMigrateFinish3Params(virConnectPtr dconn, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + char **cookieout ATTRIBUTE_UNUSED, + int *cookieoutlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + const char *dname = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, NULL); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return NULL; + + if (virTypedParamsGetString(params, nparams, + VIR_MIGRATE_PARAM_DEST_NAME, + &dname) < 0) + return NULL; + + if (!dname || + !(vm = virDomainObjListFindByName(driver->domains, dname))) { + virReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching name '%s'"), + NULLSTR(dname)); + return NULL; + } + + if (virDomainMigrateFinish3ParamsEnsureACL(dconn, vm->def) < 0) { + virObjectUnlock(vm); + return NULL; + } + + return libxlDomainMigrationFinish(dconn, vm, flags, cancelled); +} + +static int +libxlDomainMigrateConfirm3Params(virDomainPtr domain, + virTypedParameterPtr params, + int nparams, + const char *cookiein ATTRIBUTE_UNUSED, + int cookieinlen ATTRIBUTE_UNUSED, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = domain->conn->privateData; + virDomainObjPtr vm = NULL; + + virCheckFlags(LIBXL_MIGRATION_FLAGS, -1); + if (virTypedParamsValidate(params, nparams, LIBXL_MIGRATION_PARAMETERS) < 0) + return -1; + + if (!(vm = libxlDomObjFromDomain(domain))) + return -1; + + if (virDomainMigrateConfirm3ParamsEnsureACL(domain->conn, vm->def) < 0) { + virObjectUnlock(vm); + return -1; + } + + return libxlDomainMigrationConfirm(driver, vm, flags, cancelled); +} + static virDriver libxlDriver = { .no = VIR_DRV_LIBXL, @@ -4388,6 +4604,11 @@ static virDriver libxlDriver = { .nodeDeviceDetachFlags = libxlNodeDeviceDetachFlags, /* 1.2.3 */ .nodeDeviceReAttach = libxlNodeDeviceReAttach, /* 1.2.3 */ .nodeDeviceReset = libxlNodeDeviceReset, /* 1.2.3 */ + .domainMigrateBegin3Params = libxlDomainMigrateBegin3Params, /* 1.2.3 */ + .domainMigratePrepare3Params = libxlDomainMigratePrepare3Params, /* 1.2.3 */ + .domainMigratePerform3Params = libxlDomainMigratePerform3Params, /* 1.2.3 */ + .domainMigrateFinish3Params = libxlDomainMigrateFinish3Params, /* 1.2.3 */ + .domainMigrateConfirm3Params = libxlDomainMigrateConfirm3Params, /* 1.2.3 */ }; static virStateDriver libxlStateDriver = { diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c new file mode 100644 index 0000000..4b74ef4 --- /dev/null +++ b/src/libxl/libxl_migration.c @@ -0,0 +1,920 @@ +/* + * libxl_migration.c: methods for handling migration with libxenlight + * + * Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + * Chunyan Liu <cyliu(a)suse.com> + */ + +#include <config.h> + +#include "internal.h" +#include "virlog.h" +#include "virerror.h" +#include "virconf.h" +#include "datatypes.h" +#include "virfile.h" +#include "viralloc.h" +#include "viruuid.h" +#include "vircommand.h" +#include "virstring.h" +#include "rpc/virnetsocket.h" +#include "libxl_domain.h" +#include "libxl_driver.h" +#include "libxl_conf.h" +#include "libxl_migration.h" + +#define VIR_FROM_THIS VIR_FROM_LIBXL + +VIR_LOG_INIT("libxl.libxl_migration"); + +#define LIBXL_MIGRATION_PROTO_VERSION 1 + +typedef struct _libxlMigrateReceiveArgs { + virConnectPtr conn; + virDomainObjPtr vm; + + /* for freeing listen sockets */ + virNetSocketPtr *socks; + size_t nsocks; +} libxlMigrateReceiveArgs; + +/* + * For future extensibility, a simple messaging protocol used to send migration + * data between libxl hosts. The message is encapsulated in json and currently + * includes the following entries: + * + * {"libvirt-libxl-mig-msg" : + * {"version" : $ver}, + * {"state" : $state}, + * {"status" : $status} + * } + * + * Possible $state values are "negotiate-version", "send-binary-data", + * "sending-binary-data", "received-binary-data", "done", and "error". + * + * Migration between source and destination libxl hosts is performed with the + * following message exchange: + * + * - src->dst: connect + * - dst->src: state="negotiate-version", version=LIBXL_MIGRATION_PROTO_VERSION + * - src->dst: state-"negotiate-version", + * version=min(dst ver, LIBXL_MIGRATION_PROTO_VERSION) + * - dst->src: state="send-binary-data", version=negotiatedversion + * - src->dst: state="sending-binary-data", version=negotiatedversion + * _ src->dst: binary migration data + * - dst->src: state="received-binary-data", version=negotiatedversion + * - src->dst: state="done", version=negotiatedversion + * + */ + +static virJSONValuePtr +libxlMigrationMsgNew(const char *state) +{ + virJSONValuePtr msg; + virJSONValuePtr body; + + if (!(msg = virJSONValueNewObject())) + return NULL; + + if (!(body = virJSONValueNewObject())) { + virJSONValueFree(msg); + return NULL; + } + + virJSONValueObjectAppendNumberInt(body, "version", + LIBXL_MIGRATION_PROTO_VERSION); + virJSONValueObjectAppendString(body, "state", state); + virJSONValueObjectAppendNumberInt(body, "status", 0); + + virJSONValueObjectAppend(msg, "libvirt-libxl-mig-msg", body); + + return msg; +} + +static bool +libxlMigrationMsgIsState(virJSONValuePtr message, const char *state) +{ + virJSONValuePtr body; + const char *msg_state; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return false; + + msg_state = virJSONValueObjectGetString(body, "state"); + if (!msg_state || STRNEQ(msg_state, state)) + return false; + + return true; +} + +static int +libxlMigrationMsgSetState(virJSONValuePtr message, const char *state) +{ + virJSONValuePtr body; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return -1; + + virJSONValueObjectRemoveKey(body, "state", NULL); + virJSONValueObjectAppendString(body, "state", state); + + return 0; +} + + +static int +libxlMigrationMsgSend(int fd, virJSONValuePtr message, int status) +{ + int ret = -1; + virJSONValuePtr body; + int len; + char *msgstr; + + if (!(body = virJSONValueObjectGet(message, "libvirt-libxl-mig-msg"))) + return -1; + + virJSONValueObjectRemoveKey(body, "status", NULL); + virJSONValueObjectAppendNumberInt(body, "status", status); + + if (!(msgstr = virJSONValueToString(message, false))) + return -1; + + VIR_DEBUG("Sending migration message %s", msgstr); + len = strlen(msgstr) + 1; + if (safewrite(fd, msgstr, len) != len) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to send migration message")); + goto cleanup; + } + + ret = 0; + + cleanup: + VIR_FREE(msgstr); + return ret; +} + +static virJSONValuePtr +libxlMigrationMsgReceive(int fd) +{ + char buf[512]; + int ret; + virJSONValuePtr msg = NULL; + virJSONValuePtr body; + int status; + size_t i; + + for (i = 0; i < sizeof(buf);) { + ret = saferead(fd, &(buf[i]), 1); + if (ret == -1 && errno != EAGAIN) + goto error; + if (ret == 1) { + if (buf[i] == '\0') + break; + i++; + } + } + + VIR_DEBUG("Received migration message %s", buf); + if (!(msg = virJSONValueFromString(buf))) + return NULL; + + if (!(body = virJSONValueObjectGet(msg, "libvirt-libxl-mig-msg"))) + goto error; + + if (virJSONValueObjectGetNumberInt(body, "status", &status) < 0) + goto error; + + if (status != 0) + goto error; + + return msg; + + error: + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to receive migration message")); + virJSONValueFree(msg); + return NULL; +} + +static int +libxlMigrationSrcNegotiate(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + virJSONValuePtr body; + int ver; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "negotiate-version")) + goto cleanup; + /* + * ACK by returning the message, with version set to + * min(dest ver, src ver) + */ + if (!(body = virJSONValueObjectGet(msg, "libvirt-libxl-mig-msg"))) + goto cleanup; + + if (virJSONValueObjectGetNumberInt(body, "version", &ver) < 0) + goto cleanup; + if (ver > LIBXL_MIGRATION_PROTO_VERSION) { + virJSONValueObjectRemoveKey(body, "version", NULL); + virJSONValueObjectAppendNumberInt(body, + "version", + LIBXL_MIGRATION_PROTO_VERSION); + } + + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDstNegotiate(int fd, virJSONValuePtr *message) +{ + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgNew("negotiate-version"))) + return -1; + + if (libxlMigrationMsgSend(fd, msg, 0) < 0) { + virJSONValueFree(msg); + return -1; + } + + /* + * Receive ACK. src set version=min(dst ver, highest src ver), + * which is the negotiated version. Use this message with + * negotiated version throughout the transaction. + */ + virJSONValueFree(msg); + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + *message = msg; + return 0; +} + +static int +libxlMigrationSrcReady(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "send-binary-data")) + goto cleanup; + + /* ACK by returning the message with state sending */ + libxlMigrationMsgSetState(msg, "sending-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDstReady(int fd, virJSONValuePtr msg) +{ + int ret = -1; + virJSONValuePtr tmp = NULL; + + libxlMigrationMsgSetState(msg, "send-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + return -1; + + /* Receive ACK, state sending */ + if (!(tmp = libxlMigrationMsgReceive(fd))) + return -1; + if (!libxlMigrationMsgIsState(tmp, "sending-binary-data")) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(tmp); + return ret; +} + +static int +libxlMigrationSrcDone(int fd) +{ + int ret = -1; + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgReceive(fd))) + return -1; + + if (!libxlMigrationMsgIsState(msg, "received-binary-data")) + goto cleanup; + + /* ACK by returning the message with state done */ + libxlMigrationMsgSetState(msg, "done"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(msg); + return ret; +} + +static int +libxlMigrationDestDone(int fd, virJSONValuePtr msg) +{ + int ret = -1; + virJSONValuePtr tmp; + + libxlMigrationMsgSetState(msg, "received-binary-data"); + if (libxlMigrationMsgSend(fd, msg, 0) < 0) + return -1; + + /* Receive ACK, state done */ + if (!(tmp = libxlMigrationMsgReceive(fd))) + return -1; + if (!libxlMigrationMsgIsState(tmp, "done")) + goto cleanup; + + ret = 0; + + cleanup: + virJSONValueFree(tmp); + return ret; +} + +static void +libxlMigrationSrcFailed(int fd, int status) +{ + virJSONValuePtr msg; + + if (!(msg = libxlMigrationMsgNew("error"))) + return; + libxlMigrationMsgSend(fd, msg, status); + virJSONValueFree(msg); +} + +static void +libxlMigrationDstFailed(int fd, virJSONValuePtr msg, int status) +{ + libxlMigrationMsgSetState(msg, "error"); + libxlMigrationMsgSend(fd, msg, status); +} + +static void +libxlDoMigrateReceive(virNetSocketPtr sock, + int events ATTRIBUTE_UNUSED, + void *opaque) +{ + libxlMigrateReceiveArgs *data = opaque; + virConnectPtr conn = data->conn; + virDomainObjPtr vm = data->vm; + libxlDomainObjPrivatePtr priv = vm->privateData; + virNetSocketPtr *socks = data->socks; + size_t nsocks = data->nsocks; + libxlDriverPrivatePtr driver = conn->privateData; + virNetSocketPtr client_sock; + virJSONValuePtr mig_msg = NULL; + int recvfd; + size_t i; + int ret; + + virNetSocketAccept(sock, &client_sock); + if (client_sock == NULL) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("Fail to accept migration connection")); + goto cleanup; + } + VIR_DEBUG("Accepted migration connection\n"); + recvfd = virNetSocketDupFD(client_sock, true); + virObjectUnref(client_sock); + + if (libxlMigrationDstNegotiate(recvfd, &mig_msg) < 0) + goto cleanup; + + if (libxlMigrationDstReady(recvfd, mig_msg) < 0) + goto cleanup; + + virObjectLock(vm); + ret = libxlDomainStart(driver, vm, false, recvfd); + virObjectUnlock(vm); + + if (ret < 0) { + libxlMigrationDstFailed(recvfd, mig_msg, ret); + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to restore domain with libxenlight")); + if (!vm->persistent) + virDomainObjListRemove(driver->domains, vm); + goto cleanup; + } + + if (libxlMigrationDestDone(recvfd, mig_msg) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to notify sender that migration completed")); + goto cleanup_dom; + } + + /* Remove all listen socks from event handler, and close them. */ + for (i = 0; i < nsocks; i++) { + virNetSocketUpdateIOCallback(socks[i], 0); + virNetSocketRemoveIOCallback(socks[i]); + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + VIR_FREE(socks); + goto cleanup; + + cleanup_dom: + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + vm->def->id = -1; + if (!vm->persistent) + virDomainObjListRemove(driver->domains, vm); + + cleanup: + VIR_FORCE_CLOSE(recvfd); + virJSONValueFree(mig_msg); + VIR_FREE(opaque); + return; +} + +static int +libxlDoMigrateSend(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned long flags, + int sockfd) +{ + libxlDomainObjPrivatePtr priv; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virObjectEventPtr event = NULL; + int xl_flags = 0; + int ret = -1; + + if (flags & VIR_MIGRATE_LIVE) + xl_flags = LIBXL_SUSPEND_LIVE; + + priv = vm->privateData; + + if (libxlMigrationSrcNegotiate(sockfd) < 0) + goto cleanup; + + if (libxlMigrationSrcReady(sockfd) < 0) + goto cleanup; + + if (libxl_domain_suspend(priv->ctx, vm->def->id, + sockfd, xl_flags, NULL) != 0) { + libxlMigrationSrcFailed(sockfd, ret); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to save domain '%d' with libxenlight"), + vm->def->id); + goto cleanup; + } + + if (libxlMigrationSrcDone(sockfd) < 0) { + if (libxl_domain_resume(priv->ctx, vm->def->id, 0, 0) != 0) { + VIR_DEBUG("Failed to resume domain '%d' with libxenlight", + vm->def->id); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + goto cleanup; + } + goto cleanup; + } + + ret = 0; + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + virObjectUnref(cfg); + return ret; +} + +static bool +libxlDomainMigrationIsAllowed(virDomainDefPtr def) +{ + /* Migration is not allowed if definition contains any hostdevs */ + if (def->nhostdevs > 0) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain has assigned host devices")); + return false; + } + + return true; +} + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin) +{ + libxlDriverPrivatePtr driver = conn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr tmpdef = NULL; + virDomainDefPtr def; + char *xml = NULL; + + if (libxlDomainObjBeginJob(driver, vm, LIBXL_JOB_MODIFY) < 0) + goto cleanup; + + if (xmlin) { + if (!(tmpdef = virDomainDefParseString(xmlin, cfg->caps, + driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto endjob; + + def = tmpdef; + } else { + def = vm->def; + } + + if (!libxlDomainMigrationIsAllowed(def)) + goto endjob; + + xml = virDomainDefFormat(def, VIR_DOMAIN_XML_SECURE); + + cleanup: + if (vm) + virObjectUnlock(vm); + + virDomainDefFree(tmpdef); + virObjectUnref(cfg); + return xml; + + endjob: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + goto cleanup; +} + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + virDomainDefPtr def; + char *name = NULL; + + if (!dom_xml) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("no domain XML passed")); + return NULL; + } + + if (!(def = virDomainDefParseString(dom_xml, cfg->caps, driver->xmlopt, + 1 << VIR_DOMAIN_VIRT_XEN, + VIR_DOMAIN_XML_INACTIVE))) + goto cleanup; + + if (dname) { + name = def->name; + if (VIR_STRDUP(def->name, dname) < 0) { + virDomainDefFree(def); + def = NULL; + } + } + + cleanup: + virObjectUnref(cfg); + VIR_FREE(name); + return def; +} + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + virDomainObjPtr vm = NULL; + char *hostname = NULL; + unsigned short port; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr *socks = NULL; + size_t nsocks = 0; + int nsocks_listen = 0; + libxlMigrateReceiveArgs *args; + size_t i; + int ret = -1; + + if (!(vm = virDomainObjListAdd(driver->domains, def, + driver->xmlopt, + VIR_DOMAIN_OBJ_LIST_ADD_LIVE | + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, + NULL))) + goto cleanup; + + /* Create socket connection to receive migration data */ + if (!uri_in) { + if ((hostname = virGetHostname()) == NULL) + goto cleanup; + + if (STRPREFIX(hostname, "localhost")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("hostname on destination resolved to localhost," + " but migration requires an FQDN")); + goto cleanup; + } + + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } else { + if (!(STRPREFIX(uri_in, "tcp://"))) { + /* not full URI, add prefix tcp:// */ + char *tmp; + if (virAsprintf(&tmp, "tcp://%s", uri_in) < 0) + goto cleanup; + uri = virURIParse(tmp); + VIR_FREE(tmp); + } else { + uri = virURIParse(uri_in); + } + + if (uri == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("unable to parse URI: %s"), + uri_in); + goto cleanup; + } + + if (uri->server == NULL) { + virReportError(VIR_ERR_INVALID_ARG, + _("missing host in migration URI: %s"), + uri_in); + goto cleanup; + } else { + hostname = uri->server; + } + + if (uri->port == 0) { + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; + + } else { + port = uri->port; + } + + if (virAsprintf(uri_out, "tcp://%s:%d", hostname, port) < 0) + goto cleanup; + } + + snprintf(portstr, sizeof(portstr), "%d", port); + + if (virNetSocketNewListenTCP(hostname, portstr, &socks, &nsocks) < 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Fail to create socket for incoming migration")); + goto cleanup; + } + + if (VIR_ALLOC(args) < 0) + goto cleanup; + + args->conn = dconn; + args->vm = vm; + args->socks = socks; + args->nsocks = nsocks; + + for (i = 0; i < nsocks; i++) { + if (virNetSocketSetBlocking(socks[i], true) < 0) + continue; + + if (virNetSocketListen(socks[i], 1) < 0) + continue; + + if (virNetSocketAddIOCallback(socks[i], + 0, + libxlDoMigrateReceive, + args, + NULL) < 0) { + continue; + } + + virNetSocketUpdateIOCallback(socks[i], VIR_EVENT_HANDLE_READABLE); + nsocks_listen++; + } + + if (!nsocks_listen) + goto cleanup; + + ret = 0; + goto done; + + cleanup: + for (i = 0; i < nsocks; i++) { + virNetSocketClose(socks[i]); + virObjectUnref(socks[i]); + } + VIR_FREE(socks); + + done: + virURIFree(uri); + if (vm) + virObjectUnlock(vm); + return ret; +} + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml ATTRIBUTE_UNUSED, + const char *dconnuri ATTRIBUTE_UNUSED, + const char *uri_str, + const char *dname ATTRIBUTE_UNUSED, + unsigned int flags) +{ + char *hostname = NULL; + unsigned short port = 0; + char portstr[100]; + virURIPtr uri = NULL; + virNetSocketPtr sock; + int sockfd = -1; + int saved_errno = EINVAL; + int ret = -1; + + /* parse dst host:port from uri */ + uri = virURIParse(uri_str); + if (uri == NULL || uri->server == NULL || uri->port == 0) + goto cleanup; + + hostname = uri->server; + port = uri->port; + snprintf(portstr, sizeof(portstr), "%d", port); + + /* socket connect to dst host:port */ + if (virNetSocketNewConnectTCP(hostname, portstr, &sock) < 0) { + virReportSystemError(saved_errno, + _("unable to connect to '%s:%s'"), + hostname, portstr); + goto cleanup; + } + + if (virNetSocketSetBlocking(sock, true) < 0) { + virObjectUnref(sock); + goto cleanup; + } + + sockfd = virNetSocketDupFD(sock, true); + virObjectUnref(sock); + + /* suspend vm and send saved data to dst through socket fd */ + virObjectUnlock(vm); + ret = libxlDoMigrateSend(driver, vm, flags, sockfd); + virObjectLock(vm); + + cleanup: + VIR_FORCE_CLOSE(sockfd); + virURIFree(uri); + return ret; +} + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverPrivatePtr driver = dconn->privateData; + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + virDomainPtr dom = NULL; + + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + + if (cancelled) + goto cleanup; + + if (!(flags & VIR_MIGRATE_PAUSED)) { + if (libxl_domain_unpause(priv->ctx, vm->def->id) != 0) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("Failed to unpause domain")); + goto cleanup; + } + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_MIGRATED); + } else { + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_USER); + event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); + } + + if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) + goto cleanup; + + dom = virGetDomain(dconn, vm->def->name, vm->def->uuid); + + if (dom == NULL) { + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_FAILED); + libxlDomainEventQueue(driver, event); + } + + cleanup: + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return dom; +} + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled) +{ + libxlDriverConfigPtr cfg = libxlDriverConfigGet(driver); + libxlDomainObjPrivatePtr priv = vm->privateData; + virObjectEventPtr event = NULL; + int ret = -1; + + if (cancelled) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("migration failed, attempting to resume on source host")); + if (libxl_domain_resume(priv->ctx, vm->def->id, 1, 0) == 0) { + ret = 0; + } else { + VIR_DEBUG("Unable to resume domain '%s' after failed migration", + vm->def->name); + virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, + VIR_DOMAIN_PAUSED_MIGRATION); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SUSPENDED, + VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); + ignore_value(virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm)); + } + goto cleanup; + } + + libxl_domain_destroy(priv->ctx, vm->def->id, NULL); + libxlDomainCleanup(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED); + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, + VIR_DOMAIN_EVENT_STOPPED_MIGRATED); + + VIR_DEBUG("Domain '%s' successfully migrated", vm->def->name); + + if (flags & VIR_MIGRATE_UNDEFINE_SOURCE) + virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); + + if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) + virDomainObjListRemove(driver->domains, vm); + + ret = 0; + + cleanup: + if (!libxlDomainObjEndJob(driver, vm)) + vm = NULL; + if (event) + libxlDomainEventQueue(driver, event); + if (vm) + virObjectUnlock(vm); + virObjectUnref(cfg); + return ret; +} diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h new file mode 100644 index 0000000..63d8bdc --- /dev/null +++ b/src/libxl/libxl_migration.h @@ -0,0 +1,78 @@ +/* + * libxl_migration.h: methods for handling migration with libxenlight + * + * Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: + * Jim Fehlig <jfehlig(a)suse.com> + */ + +#ifndef LIBXL_MIGRATION_H +# define LIBXL_MIGRATION_H + +# include "libxl_conf.h" + +# define LIBXL_MIGRATION_FLAGS \ + (VIR_MIGRATE_LIVE | \ + VIR_MIGRATE_UNDEFINE_SOURCE | \ + VIR_MIGRATE_PAUSED) + +/* All supported migration parameters and their types. */ +# define LIBXL_MIGRATION_PARAMETERS \ + VIR_MIGRATE_PARAM_URI, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_NAME, VIR_TYPED_PARAM_STRING, \ + VIR_MIGRATE_PARAM_DEST_XML, VIR_TYPED_PARAM_STRING, \ + NULL + +char * +libxlDomainMigrationBegin(virConnectPtr conn, + virDomainObjPtr vm, + const char *xmlin); + +virDomainDefPtr +libxlDomainMigrationPrepareDef(libxlDriverPrivatePtr driver, + const char *dom_xml, + const char *dname); + +int +libxlDomainMigrationPrepare(virConnectPtr dconn, + virDomainDefPtr def, + const char *uri_in, + char **uri_out); + +int +libxlDomainMigrationPerform(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + const char *dom_xml, + const char *dconnuri, + const char *uri_str, + const char *dname, + unsigned int flags); + +virDomainPtr +libxlDomainMigrationFinish(virConnectPtr dconn, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +int +libxlDomainMigrationConfirm(libxlDriverPrivatePtr driver, + virDomainObjPtr vm, + unsigned int flags, + int cancelled); + +#endif /* LIBXL_DRIVER_H */ -- 1.8.1.4

1 1

[libvirt] KVM Connection issue
by Vikas Kokare 24 Apr '14

24 Apr '14

We are using Libvirt Java API version 0.5.0 to connect RHEL 5 KVM, and fetch KVM environment attributes. While doing it, we are seeing the following exception: *this function is not supported by the connection driver: qemuGetSchedulerType Stack trace: org.libvirt.ErrorHandler.processError(Unknown Source) org.libvirt.Connect.processError(Unknown Source) org.libvirt.Domain.processError(Unknown Source) org.libvirt.Domain.getSchedulerType(Unknown Source)* The machine that is running the Java code to connect to the KVM is also RHEL 5. Is this related to certain libvirt version mismatch or something not supported?

2 1

[libvirt] [PATCH 1/1] Enable QEMU_CAPS_PCI_MULTIBUS capability for QEMU2.0 forward.
by Li Zhang 24 Apr '14

24 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For QEMU2.0 forward version, it supports PCI multiBUS. Currently, libvirt still disables it which causes an error "Bus 'pci' not found". Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2c8ec10..b49398f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3019,6 +3019,9 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps, if (qemuCaps->version >= 1006000) virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY); + if (qemuCaps->version >= 2000000) + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0) goto cleanup; if (virQEMUCapsProbeQMPEvents(qemuCaps, mon) < 0) -- 1.8.2.1

4 8

[libvirt] [PATCH] docs: document nmdm type console
by Roman Bogorodskiy 24 Apr '14

24 Apr '14

* Add nmdm type device to domain format documnetation * Add a section about nmdm console usage to the bhyve driver documentation --- docs/drvbhyve.html.in | 32 ++++++++++++++++++++++++++++++++ docs/formatdomain.html.in | 29 +++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/docs/drvbhyve.html.in b/docs/drvbhyve.html.in index 60eee85..0b0e296 100644 --- a/docs/drvbhyve.html.in +++ b/docs/drvbhyve.html.in @@ -79,5 +79,37 @@ in libvirt bhyve driver is yet to be implemented). </domain> </pre> + +<h2><a name="usage">Guest usage / management</a></h2> + +<h3><a name="console">Connecting to a guest console</a></h3> + +<p> +Guest console connection is supported through the <code>nmdm</code> device. It could be enabled by adding +the following to the domain XML (<span class="since">Since 1.2.4</span>): +</p> + +<pre> + ... + <devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> + </devices> + ...</pre> + +<p> +Then <code>virsh console</code> command can be used to connect to the text console +of a guest.</p> + +<p><b>NB:</b> Some versions of bhyve have a bug that prevents guests from booting +until the console is opened by a client. This bug was fixed in FreeBSD +<a href="http://svnweb.freebsd.org/changeset/base/262884">r262884</a>. If +an older version is used, one either have to open a console manually with <code>virsh console</code> +to let a guest boot or start a guest using:</p> + +<pre>start --console domname</pre> + + </body> </html> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index e851f85..a937e42 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4721,6 +4721,35 @@ qemu-kvm -net nic,model=? /dev/null </devices> ...</pre> + <h6><a name="elementsNmdm">Nmdm device</a></h6> + + <p> + The nmdm device driver, available on FreeBSD, provides two + tty devices connected together by a virual null modem cable. + <span class="since">Since 1.2.4</span> + </p> + +<pre> + ... + <devices> + <serial type="nmdm"> + <source master="/dev/nmdm0A" slave="/dev/nmdm0B"/> + </serial> + </devices> + ...</pre> + + <p> + The <code>source</code> element has these attributes: + </p> + + <dl> + <dt><code>master</code></dt> + <dd>Master device of the pair, that is passed to the hypervisor.</dd> + + <dt><code>slave</code></dt> + <dd>Slave device of the pair, that is passed to the clients for connection + to the guest console.</dd> + </dl> <h4><a name="elementsSound">Sound devices</a></h4> -- 1.9.0

2 2

[libvirt] [PATCH v3] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 24 Apr '14

24 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v3: - rebased on current master and this time it doesn't break startupPolicy for RAW disks v2: - smaller and cleaner variant of v1 [1] after discussion with Eric [1] https://www.redhat.com/archives/libvir-list/2014-April/msg00716.html src/qemu/qemu_domain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bb9cb6b..ab19738 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2268,8 +2268,18 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, VIR_DEBUG("Checking for disk presence"); for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; + const char *path = virDomainDiskGetSource(disk); + enum virStorageFileFormat format = virDomainDiskGetFormat(disk); - if (!virDomainDiskGetSource(disk)) + if (!path) + continue; + + /* There is no need to check the backing chain for disks + * without backing support, the fact that the file exists is + * more than enough */ + if (format >= VIR_STORAGE_FILE_NONE && + format < VIR_STORAGE_FILE_BACKING && + virFileExists(path)) continue; if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && -- 1.9.2

2 2

[libvirt] [PATCHv2 0/6] Utility functions for storing uninstalled location
by Nehal J Wani 24 Apr '14

24 Apr '14

When libvirtd is run from a build directory without being installed, it should not depend on files from a libvirt package installed in the system. Currently, APIs defined in src/ don't know whether libvirtd is being run from the build dir or the installed dir. The following additions provide the functionality to do so: virSetUninstalledDir virGetUninstalledDir Example usage (utility = lxc|iohelper): char *path_tmp = virGetUninstalledDir(); if (path_tmp) /* do stuff with ("%s/../../src/libvirt_<utility>", path_tmp) */ else /* do stuff with (LIBEXECDIR "/libvirt_<utility>") */ v1: Refer: https://www.redhat.com/archives/libvir-list/2014-March/msg01427.html Nehal J Wani (6): Add utility functions for storing uninstalled location Use virGetUninstalledDir() in src/util/virfile.c Use virGetUninstalledDir() in src/lxc/lxc_conf.c Use virGetUninstalledDir() in src/storage/storage_backend_disk.c Use virGetUninstalledDir() in src/fdstream.c Remove obsolete function virFDStreamSetIOHelper()

3 19

[libvirt] [PATCH 0/4] Publish disk backing chains in domain XML
by Jiri Denemark 24 Apr '14

24 Apr '14

This series depends on Peter's "Get rid of virStorageFileMetadata" sent about 10 hours ago. Jiri Denemark (4): conf: Output disk backing store details in domain XML conf: Format and parse backing chains in domain XML tests: More output options for xml2xml tests tests: Test backing store XML formatting and parsing docs/formatdomain.html.in | 59 ++++++++++ docs/schemas/domaincommon.rng | 48 +++++++- src/conf/domain_conf.c | 128 +++++++++++++++++++++ tests/domainschemadata/backing-chains.xml | 94 +++++++++++++++ .../qemuxml2argv-disk-backing-chains.xml | 94 +++++++++++++++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 + .../qemuxml2argv-seclabel-static-labelskip.xml | 1 + .../qemuxml2xmlout-disk-backing-chains-active.xml | 96 ++++++++++++++++ ...qemuxml2xmlout-disk-backing-chains-inactive.xml | 59 ++++++++++ tests/qemuxml2xmltest.c | 46 ++++++-- tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 1 + tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 1 + tests/sexpr2xmldata/sexpr2xml-curmem.xml | 1 + .../sexpr2xml-disk-block-shareable.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 1 + .../sexpr2xml-disk-drv-blktap-qcow.xml | 1 + .../sexpr2xml-disk-drv-blktap-raw.xml | 1 + .../sexpr2xml-disk-drv-blktap2-raw.xml | 1 + tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 1 + tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml | 2 + .../sexpr2xml-fv-serial-dev-2-ports.xml | 2 + .../sexpr2xml-fv-serial-dev-2nd-port.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml | 2 + .../sexpr2xml-fv-serial-tcp-telnet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 2 + tests/sexpr2xmldata/sexpr2xml-fv.xml | 2 + tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 1 + tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 1 + tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml | 2 + tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 1 + .../sexpr2xml-pv-bootloader-cmdline.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 1 + .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml | 1 + .../sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml | 1 + tests/sexpr2xmldata/sexpr2xml-pv.xml | 1 + 61 files changed, 691 insertions(+), 16 deletions(-) create mode 100644 tests/domainschemadata/backing-chains.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-backing-chains.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-backing-chains-inactive.xml -- 1.9.2

2 9

[libvirt] [PATCH v2] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 24 Apr '14

24 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Smaller and cleaner variant of v1 [1] after discussion with Eric [1] https://www.redhat.com/archives/libvir-list/2014-April/msg00716.html src/qemu/qemu_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 45ed872..5687075 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2268,11 +2268,14 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, VIR_DEBUG("Checking for disk presence"); for (i = vm->def->ndisks; i > 0; i--) { disk = vm->def->disks[i - 1]; + enum virStorageFileFormat format = virDomainDiskGetFormat(disk); if (!virDomainDiskGetSource(disk)) continue; - if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && + if ((format < VIR_STORAGE_FILE_NONE || + format >= VIR_STORAGE_FILE_BACKING) && + qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && qemuDiskChainCheckBroken(disk) >= 0) continue; -- 1.9.2

2 2

[libvirt] [PATCH 00/18] Get rid of virStorageFileMetadata
by Peter Krempa 24 Apr '14

24 Apr '14

Peter Krempa (18): qemu: unexport qemuDiskChainCheckBroken util: storagefile: Always store raw backing name in the metadata util: storage: Don't force path canonicalization when loading metadata util: storage: Remove obsolete argument virStorageFileGetMetadataInternal util: storage: Move checking of the actual backing image to the worker storage: util: Clean up arguments of virStorageFileGetMetadataInternal util: storage: Rename "path" to "relPath" in virStorageFileMetadata util: storagefile: Rename "canonPath" to "path" in virStorageFileMetadata util: virstoragefile: Don't use "backingStore" directly virstoragefile: Kill "backingStore" field from virStorageFileMetadata util: storagefile: Add function to free a virStorageSourcePrt util: storagefile: Add fields from virStorageMetadata to virStorageSource maint: Switch over from struct virStorageFileMetadata to virStorageSource util: virstorage: Kill struct virStorageFileMetadata util: virstoragefile: Rename backingMeta to backingStore storage: Move disk->backingChain to the recursive disk->src.backingStore util: virstoragefile: Don't mangle data stored about directories util: storage: Invert the way recursive metadata retrieval works src/conf/domain_conf.c | 17 +- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 58 ++--- src/qemu/qemu_domain.h | 2 - src/qemu/qemu_driver.c | 44 ++-- src/security/security_selinux.c | 2 +- src/security/virt-aa-helper.c | 9 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_gluster.c | 4 +- src/util/virstoragefile.c | 476 ++++++++++++++++------------------ src/util/virstoragefile.h | 88 +++---- tests/virstoragetest.c | 178 ++++++++----- 13 files changed, 435 insertions(+), 450 deletions(-) -- 1.9.1

2 46

[libvirt] KVM connection issue
by Vikas Kokare 24 Apr '14

24 Apr '14

We are using Libvirt Java API version 0.5.0 to connect RHEL 5 KVM, and fetch KVM environment attributes. While doing it, we are seeing the following exception: *this function is not supported by the connection driver: qemuGetSchedulerTypeStack trace: org.libvirt.ErrorHandler.processError(Unknown Source) org.libvirt.Connect.processError(Unknown Source) org.libvirt.Domain.processError(Unknown Source) org.libvirt.Domain.getSchedulerType(Unknown Source)* The machine that is running the Java code to connect to the KVM is also RHEL 5. Is this related to certain libvirt version mismatch or something not supported? -Vikas

1 0

[libvirt] [PATCHv2 1/1] Set pci-ohci as the USB default controller for PPC64.
by Li Zhang 24 Apr '14

24 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> PPC64 prefers to set pci-ohci controller as default USB controller. Currently, libvirt is using legacy USB controller as default. There are problems with VGA which can't work correctly with USB Keyboard and USB Mouse. While providing -nodefaults, ppc64 should be specifying the usb controller explicitly in place of using the legacy controller(-usb). Qemu spapr initialization code when sees "-usb" adds a USB Keyboard and USB Mouse by default. And libvirt has added a USB keyboard and USB mouse. A recent fix in the in qemu VGA code uncoverd this problem, which resulted in addition of extra keyboard and mouse to the qemu machine. This patch is to set pci-ohci as USB default controller. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- v2 -> v1: * Rephrase the commit message. (Nikunj A Dadhania) src/qemu/qemu_command.c | 5 +++-- tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 379c094..46e851a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8466,8 +8466,9 @@ qemuBuildCommandLine(virConnectPtr conn, } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && cont->model == -1 && !qemuDomainMachineIsQ35(def) && - (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || - def->os.arch == VIR_ARCH_PPC64)) { + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI) || + (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_OHCI) && + def->os.arch == VIR_ARCH_PPC64))) { if (usblegacy) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controllers are " diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args index 3a21b76..eac7c56 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -nographic -nodefconfig -nodefaults \ -chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ -mon chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c \ --usb -chardev pty,id=charserial0 \ +-device pci-ohci,id=usb,bus=pci,addr=0x1 -chardev pty,id=charserial0 \ -device spapr-vty,chardev=charserial0,reg=0x30000000 -- 1.8.2.1

2 3

[libvirt] [PATCH] Qemu fails to restore when guest has selinux static context
by Shivaprasad G Bhat 23 Apr '14

23 Apr '14

The file handle passed from libvirt to qemu is not set to the context of the guest. So, set the selinux context of fd before passing it to qemu Signed-off-by: Shivaprasad G Bhat<sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bb4819..8cf3666 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5522,6 +5522,9 @@ qemuDomainRestoreFlags(virConnectPtr conn, goto cleanup; def = NULL; + if (virSecurityManagerSetImageFDLabel(driver->securityManager, vm->def, fd) < 0) + goto cleanup; + if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup;

3 2

[libvirt] [PATCH] Fix pci bus naming for PPC
by Daniel P. Berrange 23 Apr '14

23 Apr '14

Recent discussions around naming of 'pci' vs 'pci.0' for PPC made me go back and look at the PPC emulator in every historical version of QEMU since 1.0. The results were worse than I imagined. This patch adds the logic required to make libvirt work with PPC correctly with naming variations across all versions & machine types. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 80 +++++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_capabilities.h | 3 ++ src/qemu/qemu_command.c | 2 +- 3 files changed, 75 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a5c6879..b491f58 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1928,6 +1928,56 @@ virQEMUCapsGet(virQEMUCapsPtr qemuCaps, } +bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, + virDomainDefPtr def) +{ + bool hasMultiBus = virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + + if (hasMultiBus) + return true; + + if (def->os.arch == VIR_ARCH_PPC || + def->os.arch == VIR_ARCH_PPC64) { + /* + * Usage of pci.0 naming: + * + * ref405ep: no pci + * taihu: no pci + * bamboo: 1.1.0 + * mac99: 2.0.0 + * g3beige: 2.0.0 + * prep: 1.4.0 + * pseries: 2.0.0 + * mpc8544ds: forever + * virtex-m507: no pci + * ppce500: 1.6.0 + */ + + if (qemuCaps->version >= 2000000) + return true; + + if (qemuCaps->version >= 1006000 && + STREQ(def->os.machine, "ppce500")) + return true; + + if (qemuCaps->version >= 1004000 && + STREQ(def->os.machine, "prep")) + return true; + + if (qemuCaps->version >= 1001000 && + STREQ(def->os.machine, "bamboo")) + return true; + + if (STREQ(def->os.machine, "mpc8544ds")) + return true; + + return false; + } + + return false; +} + + const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps) { return qemuCaps->binary; @@ -2809,15 +2859,22 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) false) < 0) goto cleanup; - /* Currently only x86_64 and i686 support PCI-multibus. */ + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever. For other architectures, it has been changing + * across releases, per machine type, so we can't simply detect + * it here. Thus the rest of the logic is provided in a separate + * helper virQEMUCapsHasPCIMultiBus() which keys off the machine + * stored in virDomainDef and QEMU version number + */ if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + qemuCaps->arch == VIR_ARCH_I686) virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - } else { - /* -no-acpi is not supported on other archs - * even if qemu reports it in -help */ + + /* -no-acpi is not supported on non-x86 + * even if qemu reports it in -help */ + if (qemuCaps->arch != VIR_ARCH_X86_64 && + qemuCaps->arch != VIR_ARCH_I686) virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); - } /* virQEMUCapsExtractDeviceStr will only set additional caps if qemu * understands the 0.13.0+ notion of "-device driver,". */ @@ -2934,9 +2991,14 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, goto cleanup; } - /* - * Currently only x86_64 and i686 support PCI-multibus, - * -no-acpi and -no-kvm-pit-reinjection. + /* x86_64 and i686 support PCI-multibus on all machine types + * since forever. For other architectures, it has been changing + * across releases, per machine type, so we can't simply detect + * it here. Thus the rest of the logic is provided in a separate + * helper virQEMUCapsHasPCIMultiBus() which keys off the machine + * stored in virDomainDef and QEMU version number + * + * ACPI/HPET/KVM PIT are also x86 specific */ if (qemuCaps->arch == VIR_ARCH_X86_64 || qemuCaps->arch == VIR_ARCH_I686) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index df8c978..5c63b81 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -239,6 +239,9 @@ void virQEMUCapsClear(virQEMUCapsPtr qemuCaps, bool virQEMUCapsGet(virQEMUCapsPtr qemuCaps, enum virQEMUCapsFlags flag); +bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps, + virDomainDefPtr def); + char *virQEMUCapsFlagsString(virQEMUCapsPtr qemuCaps); const char *virQEMUCapsGetBinary(virQEMUCapsPtr qemuCaps); diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 91367ab..403c9a9 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3076,7 +3076,7 @@ qemuBuildDeviceAddressStr(virBufferPtr buf, goto cleanup; } } else { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS)) { + if (virQEMUCapsHasPCIMultiBus(qemuCaps, domainDef)) { virBufferAsprintf(buf, ",bus=%s", contAlias); } else { virBufferAddLit(buf, ",bus=pci"); -- 1.9.0

2 1

[libvirt] [PATCH] nwfilter: Validate rule after parsing
by Stefan Berger 23 Apr '14

23 Apr '14

From: Stefan Berger <stefanb(a)linux.vnet.ibm.com> An IP or IPv6 rule with port specification but without protocol specification cannot be instantiated by ebtables. The documentation points to 'protocol' being required but implementation does not enforce it to be given. Implement a rule validation function that checks whether the rule is valid when it is defined. This for example prevents the definition of rules like: <ip dstportstart='53'> where a protocol attribute would be required for it to be valid and for ebtables to be able to instantiate it. A valid rule then is: <ip protocol='udp' dstportstart='53'> Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/conf/nwfilter_conf.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f5a75e4..ce7bc78 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2093,6 +2093,63 @@ virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr) } } + +/* + * virNWFilterRuleValidate + * + * Perform some basic rule validation to prevent rules from being + * defined that cannot be instantiated. + */ +static int +virNWFilterRuleValidate(virNWFilterRuleDefPtr rule) +{ + int ret = 0; + portDataDefPtr portData = NULL; + const char *protocol; + + switch (rule->prtclType) { + case VIR_NWFILTER_RULE_PROTOCOL_IP: + portData = &rule->p.ipHdrFilter.portData; + protocol = "IP"; + /* fall through */ + case VIR_NWFILTER_RULE_PROTOCOL_IPV6: + if (portData == NULL) { + portData = &rule->p.ipv6HdrFilter.portData; + protocol = "IPv6"; + } + if (HAS_ENTRY_ITEM(&portData->dataSrcPortStart) || + HAS_ENTRY_ITEM(&portData->dataDstPortStart) || + HAS_ENTRY_ITEM(&portData->dataSrcPortEnd) || + HAS_ENTRY_ITEM(&portData->dataDstPortEnd)) { + if (HAS_ENTRY_ITEM(&rule->p.ipHdrFilter.ipHdr.dataProtocolID)) { + switch (rule->p.ipHdrFilter.ipHdr.dataProtocolID.u.u8) { + case 6: /* tcp */ + case 17: /* udp */ + case 33: /* dccp */ + case 132: /* sctp */ + break; + default: + ret = -1; + } + } else { + ret = -1; + } + if (ret < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s rule with port specification requires " + "protocol specification with protocol to be " + "either one of tcp(6), udp(17), dccp(33), or " + "sctp(132)"), protocol); + } + } + break; + default: + break; + } + + return ret; +} + static void virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule) { @@ -2389,6 +2446,8 @@ virNWFilterRuleParse(xmlNodePtr node) virAttr[i].att) < 0) { goto err_exit; } + if (virNWFilterRuleValidate(ret) < 0) + goto err_exit; break; } if (!found) { -- 1.8.1.4

2 1

[libvirt] [PATCHv2 0/7] more of round 2 of virstoragefile refactoring
by Eric Blake 23 Apr '14

23 Apr '14

compared to v1, this is rebased on top of Cole's changes, treats disk partition types slightly differently, and adds a couple patches. 1/7: was 16/n, unreviewed so far 2/7: was 13/n with weak ack 3-4/7: was 14-15/n; commit messages improved to justify it further 5-7: all new patches I'm still working on how best to fold virStorageFileMetadata into virStorageSource; it's a bit tricky since the metadata type is rather awkward (storing type information about the backing file in the parent, rather than in the backing file) Eric Blake (7): conf: manage disk source by struct instead of pieces conf: tweak volume target struct details conf: move volume structs to util/ conf: use common struct in storage volumes conf: track sizes directly in source struct conf: drop redundant parameters during probe conf: modify tracking of encrypted images src/conf/domain_conf.c | 139 ++++++++++++------------------ src/conf/domain_conf.h | 24 ++---- src/conf/snapshot_conf.c | 17 +--- src/conf/storage_conf.c | 40 ++++----- src/conf/storage_conf.h | 51 ++--------- src/esx/esx_storage_backend_iscsi.c | 5 +- src/esx/esx_storage_backend_vmfs.c | 20 ++--- src/parallels/parallels_driver.c | 2 +- src/parallels/parallels_storage.c | 22 ++--- src/phyp/phyp_driver.c | 4 +- src/storage/storage_backend.c | 150 +++++++++++++++------------------ src/storage/storage_backend.h | 11 +-- src/storage/storage_backend_disk.c | 26 +++--- src/storage/storage_backend_fs.c | 32 +++---- src/storage/storage_backend_gluster.c | 12 ++- src/storage/storage_backend_logical.c | 18 ++-- src/storage/storage_backend_mpath.c | 8 +- src/storage/storage_backend_rbd.c | 11 +-- src/storage/storage_backend_scsi.c | 6 +- src/storage/storage_backend_sheepdog.c | 10 +-- src/storage/storage_driver.c | 40 ++++----- src/test/test_driver.c | 16 ++-- src/util/virstoragefile.c | 11 ++- src/util/virstoragefile.h | 30 ++++++- src/vbox/vbox_tmpl.c | 11 +-- tests/storagebackendsheepdogtest.c | 5 +- tests/virstoragetest.c | 4 +- 27 files changed, 322 insertions(+), 403 deletions(-) -- 1.9.0

3 18

[libvirt] [PATCH 0/2] Two more setvcpu fixes
by Ján Tomko 23 Apr '14

23 Apr '14

Fix fix fix. Ján Tomko (2): Save domain status after cpu hotplug Document behavior of setvcpus during guest boot src/libvirt.c | 6 ++++++ src/qemu/qemu_driver.c | 3 +++ tools/virsh.pod | 4 +++- 3 files changed, 12 insertions(+), 1 deletion(-) -- 1.8.3.2

2 5

[libvirt] [PATCH] bhyve: bhyveDomainDefineXML fixes
by Roman Bogorodskiy 23 Apr '14

23 Apr '14

- do not loose new definition for an active domain - do not leak oldDef - do not set dom->id if virDomainSaveConfig() fails - do not call virObjectUnlock(vm) if vm is NULL --- src/bhyve/bhyve_driver.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 0cafe4c..6d681fd 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -472,17 +472,23 @@ bhyveDomainDefineXML(virConnectPtr conn, const char *xml) def = NULL; vm->persistent = 1; + if (virDomainSaveConfig(BHYVE_CONFIG_DIR, + vm->newDef ? vm->newDef : vm->def) < 0) { + virDomainObjListRemove(privconn->domains, vm); + vm = NULL; + goto cleanup; + } + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) dom->id = vm->def->id; - if (virDomainSaveConfig(BHYVE_CONFIG_DIR, vm->def) < 0) - goto cleanup; - cleanup: virObjectUnref(caps); virDomainDefFree(def); - virObjectUnlock(vm); + virDomainDefFree(oldDef); + if (vm) + virObjectUnlock(vm); return dom; } -- 1.9.0

2 2

[libvirt] Google Summer of Code and Outreach Program for Women accepted projects
by Stefan Hajnoczi 23 Apr '14

23 Apr '14

Dear QEMU, Libvirt, and KVM communities, We are participating in Google Summer of Code 2014 (http://google-melange.com/) and Outreach Program for Women (http://opw.gnome.org/) Both programs fund candidates to work on our open source projects for 12 weeks this summer. Accepted projects have now been announced: Intel IOMMU (VT-d) Emulation - Candidate: Le Tan Mentor: Jan Kiszka Device driver framework for low-level testing - Candidate: Marc Marí Mentors: Paolo Bonzini and Stefan Hajnoczi Disk image fuzz testing - Candidate: Maria Kustova (maxa) Mentors: Fam Zheng and Stefan Hajnoczi TianoCore support for Apple's boot.efi - Candidate: Reza Jelveh Mentors: Alexander Graf and Gabriel Somlo Continuous vmstate testing and dirty bitmap logging - Candidate: sanidhya Mentor: Juan Quintela Rewriting code of vbox driver for libvirt - Candidate: T A Mahadevan Mentor: Michal Privoznik Libvirt: Job Control for the Storage Driver - Candidate: TuckerD Mentor: Martin Kletzander Applying for the idea rewrite virtual box's driver - Candidate: uaedante Mentor: Michal Privoznik Congratulations to our accepted candidates and welcome to the QEMU, libvirt, and KVM communities! Stefan

1 0

[libvirt] Local storage-migration plus network disks (Ceph RBD)
by Blair Bethwaite 23 Apr '14

23 Apr '14

Hi there, We have a production OpenStack cloud, currently on Qemu 1.0 & 1.5 with Libivrt 1.1.1. We're using local storage with storage-migration when we need to move machines around. Since we built this thing we've noticed that with network storage attached (have seen this with iSCSI and Ceph RBD targets, mainly interested in the latter) the migration moves all of the network disk contents as well, which for any non-toy disk sizes pretty much renders it useless as the migration is then bounded not by the guest memory size and activity but also by the block storage size. E.g., an idle guest with 8GB RAM and a 300GB Ceph RBD attached takes ~3 hours to migrate (over a 20GE network) and we observe balanced TX/RX on both the source and destination, as the source reads blocks from the Ceph cluster, streams them to the destination, and the destination in turn writes them back to the Ceph cluster. Looking in Libvirt's qemu_migration.c code I see qemuMigrationDriveMirror skips shared, RO and source-less disks. But I'm not sure why network disks in general, and in particular RBDs, wouldn't be considered shared for these purposes. From my naive reading the checks in qemuMigrationIsSafe (which explicitly pass NETWORK+RBD) seem to confirm this, at least for RBDs. Is this a bug? -- Cheers, ~Blairo

1 0

[libvirt] [PATCH perl-Sys-Virt] Don't die if snapshots are unsupported
by Mike Latimer 22 Apr '14

22 Apr '14

Many libvirt-tck tests do not explicitly cleanup test domains before exiting. In this case Sys::Virt::TCK->cleanup is triggered, and the environment is reset automatically. During this reset, any existing snapshots are found for deletion through Sys::Virt::Domain->list_snapshots. If the underlying connection driver does not support snapshot functions (such as lxc or libxl), the process dies with the following error: libvirt error code: 3, message: this function is not supported by the connection driver: virDomainSnapshotListNames The best resolution would be to add snapshot support to the driver(s), but as this requires a long term effort, it is better to catch the error and return an empty list of snapshots to the calling function. In the case of libvirt-tck, this allows the cleanup to succeed and subsequent testing to continue normally. --- Domain.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/lib/Sys/Virt/Domain.pm 2014-04-07 04:35:31.000000000 -0600 +++ b/lib/Sys/Virt/Domain.pm 2014-04-21 13:48:22.868956838 -0600 @@ -1416,7 +1416,10 @@ recommended as a more efficient alternat sub list_snapshots { my $self = shift; - my $nnames = $self->num_of_snapshots(); + # If snapshots are not supported by the driver (lxc, libxl...), catch the + # function not supported error and simply return as there are no snapshots + my $nnames = eval { $self->num_of_snapshots() }; + return if($@ =~ /function is not supported/); my @names = $self->list_snapshot_names($nnames); my @snapshots;

2 2

[libvirt] [PATCH] nodeinfo: fix detection of physical memory on uclibc/musl libc
by Natanael Copa 22 Apr '14

22 Apr '14

The gnulib's physmem_total will as a fallback report 64MB as total memory if sysconf(_SC_PHYS_PAGES) is unimplemented on linux. This makes it impossible to detect if physmem_total works or not, so we try first the linux only sysinfo(2) before falling back to gnulibs physmem_total. This makes the total memory be correctly reported on musl libc and uclibc. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- configure.ac | 2 +- src/nodeinfo.c | 22 ++++++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 52c50df..32a2e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -310,7 +310,7 @@ dnl Availability of various common headers (non-fatal if missing). AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/un.h \ sys/poll.h syslog.h mntent.h net/ethernet.h linux/magic.h \ sys/un.h sys/syscall.h sys/sysctl.h netinet/tcp.h ifaddrs.h \ - libtasn1.h sys/ucred.h sys/mount.h]) + libtasn1.h sys/ucred.h sys/mount.h sys/sysinfo.h]) dnl Check whether endian provides handy macros. AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]]) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c88f86c..3c76f54 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -40,6 +40,10 @@ # include <sys/resource.h> #endif +#if HAVE_SYS_SYSINFO_H +# include <sys/sysinfo.h> +#endif + #include "c-ctype.h" #include "viralloc.h" #include "nodeinfopriv.h" @@ -1041,7 +1045,18 @@ int nodeGetInfo(virNodeInfoPtr nodeinfo) #ifdef __linux__ { int ret = -1; - FILE *cpuinfo = fopen(CPUINFO_PATH, "r"); + FILE *cpuinfo; +#if HAVE_SYS_SYSINFO_H + struct sysinfo si; + + /* Convert to KB. */ + if (sysinfo(&si) == 0) { + nodeinfo->memory = si.totalram / 1024; + } else +#endif + nodeinfo->memory = physmem_total() / 1024; + + cpuinfo = fopen(CPUINFO_PATH, "r"); if (!cpuinfo) { virReportSystemError(errno, _("cannot open %s"), CPUINFO_PATH); @@ -1049,11 +1064,6 @@ int nodeGetInfo(virNodeInfoPtr nodeinfo) } ret = linuxNodeInfoCPUPopulate(cpuinfo, SYSFS_SYSTEM_PATH, nodeinfo); - if (ret < 0) - goto cleanup; - - /* Convert to KB. */ - nodeinfo->memory = physmem_total() / 1024; cleanup: VIR_FORCE_FCLOSE(cpuinfo); -- 1.9.2

3 6

[libvirt] [PATCH 0/3] vcpu fixes
by Ján Tomko 22 Apr '14

22 Apr '14

Ján Tomko (3): Properly free vcpupin info for unplugged CPUs Make virDomainVcpuPinDel return void Fix error for out of range vcpu in qemuDomainPinVcpuFlags src/conf/domain_conf.c | 31 ++----------------------------- src/conf/domain_conf.h | 5 +---- src/libvirt_private.syms | 1 - src/libxl/libxl_driver.c | 7 +------ src/qemu/qemu_driver.c | 22 ++++------------------ 5 files changed, 8 insertions(+), 58 deletions(-) -- 1.8.3.2

2 6

[libvirt] Proper behavior when "creating" a new transient domain with same name/uuid as existing persistent domain
by Laine Stump 22 Apr '14

22 Apr '14

Playing around with the network driver I found that if I net-define a network, then net-create using a slightly modified version of the same XML file (e.g. different bridge name, but same name/uuid) the following will happen: 1) a network of that name is started, it is persistent, and it has the properties from the modified XML file (the one given to net-create). 2) both "net-dumpxml" and "net-dumpxml --inactive" will show the modified attributes. 3) when I net-destroy the network, the network will still exist (since it is still persistent), but will have all of the modified attributes rather than the originals. Wanting the network driver to behave consistently with the qemu driver, I did the same test with a qemu domain. I found exactly the same behavior. I would have expected that when I tried to create a domain (or network) with the same name & UUID as an existing persistent&inactive domain (or network) that one of the following two things would happen: 1) the operation would fail because a persistent domain/network already existed 2) the domain/network would be started with the modified attributes, but the persistent definition would still show the original attributes, which would remain after destroying the transient 3) upon creating the transient version, the domain/network would have its persistent flag cleared, and would thus cease to exist when destroyed. Was the current behavior consciously arrived at, or is it just an accident of circumstances? If the latter, then what should the proper behavior be? (I would vote for (2))

3 3

[libvirt] [PATCH v2] Add support for migration URI configuration
by Chen Fan 22 Apr '14

22 Apr '14

For now, we set the migration URI from command line '--migrate_uri' or construct the URI by looking up the dest host's hostname which could be solved by DNS automatically. But in cases the dest host have two or more NICs to reach, we may need to send the migration data over a specific NIC which is different from the automatically resloved one for some reason like performance, security, etc. thus we must explicitly specify the migrateuri in command line everytime, but it is too troublesome if there are many such hosts(and don't forget virt-manager). This patch adds a configuration file option on dest host to save the default migrate uri which explicitly configure which of this host's addresses should be used to transfer, thus user doesn't boring to specify it in command line everytime. Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- src/qemu/qemu.conf | 5 ++++- src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_migration.c | 5 +++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index f0e802f..2973631 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -449,7 +449,10 @@ # #seccomp_sandbox = 1 - +# Override the URI used for any specific migration URI to be sent. +# Defaults to NULL, will be set to as "tcp://hostIP[:port]". +# +#migrate_uri = "tcp://hostIP:port" # Override the listen address for all incoming migrations. Defaults to # 0.0.0.0, or :: if both host and qemu are capable of IPv6. diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 198ee2f..0bd943d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -576,6 +576,8 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("migration_address", cfg->migrationAddress); + GET_VALUE_STR("migrate_uri", cfg->migrateUri); + ret = 0; cleanup: diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index a36ea63..2e45421 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -167,6 +167,8 @@ struct _virQEMUDriverConfig { char *migrationAddress; int migrationPortMin; int migrationPortMax; + + char *migrateUri; }; /* Main driver state */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 593d2d3..ab64c58 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2639,6 +2639,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, int ret = -1; virURIPtr uri = NULL; bool well_formed_uri = true; + virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " @@ -2649,6 +2650,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, *uri_out = NULL; + if (uri_in == NULL && cfg->migrateUri) { + uri_in = cfg->migrateUri; + } + /* The URI passed in may be NULL or a string "tcp://somehostname:port". * * If the URI passed in is NULL then we allocate a port number -- 1.8.1.4

2 1

[libvirt] [test-API][PATCH V2 0/2] Add case for setSchedulerParametersFlag API
by Xuesong Zhang 22 Apr '14

22 Apr '14

V1->V2: Delete the symbol '\' at the end of lines. Update the domian stats to "libvirt.VIR_DOMAIN_RUNNING" and "libvirt.VIR_DOMAIN_SHUTOFF", instead of the static value. Delete the scenario without flags in file shed_parms.conf V1: Add test case for setSchedulerParametersFlags related API Add conf file of setSchedulerParametersFlags test Xuesong Zhang (2): Add new cases for testing setSchedulerParametersFlags related API Add scenario conf file for testing setSchedulerParametersFlags related API cases/sched_params.conf | 106 ++++++++++++++++++++++++++ repos/domain/sched_params_flag.py | 155 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100755 cases/sched_params.conf create mode 100755 repos/domain/sched_params_flag.py -- 1.8.3.1

1 2

[libvirt] libvirt-libxl driver defaulting to tap disk and not working (ubuntu 12.10 + xen 4.5 + libvirt 1.2.3 + openstack)
by Tian, Shuangtai 22 Apr '14

22 Apr '14

HI I am an openstacker, when I used the latest libvirt and xen code to run the openstack. Can not create the vm. there is an error in libxl log, you can see the log: Os : Ubuntu 12.10 Compiled against library: libvirt 1.2.3 Using library: libvirt 1.2.3 Using API: Xen 1.2.3 Running hypervisor: Xen 4.5.0 libxl: debug: libxl_create.c:1356:do_domain_create: ao 0x7f7894002810: create: how=(nil) callback=(nil) poller=0x7f7894001bb0 libxl: debug: libxl_device.c:251:libxl__device_disk_set_backend: Disk vdev=xvda spec.backend=tap libxl: debug: libxl_device.c:210:disk_try_backend: Disk vdev=xvda, backend tap unsuitable because blktap not available libxl: error: libxl_device.c:289:libxl__device_disk_set_backend: no suitable backend for disk xvda libxl: debug: libxl_event.c:1739:libxl__ao_complete: ao 0x7f7894002810: complete, rc=-3 libxl: debug: libxl_create.c:1370:do_domain_create: ao 0x7f7894002810: inprogress: poller=0x7f7894001bb0, flags=ic libxl: debug: libxl_event.c:1711:libxl__ao__destroy: ao 0x7f7894002810: destroy The blktap does work, and I also find the same error someone has posted, (http://www.redhat.com/archives/libvir-list/2013-February/msg01124.html) When I change the type to "phy", it also doesnot work. And try to change the type to other options, also does not work. Can someone give me some suggestions? Thanks ! The XML from the openstack is : <domain type="xen"> <uuid>9e9ed86c-8892-40da-acd1-31ec6303abfe</uuid> <name>instance-00000001</name> <memory>524288</memory> <vcpu>1</vcpu> <os> <type>xen</type> <kernel>/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/kernel</kernel> <initrd>/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/ramdisk</initrd> <cmdline>ro root=/dev/xvda</cmdline> </os> <features> <acpi/> <apic/> </features> <clock offset="utc"/> <devices> <disk type="file" device="disk"> <driver name="tap2" type="raw" cache="none"/> <source file="/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/disk"/> <target bus="xen" dev="xvda"/> </disk> <disk type="file" device="cdrom"> <driver name="tap2" type="raw" cache="none"/> <source file="/opt/stack/data/nova/instances/9e9ed86c-8892-40da-acd1-31ec6303abfe/disk.config"/> <target bus="ide" dev="xvdd"/> </disk> <interface type="bridge"> <mac address="fa:16:3e:d8:c3:c0"/> <source bridge="br100"/> <filterref filter="nova-instance-instance-00000001-fa163ed8c3c0"/> </interface> <console type="pty"/> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1"/> <video> <model type="xen"/> </video> </devices> </domain> Best regards, Tian, Shuangtai

4 7

[libvirt] [PATCH] qemu: don't check for backing chains for formats w/o snapshot support
by Martin Kletzander 22 Apr '14

22 Apr '14

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1019926 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=868673 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.c | 3 +++ src/util/virstoragefile.c | 15 +++++++++++++++ src/util/virstoragefile.h | 2 ++ 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0e81f2f..42c0185 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1834,6 +1834,7 @@ virStorageFileIsClusterFS; virStorageFileProbeFormat; virStorageFileProbeFormatFromBuf; virStorageFileResize; +virStorageFormatMaySupportSnapshots; virStorageIsFile; virStorageNetHostDefClear; virStorageNetHostDefCopy; @@ -1850,7 +1851,6 @@ virStorageSourcePoolModeTypeToString; virStorageTypeFromString; virStorageTypeToString; - # util/virstring.h virArgvToString; virAsprintfInternal; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index cdd4601..abc2a68 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2250,6 +2250,9 @@ qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, if (!virDomainDiskGetSource(disk)) continue; + if (!virStorageFormatMaySupportSnapshots(disk->src.format)) + continue; + if (qemuDomainDetermineDiskChain(driver, vm, disk, false) >= 0 && qemuDiskChainCheckBroken(disk) >= 0) continue; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ea80c1d..c781a6b 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1730,3 +1730,18 @@ virStorageSourceClear(virStorageSourcePtr def) virStorageNetHostDefFree(def->nhosts, def->hosts); virStorageSourceAuthClear(def); } + +bool +virStorageFormatMaySupportSnapshots(enum virStorageFileFormat format) +{ + if (format == VIR_STORAGE_FILE_AUTO || + format == VIR_STORAGE_FILE_AUTO_SAFE) + return true; + + /* Better safe than sorry */ + if (format <= VIR_STORAGE_FILE_NONE || + format >= VIR_STORAGE_FILE_LAST) + return false; + + return !!fileTypeInfo[format].getBackingStore; +} diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1b8b14f..bcbfb88 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -339,4 +339,6 @@ void virStorageSourcePoolDefFree(virStorageSourcePoolDefPtr def); void virStorageSourceClear(virStorageSourcePtr def); int virStorageSourceGetActualType(virStorageSourcePtr def); +bool virStorageFormatMaySupportSnapshots(enum virStorageFileFormat format); + #endif /* __VIR_STORAGE_FILE_H__ */ -- 1.9.2

2 2

[libvirt] [PATCH 1/2] util: introduce virDirRead wrapper for readdir
by Natanael Copa 22 Apr '14

22 Apr '14

Introduce a wrapper for readdir. This helps us make sure that we always set errno before calling readdir and it will make sure errors are properly logged. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/util/virfile.c | 14 ++++++++++++++ src/util/virfile.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index 3eb2703..b54b9fd 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -2295,6 +2295,20 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED, } #endif /* WIN32 */ +/* return 0 = success, 1 = end-of-dir and -1 = error */ +int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname) +{ + errno = 0; + *ent = readdir(dirp); + if (!*ent && errno) { + if (dirname) + virReportSystemError(errno, _("Unable to read directory '%s'"), + dirname); + return -1; + } + return !*ent; +} + static int virFileMakePathHelper(char *path, mode_t mode) { diff --git a/src/util/virfile.h b/src/util/virfile.h index 46ef781..622a81b 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -27,6 +27,7 @@ # define __VIR_FILE_H_ # include <stdio.h> +# include <dirent.h> # include "internal.h" # include "virstoragefile.h" @@ -211,6 +212,8 @@ enum { }; int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid, unsigned int flags) ATTRIBUTE_RETURN_CHECK; +int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname); + int virFileMakePath(const char *path) ATTRIBUTE_RETURN_CHECK; int virFileMakePathWithMode(const char *path, mode_t mode) ATTRIBUTE_RETURN_CHECK; -- 1.9.2

2 5

Re: [libvirt] libvirt Hyper-v 2012 r2 fix
by vikhyath reddy 22 Apr '14

22 Apr '14

Bringing the discussion back online... Okay so figured out what was going on (to see what the actual error was, please read the latest email in the conversation). Classes in hyperv/hyperv_wmi_generator.input a) Msvm_MemorySettingData b) Msvm_ProcessorSettingData c) Msvm_VirtualSystemSettingData Have been upgraded to the definitions found at the new v2 doc http://msdn.microsoft.com/en-us/library/hh850176(v=vs.85).aspx, I put in this note at the beginning of the hyperv/hyperv_wmi_generator.input file. With these changes and a few other minor ones, I can confirm that the functionality mimics the hyperv 2008 version. That is, we get the same functionality (supported vs non-supported drivers). However, this might also mean the end of support of Hyper-V 2008 if it is just a replace of the existing classes. What do you guys think? Should we continue to support 2008 (~6 years old) OR is it OK to assume that Hyperv-V 2012 will be the default standard moving forward. Thanks, Vik. On Wed, Apr 16, 2014 at 10:23 AM, vikhyath reddy <reddy.vikhyath(a)gmail.com>wrote: > Taking this offline... > > Hi Matthias, > > Well... from more testing what I found is that openwsman breaks during > serialization. > > When I run against hyper-v 2012 r2 > > --------------------------------------------- > > virsh # list --all > > *1984 testing-1 running* > --------------------------------------------- > > virsh # dumpxml testing-1 > > *2014-04-16 16:53:54.049+0000: 10693: info : libvirt version: 1.2.3* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: not enough (0 < 1) instances of element SystemName* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: handling of element "**SystemName**" failed = -3* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: size of 1 structures "Msvm_VirtualSystemSettingData" > exceeds stopper (0x7fb86a4c5d18 > (nil))* > > *2014-04-16 16:53:54.049+0000: 10693: error : hypervDebugHandler:1403 : > openwsman error: Error during serialization* > > *error: internal error: Could not deserialize pull response item* > > *-------------------------------------------------* > > I was also looking at > http://www.redhat.com/archives/libvir-list/2011-July/msg00768.html and > found that you submitted a patch. It looks like from class > > > class Msvm_VirtualSystemSettingData > > > property *SystemName* > > > is being returned NULL or is is non existent in the pull response. Any pointers as to how can I check what is being returned in the pull response (if any)? > > > Thanks! > > Vik. > > > > On Wed, Apr 16, 2014 at 1:35 AM, Matthias Bolte < > matthias.bolte(a)googlemail.com> wrote: > >> 2014-04-16 3:26 GMT+02:00 vikhyath reddy <reddy.vikhyath(a)gmail.com>: >> > Update, >> > >> > I tried adding root\virtualization\v2 to the namespace in libvirt source >> > code for hyperv. I ran some tests and it seems to work. I get the same >> > functionality (supported vs non-supported drivers) as hyper-v 2008. >> > >> > Do you guys want me to submit the patch? If yes, what all do I need to >> > update to get the patch in? >> > >> > Thanks, >> > Vik. >> > >> > >> > On Tue, Apr 15, 2014 at 5:26 PM, vikhyath reddy < >> reddy.vikhyath(a)gmail.com> >> > wrote: >> >> >> >> Hello everyone, >> >> >> >> Thanks for libvirt. I did see on the libvirt page that hyper-v 2008 is >> >> supported (which it does). So I tried running it on Hyper-v 2012 r2 but >> >> virsh fails to connect by an error that says >> >> >> >> "error: internal error: SOAP fault during enumeration: code 's:Sender', >> >> subcode 'n:CannotProcessFilter', reason 'The data source could not >> process >> >> the filter. The filter might be missing or it might be invalid. Change >> the >> >> filter and try the request again. ', detail '500The specified class >> does >> >> not exist in the given namespace. HRESULT >> 0x8033801a0052150858778HRESULTThe >> >> specified class does not exist in the given namespace. ' " >> >> >> >> Upon looking into the Hyper-v 2012 r2 server event logs, I found that >> this >> >> is going on >> >> >> >> [ Source: WMI-Activity >> >> Event ID: 5898 >> >> Microsoft-Windows-WMI-Activity/Operational ] >> >> >> >> >> >> Id = {62D480B2-58EF-0000-E580-D462EF58CF01}; ClientMachine = >> >> VIKHYPERV; User = VIKHYPERV\Administrator; ClientProcessId = 884; >> >> Component = Unknown; Operation = Start IWbemServices::ExecQuery - >> >> root\virtualization : select * from Msvm_ComputerSystem where >> >> Description = "Microsoft Hosting Computer System" ; ResultCode = >> >> 0x80041010; PossibleCause = Unknown >> >> >> >> Note that Msvm_ComputerSystem is missing in the namespace >> >> root\virtualization. Upon further investigation, I found that the new >> >> namespace where Msvm_ComputerSystem is located is at >> root\virtualization\v2 >> >> >> >> Is (it possible?) there some way I can know where in the source code, >> >> libvirt is specifying the namespace so that I can try patching it up >> and see >> >> if it fixes things? >> >> >> >> Thanks for all your help, >> >> Vik. >> >> Yes, send a patch for this. >> >> To get your patch in, you need to send it to this list for review. >> After a successful review it'll be pushed to the git repo by someone >> with commit access. >> >> See http://libvirt.org/hacking.html for more details about working on >> the source and submitting patches. >> >> -- >> Matthias Bolte >> http://photron.blogspot.com >> > >

2 2

[libvirt] [PATCH] Fix typos in src/*
by Nehal J Wani 22 Apr '14

22 Apr '14

Fix minor typos in source comments --- src/esx/esx_driver.c | 2 +- src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/locking/lock_protocol.x | 2 +- src/openvz/openvz_conf.c | 4 ++-- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/security/security_selinux.c | 2 +- src/storage/storage_backend_fs.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/virstring.c | 2 +- src/vmware/vmware_conf.c | 2 +- src/xen/xs_internal.c | 4 ++-- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5b12bd4..d082927 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -3109,7 +3109,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml) /* * Build VMX datastore URL. Use the source of the first file-based harddisk * to deduce the datastore and path for the VMX file. Don't just use the - * first disk, because it may be CDROM disk and ISO images are normaly not + * first disk, because it may be CDROM disk and ISO images are normally not * located in the virtual machine's directory. This approach to deduce the * datastore isn't perfect but should work in the majority of cases. */ diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index 5509429..af516c0 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -460,7 +460,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, scsiLun = scsiLun->_next) { if (STREQ(scsiLun->deviceName, name)) { /* - * ScsiLun provides an UUID field that is unique accross + * ScsiLun provides an UUID field that is unique across * multiple servers. But this field length is ~55 characters * compute MD5 hash to transform it to an acceptable * libvirt format diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 2cfe939..cae53ed 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -386,7 +386,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path) /* * FIXME: calling backends blindly may set unwanted error codes * - * VMFS Datastore path follows cannonical format i.e.: + * VMFS Datastore path follows canonical format i.e.: * [<datastore_name>] <file_path> * WHEREAS * iSCSI LUNs device path follows normal linux path convention diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 36a50bd..1b9ace5 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -151,7 +151,7 @@ netcfStateReload(void) /* * Get a minimal virInterfaceDef containing enough metadata * for access control checks to be performed. Currently - * this implies existance of name and mac address attributes + * this implies existence of name and mac address attributes */ static virInterfaceDef * ATTRIBUTE_NONNULL(1) netcfGetMinimalDefForDevice(struct netcf_if *iface) diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 4fb8eab..b05ac0e 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -66,7 +66,7 @@ virUdevStatusString(virUdevStatus status) /* * Get a minimal virInterfaceDef containing enough metadata * for access control checks to be performed. Currently - * this implies existance of name and mac address attributes + * this implies existence of name and mac address attributes */ static virInterfaceDef * ATTRIBUTE_NONNULL(1) udevGetMinimalDefForDevice(struct udev_device *dev) diff --git a/src/locking/lock_protocol.x b/src/locking/lock_protocol.x index 354d51a..a77a784 100644 --- a/src/locking/lock_protocol.x +++ b/src/locking/lock_protocol.x @@ -77,7 +77,7 @@ const VIR_LOCK_SPACE_PROTOCOL_PROGRAM = 0xEA7BEEF; const VIR_LOCK_SPACE_PROTOCOL_PROGRAM_VERSION = 1; enum virLockSpaceProtocolProcedure { - /* Each function must be preceeded by a comment providing one or + /* Each function must be preceded by a comment providing one or * more annotations: * * - @generate: none|client|server|both diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 85dd100..5bc5cb1 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -215,7 +215,7 @@ openvzReadNetworkConf(virDomainDefPtr def, /*parse routing network configuration* * Sample from config: * IP_ADDRESS="1.1.1.1 1.1.1.2" - * splited IPs by space + * splitted IPs by space */ ret = openvzReadVPSConfigParam(veid, "IP_ADDRESS", &temp); if (ret < 0) { @@ -243,7 +243,7 @@ openvzReadNetworkConf(virDomainDefPtr def, /*parse bridge devices*/ /*Sample from config: *NETIF="ifname=eth10,mac=00:18:51:C1:05:EE,host_ifname=veth105.10,host_mac=00:18:51:8F:D9:F3" - *devices splited by ';' + *devices splitted by ';' */ ret = openvzReadVPSConfigParam(veid, "NETIF", &temp); if (ret < 0) { diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 889e614..a5c6879 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2296,7 +2296,7 @@ virQEMUCapsProbeQMPKVMState(virQEMUCapsPtr qemuCaps, /* The QEMU_CAPS_KVM flag was initially set according to the QEMU * reporting the recognition of 'query-kvm' QMP command. That merely - * indicates existance of the command though, not whether KVM support + * indicates existence of the command though, not whether KVM support * is actually available, nor whether it is enabled by default. * * If it is not present we need to clear the flag, and if it is diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index bad6ac0..0866c6b 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -39,7 +39,7 @@ # define QEMU_FSDEV_HOST_PREFIX "fsdev-" /* These are only defaults, they can be changed now in qemu.conf and - * explicitely specified port is checked against these two (makes + * explicitly specified port is checked against these two (makes * sense to limit the values). * * This limitation is mentioned in qemu.conf, so bear in mind that the diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e58fa3f..5970585 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1304,7 +1304,7 @@ qemuGetProcessInfo(unsigned long long *cpuTime, int *lastCpu, long *vm_rss, /* We got jiffies * We want nanoseconds * _SC_CLK_TCK is jiffies per second - * So calulate thus.... + * So calculate thus.... */ if (cpuTime) *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); @@ -2934,7 +2934,7 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver, * we don't have an explicit offset in the header, so we fake * it by padding the XML string with NUL bytes. Additionally, * we want to ensure that virDomainSaveImageDefineXML can supply - * slightly larger XML, so we add a miminum padding prior to + * slightly larger XML, so we add a minimum padding prior to * rounding out to page boundaries. */ pad = 1024; @@ -12509,7 +12509,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, { int actualType; - /* active disks are handeled by qemu itself so no need to worry about those */ + /* active disks are handled by qemu itself so no need to worry about those */ if (active) return 0; diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index bfac11c..01a384a 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -178,7 +178,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr, * the category part, since that's what we're really * interested in. This won't work in Enforcing mode, * but will prevent libvirtd breaking in Permissive - * mode when run with a wierd process label. + * mode when run with a weird process label. */ static int virSecuritySELinuxMCSGetProcessRange(char **sens, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index fa5eba1..3694c26 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1196,7 +1196,7 @@ virStorageBackendFileSystemVolRefresh(virConnectPtr conn, if (ret < 0) return ret; - /* Load any secrets if posible */ + /* Load any secrets if possible */ if (vol->target.encryption && vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_QCOW && vol->target.encryption->nsecrets == 0) { diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 69f6c11..1e0ec0e 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1337,7 +1337,7 @@ static int umlGetProcessInfo(unsigned long long *cpuTime, pid_t pid) /* We got jiffies * We want nanoseconds * _SC_CLK_TCK is jiffies per second - * So calulate thus.... + * So calculate thus.... */ *cpuTime = 1000ull * 1000ull * 1000ull * (usertime + systime) / (unsigned long long)sysconf(_SC_CLK_TCK); diff --git a/src/util/virstring.c b/src/util/virstring.c index b2184f3..64c7259 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -758,7 +758,7 @@ virStringSearch(const char *str, * @oldneedle: the substring to locate * @newneedle: the substring to insert * - * Search @haystack and replace all occurences of @oldneedle with @newneedle. + * Search @haystack and replace all occurrences of @oldneedle with @newneedle. * * Returns: a new string with all the replacements, or NULL on error */ diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 5ff6396..29ca322 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -392,7 +392,7 @@ vmwareVmxPath(virDomainDefPtr vmdef, char **vmxPath) /* * Build VMX URL. Use the source of the first file-based harddisk * to deduce the path for the VMX file. Don't just use the - * first disk, because it may be CDROM disk and ISO images are normaly not + * first disk, because it may be CDROM disk and ISO images are normally not * located in the virtual machine's directory. This approach * isn't perfect but should work in the majority of cases. */ diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 0f7b7d2..8702b1a 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -355,7 +355,7 @@ xenStoreDomainGetVNCPort(virConnectPtr conn, int domid) * serial console is attached. * * Returns the path to the serial console. It is the callers - * responsibilty to free() the return string. Returns NULL + * responsibility to free() the return string. Returns NULL * on error * * The caller must hold the lock on the privateData @@ -376,7 +376,7 @@ xenStoreDomainGetConsolePath(virConnectPtr conn, int domid) * serial console is attached. * * Returns the path to the serial console. It is the callers - * responsibilty to free() the return string. Returns NULL + * responsibility to free() the return string. Returns NULL * on error * * The caller must hold the lock on the privateData -- 1.7.1

2 3

[libvirt] [PATCHv2 0/9] RelaxNG improvements for virStorageSource
by Eric Blake 21 Apr '14

21 Apr '14

changes since v1: ack'd patch pushed new patches 2-4 are a better rewrite of old patch 3/6 new patches 8 and 9 patch 9 is incomplete - I know where I want to be headed, but changing 400+ tests is taking a while. I tried: $ git grep -l '<driver.*type=' tests/*data/ | \ xargs sed ' /<driver .*type=$\(.$[a-zA-Z0-9]*\2\)/ h; /<source /{ x; s/<driver.*type=$\(.$[a-zA-Z0-9]*\2\).*>/<format type=\1>/; G; }' as a way to automate the majority of the tedium, with some limited success (it has false positives in the lxc <filesystem> elements, when we really only want to affect <disk> elements>), but have not completed the efforts. I'm posting the patches now, in the hopes that 1-8 can be approved, and 9 picked up by someone else if I'm unresponsive for a while (I'll be offline for much of this week due to the birth of my fourth child). Eric Blake (9): conf: better <disk> interleaving in schema conf: move storage formats to common RNG file conf: restrict external snapshots to backing store formats conf: set up for per-grammar overrides in schemas conf: split <disk> schema into more pieces conf: move storage source details to common RNG file conf: move <auth> and <encryption> to disk source conf: fix omission of <driver> in domain dumpxml RFC: conf: introduce <format> as synonym of <driver type=...> docs/formatdomain.html.in | 19 +- docs/schemas/domain.rng | 14 +- docs/schemas/domaincommon.rng | 288 ++------------------ docs/schemas/domainsnapshot.rng | 74 ++---- docs/schemas/storagecommon.rng | 293 +++++++++++++++++++++ docs/schemas/storagevol.rng | 13 +- src/conf/domain_conf.c | 36 ++- src/conf/snapshot_conf.c | 7 +- src/util/virstoragefile.c | 51 ++-- src/util/virstoragefile.h | 15 +- .../qemuxml2argv-disk-drive-copy-on-read.args | 5 + .../qemuxml2argv-disk-drive-copy-on-read.xml | 28 ++ .../qemuxml2argv-disk-drive-discard.xml | 10 +- .../qemuxml2argv-disk-source-pool.xml | 12 +- tests/qemuxml2argvtest.c | 3 + .../qemuxml2xmlout-disk-drive-discard.xml | 37 +++ .../qemuxml2xmlout-disk-source-pool.xml | 44 ++++ tests/qemuxml2xmltest.c | 5 +- 18 files changed, 574 insertions(+), 380 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml -- 1.9.0

2 18

[libvirt] Fwd: Start contributing with Libvirt (Finding a mentor or helpful tips)
by Julio Faracco 21 Apr '14

21 Apr '14

Hi everybody! I sent an e-mail to Daniel asking about contributing to the libvirt community for free. So, I copied the e-mail to the libvirt mailing list as Daniel suggested me. If anyone can help me I'd be pleased. Thanks very much! *--* *Julio Cesar Faracco* *University of São Paulo - Brazil* ---------- Forwarded message ---------- From: Julio Faracco <jcfaracco(a)gmail.com> Date: 2014-03-29 13:45 GMT-03:00 Subject: Start contributing with Libvirt (Finding a mentor or helpful tips) To: dan(a)berrange.com Hi Daniel. My name is Julio and I sent this e-mail because I would like to contribute with libvirt. Moreover, I follow the libvirt mailing list for a long time and have read the ideas page of libvirt, qemu and KVM of Google Summer of Code program. I thought the ideas very interesting but I didn't have time to propose my ideais or submit a patch. But I don't know a good way to start doing that. I want to contribute with libvirt for free (not like GSoC who pays a paycheck for it). I think that contributing with a project like libvirt enhances some of my programming skills. Today I work with Linux distribution management and not with programing itself. However, I'm finding some troubles to start. For example: - Can I fix a random open bug? - How to understand which bug can be easier to solve? - How to follow the conversation of the mailing list? Sometimes I feel so lost. I was looking for a mentor (if you know someone who could help me) or a person who can help me to follow the right way to start it. Thanks very much. *--* *Julio Cesar Faracco* *University of São Paulo - Brazil*

3 6

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 21 Apr '14

21 Apr '14

Among other patches, Natanael Copa contributed a fix for pyshmem_available when using musl libc that directly affects libvirt. * .gnulib: Update to latest, in part for musl libc compat. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the gnulib rule, since we are not in release freeze. * .gnulib ce457d6...e8e0eb6 (18): > gitlog-to-changelog: revert inclusion of git-log-fix file > maint.mk: Relax the copyright check to cater for non FSF projects > physmem: use sysinfo if _SC_PHYS_PAGES unavailable > exclude: port to strict C99 > regex: do not depend on malloc-gnu > autoupdate > expl: avoid incorrect expl(small_value) on OpenBSD 5.4 > xalloc: allow x2nrealloc (P, PN, S) where P && !*PN > fts: avoid unnecessary strlen calls > fts: avoid unnecessary strlen calls > fts: avoid unnecessary strlen calls > autoupdate > autoupdate > obstack: Remove ancient NeXTSTEP gcc support conditional > obstack: merge with glibc changes > strftime: wrap macros in "do {...} while(0)" > modechange: avoid memory leaks for invalid octal modes > autoupdate .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index ce457d6..e8e0eb6 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit ce457d622d947d8aa3e325d98a2818d097e7fec9 +Subproject commit e8e0eb6bfb728685ec8d5afd924e41b18e9d928d -- 1.9.0

1 0

[libvirt] [PATCH v2] virsh: Separate 'create'/'modify' message for secret-define
by Li Yang 21 Apr '14

21 Apr '14

The current message of secret-define always be: Secret 09a9736f-eedb-449c-9983-80d0ab67393f created even you just modify the secret, perhaps this may puzzle uses. Now this patch make the modify action output message like this: Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 10d5db3..47974fe 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -96,6 +96,8 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; + virSecretDefPtr new_attrs; + virSecretPtr new_res; bool ret = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) @@ -104,6 +106,14 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + if (!(new_attrs = virSecretDefParseString(buffer))) { + VIR_FREE(buffer); + return false; + } + + new_res = virSecretLookupByUUID(ctl->conn, new_attrs->uuid); + new_attrs = NULL; + if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { vshError(ctl, _("Failed to set attributes from %s"), from); goto cleanup; @@ -114,13 +124,19 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Secret %s created\n"), uuid); + if (new_res == NULL) + vshPrint(ctl, _("Secret %s created\n"), uuid); + else + vshPrint(ctl, _("Secret %s modified\n"), uuid); ret = true; cleanup: VIR_FREE(buffer); + virSecretDefFree(new_attrs); if (res) virSecretFree(res); + if (new_res) + virSecretFree(new_res); return ret; } -- 1.7.1

1 0

Re: [libvirt] [PATCH] virsh: Separate 'create'/'modify' message for secret-define
by Li, Yang 21 Apr '14

21 Apr '14

> On Fri, Apr 18, 2014 at 12:20:26 +0200, Martin Kletzander wrote: > > On Fri, Apr 18, 2014 at 04:27:10AM -0400, Li Yang wrote: > > >The current message of secret-define always be: > > >Secret 09a9736f-eedb-449c-9983-80d0ab67393f created > > > > >even you just modify the secret, perhaps this may puzzle > > >uses. Now this patch make the modify action output message > > >like this: > > >Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified > > > > > >Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> > > >--- > > > tools/virsh-secret.c | 16 +++++++++++++++- > > > 1 files changed, 15 insertions(+), 1 deletions(-) > > > > > >diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c > > >index 10d5db3..d1cbe04 100644 > > >--- a/tools/virsh-secret.c > > >+++ b/tools/virsh-secret.c > > >@@ -39,6 +39,7 @@ > > > #include "virutil.h" > > > #include "virxml.h" > > > #include "conf/secret_conf.h" > > >+#include "viruuid.h" > > > > > > static virSecretPtr > > > vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) > > >@@ -96,6 +97,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > char *buffer; > > > virSecretPtr res; > > > char uuid[VIR_UUID_STRING_BUFLEN]; > > >+ virSecretDefPtr new_attrs; > > > bool ret = false; > > > > > > if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) > > >@@ -104,6 +106,12 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) > > > return false; > > > > > >+ new_attrs = virSecretDefParseString(buffer); > > >+ if (new_attrs == NULL){ > > >+ VIR_FREE(buffer); > > >+ return false; > > >+ } > > >+ > > > if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { > > > vshError(ctl, _("Failed to set attributes from %s"), from); > > > goto cleanup; > > >@@ -114,10 +122,16 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) > > > goto cleanup; > > > } > > > > > >- vshPrint(ctl, _("Secret %s created\n"), uuid); > > >+ char uuidstr[VIR_UUID_STRING_BUFLEN]; > > >+ virUUIDFormat(new_attrs->uuid, uuidstr); > > >+ if (memcmp(uuid, uuidstr, VIR_UUID_BUFLEN) == 0) > > >+ vshPrint(ctl, _("Secret %s modified\n"), uuid); > > >+ else > > >+ vshPrint(ctl, _("Secret %s created\n"), uuid); > > > ret = true; > > > > You'll still print 'modified' if the new created secret has an uuid in > > the file already, plus it does more parsing, etc. Wouldn't it be > > easier to just do s/created/defined/ ? > > Also you compare just the first VIR_UUID_BUFLEN characters in UUID > string. I agree with Martin. > > Jirka Oh, yes, you are right, I didn't notice that. I will try another way to cover this situation. If I cannot find an easy way to solve this problem, I think we'd better leave it at that, Modify "created" to "defined" seems not enough useful for uses... After all, secret-undefine command's output is "Secret *** deleted", it's correspond to secret-define command's output "Secret *** created".

1 0

Re: [libvirt] [PATCH] virsh: Make secret's usage can be modified if the usage isn't used
by Li, Yang 21 Apr '14

21 Apr '14

Ping! > When a secret's usage is specified, for example: > <secret ephemeral='no' private='no'> > <uuid>540c56d1-f4b3-5031-b76d-33e99e9b5c64</uuid> > <usage type='volume'> > <volume>/tmp/test</volume> > </usage> > </secret> > If another volume '/tmp/test1' isn't used, the current secret's usage can bo modified to '/tmp/test1'. > If '/tmp/test1' has been used for another secret, error message will be outputed. > > Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> > --- > src/secret/secret_driver.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-)

1 0

[libvirt] libvirt-php: 0.4.8 tag is missing
by Doug Goldstein 21 Apr '14

21 Apr '14

The libvirt-php 0.4.8 tar is missing from the git repo [1]. Hopefully someone who created the tarball can create the tag as well and push it. [1] http://libvirt.org/git/?p=libvirt-php.git Thanks. -- Doug Goldstein

1 1

[libvirt] [PATCH v2] bhyve: implement PCI address allocation
by Roman Bogorodskiy 20 Apr '14

20 Apr '14

Changes from v1: - Reserve slot 1 for LPC PCI-ISA bridge, used by console device - Respect addresses provided by user in domain xml file - Fix tests so 'make check' passes Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 131 ++++----- src/bhyve/bhyve_device.c | 308 +++++++++++++++++++++ src/bhyve/bhyve_device.h | 41 +++ src/bhyve/bhyve_domain.c | 75 +++++ src/bhyve/bhyve_domain.h | 41 +++ src/bhyve/bhyve_driver.c | 9 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + 20 files changed, 559 insertions(+), 79 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

1 1

[libvirt] [PATCHv2] bhyve: domainCreateXML
by Wojciech Macek 20 Apr '14

20 Apr '14

Review-fixes, changes since last time: - persistent flag is not reset to 0 anymore - dom->id =vm->def->id is moved after domain startup - duplicate of start_flags |= VIR_BHYVE_PROCESS_START_AUTODESTROY removed - flag VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE is used instead of zero - virDomainObjListRemove is called for not persistent domains in case of failure - unnecessary checkActive removed ======== DIFF BETWEEN PATCHv1 and PATCHv2 ================================= diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 1357e07..4ac89c1 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1139,39 +1133,36 @@ bhyveDomainCreateXML(virConnectPtr conn, if (!(vm = virDomainObjListAdd(privconn->domains, def, privconn->xmlopt, - 0, NULL))) + VIR_DOMAIN_OBJ_LIST_ADD_CHECK_LIVE, NULL))) goto cleanup; def = NULL; - vm->persistent = 0; dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (!dom) goto cleanup; - dom->id = vm->def->id; - - if (flags & VIR_DOMAIN_START_AUTODESTROY) - start_flags |= VIR_BHYVE_PROCESS_START_AUTODESTROY; - - if (virDomainObjIsActive(vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("Domain is already running")); - goto cleanup; - } - ret = virBhyveProcessStart(dom->conn, privconn, vm, VIR_DOMAIN_RUNNING_BOOTED, start_flags); if (ret) { virObjectUnref(dom); dom = NULL; + + /* If domain is not persistent, remove its data */ + if (!vm->persistent) { + virDomainObjListRemove(privconn->domains, vm); + vm = NULL; + } goto cleanup; } + dom->id = vm->def->id; + cleanup: virObjectUnref(caps); virDomainDefFree(def); - virObjectUnlock(vm); + if (vm) + virObjectUnlock(vm); return dom; } ======== END OF DIFF BETWEEN PATCHv1 and PATCHv2 ========================= Wojciech Macek (1): bhyve: domainCreateXML src/bhyve/bhyve_driver.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) -- 1.9.0

2 4

[libvirt] [PATCH] virsh: Separate 'create'/'modify' message for secret-define
by Li Yang 18 Apr '14

18 Apr '14

The current message of secret-define always be: Secret 09a9736f-eedb-449c-9983-80d0ab67393f created even you just modify the secret, perhaps this may puzzle uses. Now this patch make the modify action output message like this: Secret f2d1bafc-ac58-4a47-93e4-47723686fef5 modified Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 10d5db3..d1cbe04 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -39,6 +39,7 @@ #include "virutil.h" #include "virxml.h" #include "conf/secret_conf.h" +#include "viruuid.h" static virSecretPtr vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name) @@ -96,6 +97,7 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) char *buffer; virSecretPtr res; char uuid[VIR_UUID_STRING_BUFLEN]; + virSecretDefPtr new_attrs; bool ret = false; if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) @@ -104,6 +106,12 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) if (virFileReadAll(from, VSH_MAX_XML_FILE, &buffer) < 0) return false; + new_attrs = virSecretDefParseString(buffer); + if (new_attrs == NULL){ + VIR_FREE(buffer); + return false; + } + if (!(res = virSecretDefineXML(ctl->conn, buffer, 0))) { vshError(ctl, _("Failed to set attributes from %s"), from); goto cleanup; @@ -114,10 +122,16 @@ cmdSecretDefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Secret %s created\n"), uuid); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(new_attrs->uuid, uuidstr); + if (memcmp(uuid, uuidstr, VIR_UUID_BUFLEN) == 0) + vshPrint(ctl, _("Secret %s modified\n"), uuid); + else + vshPrint(ctl, _("Secret %s created\n"), uuid); ret = true; cleanup: + VIR_FREE(new_attrs); VIR_FREE(buffer); if (res) virSecretFree(res); -- 1.7.1

3 2

[libvirt] [PATCH] Only set QEMU_CAPS_NO_HPET on x86
by Ján Tomko 18 Apr '14

18 Apr '14

QEMU only supports it on x86, but we've been assuming it for all QEMUs when doing QMP capability detection. https://bugzilla.redhat.com/show_bug.cgi?id=1066145 --- src/qemu/qemu_capabilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..60b56fc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2888,7 +2888,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV); virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC); virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG); virQEMUCapsSet(qemuCaps, QEMU_CAPS_BOOT_MENU); virQEMUCapsSet(qemuCaps, QEMU_CAPS_FSDEV); @@ -2947,6 +2946,7 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, qemuCaps->arch == VIR_ARCH_I686) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); + virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_HPET); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); } -- 1.8.3.2

2 1

[libvirt] [PATCH] Remove QEMU_CAPS_MACHINE_USB_OPT from ComputeCmdFlags
by Ján Tomko 18 Apr '14

18 Apr '14

The version check is for >1.3.0, but ComputeCmdFlags is only called for QEMU older than 1.2.0. --- src/qemu/qemu_capabilities.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..5814c7c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1143,10 +1143,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); - /* USB option is supported v1.3.0 onwards */ - if (qemuCaps->version >= 1003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); - /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) -- 1.8.3.2

2 1

[libvirt] [PATCH] Fix Memory Leak in virStorageFileGetMetadataRecurse()
by Nehal J Wani 18 Apr '14

18 Apr '14

While running virstoragetest, valgrind pointed out the following memory leak: ==8142== 2 bytes in 1 blocks are definitely lost in loss record 1 of 92 ==8142== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==8142== by 0x4E7B53E: mdir_name (dirname-lgpl.c:78) ==8142== by 0x4CBE2B0: virStorageFileGetMetadataInternal (virstoragefile.c:595) ==8142== by 0x4CBE651: virStorageFileGetMetadataFromFDInternal (virstoragefile.c:1086) ==8142== by 0x4CBEEB4: virStorageFileGetMetadataRecurse (virstoragefile.c:1175) ==8142== by 0x4CBF1DE: virStorageFileGetMetadata (virstoragefile.c:1270) ==8142== by 0x4028AD: testStorageChain (virstoragetest.c:275) ==8142== by 0x407B91: virtTestRun (testutils.c:201) ==8142== by 0x4039D7: mymain (virstoragetest.c:534) ==8142== by 0x40830D: virtTestMain (testutils.c:789) ==8142== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ...62 times --- src/util/virstoragefile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ea80c1d..73cfef0 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1213,6 +1213,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath, meta->backingMeta = backing; } } + VIR_FREE(backingDirectory); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH] docs: document that vfio is default for hostdev networks too
by Laine Stump 17 Apr '14

17 Apr '14

When the default was changed from kvm to vfio, the documentation for hostdev and interface was changed, but the documentation in <network> was forgotten. --- docs/formatnetwork.html.in | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fc56b42..aeafbd9 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -282,16 +282,19 @@ definition. <span class="since"> Since 0.10.0</span> <p> - To use VFIO device assignment rather than - traditional/legacy KVM device assignment (VFIO is a new - method of device assignment that is compatible with UEFI - Secure Boot), a <forward type='hostdev'> interface - can have an optional <code>driver</code> sub-element - with a <code>name</code> attribute set to "vfio". To use - legacy KVM device assignment you can - set <code>name</code> to "kvm" (or simply omit the - <driver> element, since "kvm" is currently the - default). + To force use of a particular type of device assignment, + a <forward type='hostdev'> interface can have an + optional <code>driver</code> sub-element with + a <code>name</code> attribute set to either "vfio" (VFIO + is a new method of device assignment that is compatible + with UEFI Secure Boot) or "kvm" (the legacy device + assignment handled directly by the KVM kernel + module). The default is "vfio" on systems where the VFIO + driver is available and loaded, and "kvm" on older + systems, or those where the VFIO driver hasn't been + loaded. When specified, device assignment will fail if + the requested method of device assignment isn't + available on the host. <span class="since">Since 1.0.5 (QEMU and KVM only, requires kernel 3.6 or newer)</span> </p> -- 1.9.0

2 1

[libvirt] qemu: Unlock the NWFilter update lock by leaving via the cleanup label
by Stefan Berger 17 Apr '14

17 Apr '14

Fix a locking problem by leaving the function via the cleanup label. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -6140,7 +6140,7 @@ qemuDomainCreateWithFlags(virDomainPtr d virNWFilterReadLockFilterUpdates(); if (!(vm = qemuDomObjFromDomain(dom))) - return -1; + goto cleanup; if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup;

2 2

[libvirt] what are the differences among disk cache attribute
by longguang.yue 17 Apr '14

17 Apr '14

hi,all there are "default", "none", "writethrough", "writeback", "directsync", "unsafe" cache options 1. could you explain what is default and none? exactly what it does and not does? 2. what is the difference between unsafe and (default or none)? 3. after a long time of running , it seems that vms will slow down? do you know why? cache hit rate goes down or kernel takes time to flush cache? thanks

1 0

[libvirt] [PATCH 0/2] specify migration URI on setting file
by Chen Fan 17 Apr '14

17 Apr '14

Hi all, Current virsh migrate command require specfying migration URI with command option. 1) If user specifies --migrateuri on virsh migrate command, then the command transfers the data to specified host. 2) If --migrateuri is not specified, the command transfers the data to host whose name is resolved by DNS or /etc/hosts. But we would like to specify it on setting file like file libvirt.conf of libvirt host. the motivation is: If user would like to increase their system's resource, and user add one more NIC for each host. (One is for management LAN, another is for data LAN). in this case, user would like to use "data LAN" for transfer migrate data. Then, user can specify the NIC address for data LAN by migrateuri. Though the migrateuri is usually stable, user must specify migrateuri every migrate time. So, setting file for migrateuri is desirable. in addition, if there are more KVM host, to change the migrateuri will be too troublesome for user. Chen Fan (2): move virConnectGetConfigFile() to virconf.h add default migrate uri in definition file daemon/remote.c | 11 +++++++- src/driver.h | 1 + src/libvirt.c | 66 ++++++++------------------------------------ src/libvirt.conf | 7 +++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 37 +++++++++++++++++++++++-- src/remote/remote_driver.c | 13 +++++++++ src/remote/remote_protocol.x | 1 + src/util/virconf.c | 54 ++++++++++++++++++++++++++++++++++++ src/util/virconf.h | 1 + 11 files changed, 134 insertions(+), 60 deletions(-) -- 1.8.1.4

4 8

[libvirt] [RFC PATCH] conf: Output disk backing store details in domain XML
by Jiri Denemark 16 Apr '14

16 Apr '14

The XML for quite a complicated backing chain is shown below: <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='nbd' name='bar'> <host transport='unix' socket='/var/run/nbdsock'/> </source> <backingStore type='block' index='1'> <format type='qcow2'/> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore type='file' index='2'> <format type='qcow2'/> <source file='/tmp/image2.qcow'/> <backingStore type='file' index='3'> <format type='qcow2'/> <source file='/tmp/image3.qcow'/> <backingStore type='file' index='4'> <format type='qcow2'/> <source file='/tmp/image4.qcow'/> <backingStore type='file' index='5'> <format type='qcow2'/> <source file='/tmp/image5.qcow'/> <backingStore type='file' index='6'> <format type='raw'/> <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> <backingStore/> </backingStore> </backingStore> </backingStore> </backingStore> </backingStore> </backingStore> <target dev='vdb' bus='virtio'/> </disk> Various disk types and formats can be mixed in one chain. The <backingStore/> empty element marks the end of the backing chain and it is there mostly for future support of parsing the chain provided by a user. If it's missing, we are supposed to probe for the rest of the chain ourselves, otherwise complete chain was provided by the user. The index attributes of backingStore elements can be used to unambiguously identify a specific part of the image chain. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/domaincommon.rng | 48 ++++++++++++++-- tests/domainschemadata/backing-chains.xml | 94 +++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 tests/domainschemadata/backing-chains.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d2235e1..4249ed5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1196,10 +1196,51 @@ <optional> <ref name="snapshot"/> </optional> - <ref name="diskSource"/> + <interleave> + <ref name="diskSource"/> + <ref name="storageSourceExtra"/> + <ref name="diskBackingChain"/> + </interleave> + </element> + </define> + + <define name="diskBackingChain"> + <choice> + <ref name="diskBackingStore"/> + <ref name="diskBackingStoreLast"/> + </choice> + </define> + + <define name="diskBackingStore"> + <element name="backingStore"> + <attribute name="index"> + <ref name="positiveInteger"/> + </attribute> + <interleave> + <ref name="diskSource"/> + <ref name="diskBackingChain"/> + <ref name="diskFormat"/> + </interleave> + </element> + </define> + + <define name="diskFormat"> + <element name="format"> + <attribute name="type"> + <ref name="storageFormat"/> + </attribute> + <empty/> </element> </define> + <define name="diskBackingStoreLast"> + <optional> + <element name="backingStore"> + <empty/> + </element> + </optional> + </define> + <define name="diskSource"> <choice> <ref name="diskSourceFile"/> @@ -1232,7 +1273,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1256,7 +1296,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1276,7 +1315,6 @@ <empty/> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1340,7 +1378,6 @@ </zeroOrMore> <empty/> </element> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1373,7 +1410,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml new file mode 100644 index 0000000..b0bdd06 --- /dev/null +++ b/tests/domainschemadata/backing-chains.xml @@ -0,0 +1,94 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <source protocol='gluster' name='Volume2/Image'> + <host transport='unix' socket='/path/to/sock'/> + </source> + <backingStore type='file' index='1'> + <format type='qcow2'/> + <source file='/tmp/missing-backing-store.qcow'/> + </backingStore> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <source protocol='nbd' name='bar'> + <host transport='unix' socket='/var/run/nbdsock'/> + </source> + <backingStore type='block' index='1'> + <format type='qcow2'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <backingStore type='file' index='2'> + <format type='qcow2'/> + <source file='/tmp/image2.qcow'/> + <backingStore type='file' index='3'> + <format type='qcow2'/> + <source file='/tmp/image3.qcow'/> + <backingStore type='file' index='4'> + <format type='qcow2'/> + <source file='/tmp/image4.qcow'/> + <backingStore type='file' index='5'> + <source file='/tmp/image5.qcow'/> + <format type='qcow2'/> + <backingStore type='file' index='6'> + <format type='raw'/> + <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> + <backingStore/> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <backingStore/> + <source protocol='gluster' name='Volume1/Image'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <backingStore type='file' index='1'> + <source file='/tmp/image.qcow'/> + <backingStore/> + <format type='qcow2'/> + </backingStore> + <target dev='vdd' bus='virtio'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2'/> + <source dev='/dev/HostVG/QEMUGuest11'/> + <target dev='vde' bus='ide'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> -- 1.9.2

1 0

[libvirt] [PATCH] storageVolCreateXMLFrom: Allow multiple accesses to origvol
by Michal Privoznik 16 Apr '14

16 Apr '14

When creating a new volume, it is possible to copy data into it from another already existing volume (referred to as @origvol). Obviously, the read-only access to @origvol is required, which is thread safe (probably not performance-wise though). However, with current code both @newvol and @origvol are marked as building for the time of copying data from the @origvol to @newvol. The rationale behind is to disallow some operations on both @origvol and @newvol, e.g. vol-wipe, vol-delete, vol-download. While it makes sense to not allow such operations on partly copied mirror, but it doesn't make sense to disallow the operations on the source (@origvol). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..a3f398f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1912,7 +1912,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, /* Drop the pool lock during volume allocation */ pool->asyncjobs++; - origvol->building = 1; newvol->building = 1; virStoragePoolObjUnlock(pool); @@ -1929,7 +1928,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, virStoragePoolObjLock(origpool); storageDriverUnlock(driver); - origvol->building = 0; newvol->building = 0; allocation = newvol->target.allocation; pool->asyncjobs--; -- 1.9.0

2 2

[libvirt] [PATCH] Shorten the udevadm settle timeout for refresh/start pool cases
by John Ferlan 16 Apr '14

16 Apr '14

https://bugzilla.redhat.com/show_bug.cgi?id=789766 This patch addresses a possible misperception that libvirt is hung during pool startup/refresh as well as virt-manager startup as it needs to start/refresh storage pools found. The problem is that the 'udevadm settle' command will wait for a default of two minutes prior to returning a failure. For code paths such as pool starts or refreshes the timeout doesn't necessarily cause failures - it may just not find anything. Additionally, since no error message or any other indication is proviced, blame is placed up libvirt for the problem; however, use of debug tools shows libvirt waiting in udevadm. NB: This timeout may be longer for iSCSI and SCSI pools since both seem to run through settle paths twice under certain conditions. Based on feedback described here: http://lists.freedesktop.org/archives/systemd-devel/2013-July/011845.html this timeout is part of the architecture of udevadm settle. Although the two minute timeout expires, the code doesn't check status. Callers can decide to continue regardless of whether settle is still handling events. For paths waiting for something specific, failure will be inevitable; however, for paths such as perhaps pool refreshes waiting for "anything" to be present within the directory space udevadm manages having a shorter timeout may allow them to gather some data quicker/sooner. It's always possible to refresh the data again at some later point. For paths that are waiting for something specific, such as finding a node device, creating a backing disk volume, or removing a logical volume waiting longer for settle to work through its events will be more important. So given this, I modified the calls to virFileWaitForDevices() pass a boolean 'quiesce' indicating whether the caller should wait for the default timeout or to wait a shorter time. I chose 5 seconds for the shorter time, although there was no real logic/reason for it. Additionally, for either case use VIR_WARN to indicate that the command to settle the database returned a failure. --- Note that I did try to use a timeout value of 0 which as I was reading things would somehow indicate that something needed to be flushed; however, for the veth issue described here: http://lists.freedesktop.org/archives/systemd-devel/2013-July/011829.html the return value of a udevadm settle --timeout 0 was always 0; whereas, if using --timeout 1 (or more) the return value was 1. Callers to virFileWaitForDevices() and my reasoning/logic behind why I chose to wait for quiesce or not... node_device_driver -> Is trying to find node devices - wait long time storage_backend_*.c: (virStorageBackend*() APIs) disk: DiskRefreshPool -> Will read directory path - wait short time disk: DiskCreateVol -> Requires new disk to be present - wait long time iscsi: ISCSIGetHostNumber -> called by ISCSIFindLUs which is called by RefreshPool before opening path and scanning for devices - wait short time logical: LogicalRefreshPool -> Runs /usr/sbin/vgs to get report of volume groups - wait short time logical: LogicalDeleteVol -> Requires synchronization prior to deletion of logical volume - wait long time mpath: MpathRefreshPool -> Use DM_DEVICE_LIST to get list of devices - wait short time scsi: SCSIFindLUs -> called by SCSIRefreshPool and ISCSIFindLUs (not sure why) prior to opening path and scanning for available devices - wait short time scsi: createVport -> called by SCSIStartPool after the port is managed - there's no search for any devices and nothing depends on or checks if the port was created (although next call in sequence would be to refresh the pool, which would wait again) - wait short time Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/node_device/node_device_driver.c | 4 ++-- src/storage/storage_backend_disk.c | 4 ++-- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 ++-- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 4 ++-- src/util/virfile.h | 2 +- src/util/virutil.c | 45 +++++++++++++++++++++++++++-------- 8 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 6906463..fda4104 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -458,7 +458,7 @@ get_time(time_t *t) * possible for udev not to realize that it has work to do before we * get here. We thus keep trying to find the new device we just * created for up to LINUX_NEW_DEVICE_WAIT_TIME. Note that udev's - * default settle time is 180 seconds, so once udev realizes that it + * default settle time is 120 seconds, so once udev realizes that it * has work to do, it might take that long for the udev wait to * return. Thus the total maximum time for this function to return is * the udev settle time plus LINUX_NEW_DEVICE_WAIT_TIME. @@ -485,7 +485,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) while ((now - start) < LINUX_NEW_DEVICE_WAIT_TIME) { - virFileWaitForDevices(); + virFileWaitForDevices(true); dev = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 9cebcca..8678a24 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -323,7 +323,7 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; - virFileWaitForDevices(); + virFileWaitForDevices(false); if (!virFileExists(pool->def->source.devices[0].path)) { virReportError(VIR_ERR_INVALID_ARG, @@ -660,7 +660,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; /* wait for device node to show up */ - virFileWaitForDevices(); + virFileWaitForDevices(true); /* Blow away free extent info, as we're about to re-populate it */ VIR_FREE(pool->def->source.devices[0].freeExtents); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 881159b..5680bcb 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -96,7 +96,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, VIR_DEBUG("Finding host number from '%s'", sysfs_path); - virFileWaitForDevices(); + virFileWaitForDevices(false); sysdir = opendir(sysfs_path); diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed3a012..868fdce 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -586,7 +586,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = NULL; int ret = -1; - virFileWaitForDevices(); + virFileWaitForDevices(false); /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(pool, NULL) < 0) @@ -689,7 +689,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); - virFileWaitForDevices(); + virFileWaitForDevices(true); lvchange_cmd = virCommandNewArgList(LVCHANGE, "-aln", vol->target.path, NULL); lvremove_cmd = virCommandNewArgList(LVREMOVE, "-f", vol->target.path, NULL); diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index f0ed189..216863b 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -274,7 +274,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, pool->def->allocation = pool->def->capacity = pool->def->available = 0; - virFileWaitForDevices(); + virFileWaitForDevices(false); virStorageBackendGetMaps(pool); diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index c448d7f..7335433 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -430,7 +430,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, VIR_DEBUG("Discovering LUs on host %u", scanhost); - virFileWaitForDevices(); + virFileWaitForDevices(false); devicedir = opendir(device_path); @@ -591,7 +591,7 @@ createVport(virStoragePoolSourceAdapter adapter) adapter.data.fchost.wwnn, VPORT_CREATE) < 0) return -1; - virFileWaitForDevices(); + virFileWaitForDevices(false); return 0; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 46ef781..63d3f05 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -253,7 +253,7 @@ int virFileOpenTty(int *ttymaster, char *virFileFindMountPoint(const char *type); -void virFileWaitForDevices(void); +void virFileWaitForDevices(bool quiesce); /* NB: this should be combined with virFileBuildPath */ # define virBuildPath(path, ...) \ diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..030e5ec 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1447,29 +1447,54 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, #if defined(UDEVADM) || defined(UDEVSETTLE) -void virFileWaitForDevices(void) +void virFileWaitForDevices(bool quiesce) { # ifdef UDEVADM - const char *const settleprog[] = { UDEVADM, "settle", NULL }; + const char *const settleprog = UDEVADM; # else - const char *const settleprog[] = { UDEVSETTLE, NULL }; + const char *const settleprog = UDEVSETTLE; # endif - int exitstatus; + int exitstatus = 0; + virCommandPtr settlecmd = NULL; - if (access(settleprog[0], X_OK) != 0) + if (access(settleprog, X_OK) != 0) return; + /* In less critical paths, rather than possibly wait for a two + * minute timeout for settle to just return failure because of + * some issue in the udevadm database, let's wait for 5 seconds. + * If there's an issue with the udevadm database, the timeout + * will cause a non zero return which we can check and issue a + * warning message. + */ + settlecmd = virCommandNew(settleprog); +# ifdef UDEVADM + virCommandAddArg(settlecmd, "settle"); +# endif + if (!quiesce) { + virCommandAddArg(settlecmd, "--timeout"); + virCommandAddArg(settlecmd, "5"); + } + /* - * NOTE: we ignore errors here; this is just to make sure that any device + * NOTE: we mostly ignore errors; this is just to make sure that any device * nodes that are being created finish before we try to scan them. - * If this fails for any reason, we still have the backup of polling for - * 5 seconds for device nodes. */ - if (virRun(settleprog, &exitstatus) < 0) + if (virCommandRun(settlecmd, &exitstatus) < 0) {} + + if (exitstatus) { + char *cmd_str = virCommandToString(settlecmd); + VIR_WARN("Timed out running '%s' indicating a possible issue " + "with udev event queue.", + cmd_str ? cmd_str : settleprog); + VIR_FREE(cmd_str); + } + + virCommandFree(settlecmd); } #else -void virFileWaitForDevices(void) +void virFileWaitForDevices(bool quiesce ATTRIBUTE_UNUSED) {} #endif -- 1.9.0

3 4

[libvirt] [PATCH v2] storage: netfs: Handle backend errors
by John Ferlan 16 Apr '14

16 Apr '14

Commit id '18642d10' caused a virt-test regression for NFS backend storage error path checks when running the command: 'virsh find-storage-pool-sources-as netfs Unknown ' when the host did not have Gluster installed. Prior to the commit, the test would fail with the error: error: internal error: Child process (/usr/sbin/showmount --no-headers --exports Unknown) unexpected exit status 1: clnt_create: RPC: Unknown host After the commit, the error would be ignored, the call would succeed, and an empty list of pool sources returned. This was tucked into the commit message as an expected outcome. When the target host does not have a GLUSTER_CLI this is a regression over the previous release. Furthermore, even if Gluster CLI was present, but had a failure to get devices, the API would return a failure even if the NFS backend had found devices. Modify the logic to return failure when the NFS backend check fails and there's no GLUSTER_CLI or when both backend checks fail. If either returns success and GLUSTER_CLI is defined, then fetch and return a list of source devices even if it's empty Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index be963d4..fa5eba1 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -234,9 +234,11 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, } -static void +static int virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) { + int ret = -1; + /* * # showmount --no-headers -e HOSTNAME * /tmp * @@ -263,9 +265,13 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) if (virCommandRunRegex(cmd, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, state, NULL) < 0) - virResetLastError(); + goto cleanup; + ret = 0; + + cleanup: virCommandFree(cmd); + return ret; } @@ -285,6 +291,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE virStoragePoolSourcePtr source = NULL; char *ret = NULL; size_t i; + int retNFS = -1, retGluster = -1; virCheckFlags(0, NULL); @@ -306,11 +313,16 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE state.host = source->hosts[0].name; - virStorageBackendFileSystemNetFindNFSPoolSources(&state); + retNFS = virStorageBackendFileSystemNetFindNFSPoolSources(&state); - if (virStorageBackendFindGlusterPoolSources(state.host, +# ifdef GLUSTER_CLI + retGluster = + virStorageBackendFindGlusterPoolSources(state.host, VIR_STORAGE_POOL_NETFS_GLUSTERFS, - &state.list) < 0) + &state.list); +# endif + /* If both fail, then we won't return an empty list - return an error */ + if (retNFS < 0 && retGluster < 0) goto cleanup; if (!(ret = virStoragePoolSourceListFormat(&state.list))) -- 1.9.0

2 2

[libvirt] [PATCH 0/5] network: fix active status & usage of inactive networks
by Laine Stump 16 Apr '14

16 Apr '14

All 5 of these patches are required to address https://bugzilla.redhat.com/show_bug.cgi?id=880483 The reported problem is that an interface using a currently-inactive macvtap/hostdev network can be attached to a domain (addressed by 5/5). In order to make fixing that problem less of a problem, the automatic inactivation of all macvtap/hostdev networks any time libvirtd is restart must be addressed, and that is done in 1/5-4/5. Part of fixing the latter problem is changing the network driver to use /var/run for its status XML rather than /var/lib (2/5), which causes problems during upgrade (addressed in 3/5) and in a more limited sense downgrade (see the comments in 3/5 for why I haven't addressed those problems)

3 17

[libvirt] how to use libvirt hook scripts to modify domain xml while its start
by cokabug 16 Apr '14

16 Apr '14

i want add sound card to domain xml when guest start,after google,i found libvirt provide hook function. i follow the instruction to make a python,and boot a guest,but after use "virsh edit" its still dont have sound card config /etc/libvirt/hooks/qemu: #!/usr/bin/python import sys import re import os hooklog = '/tmp/hook.log' log = open(hooklog, 'w') stdinxml = sys.stdin.readlines() if sys.argv[2] == 'start': log.write("hook start,domain name: %s \n" % sys.argv[1]) maxslot=-1 for line in stdinxml: slotm = re.search("slot='(?P<slotnum>0x[0-9a-fA-F]{2})'", line) if slotm: slotnum = int(slotm.group('slotnum'),0) if slotnum > maxslot: maxslot = slotnum if '</devices>' in line: log.write("insert sound card config \n") slotnum = maxslot + 1 line = " <sound model='ich6'>\n" line = line + " <address type='pci' domain='0x0000' bus='0x00' slot='0x%0.2X' function='0x0'/>\n" % slotnum line = line + " </sound>\n" line = line + " </devices>\n" stdoutxml = ''.join(line) sys.stdout.write(stdoutxml) tail -f /tmp/hook.log: hook start,domain name: instance-00000222 insert sound card config tail /var/log/libvirt/libvirtd.log: 2014-04-16 07:13:39.159+0000: 52199: warning : qemuDomainObjTaint:1377 : Domain id=81 name='instance-00000222' uuid=974d62b7-f316-4f20-a91c-d11cb85980fe is tainted: high-privileges in these log,hook script seems to executed,but not effective. can anyone tell me where is wrong?

2 2

[libvirt] minimal configure flags to buid libvirt library to compile ruby bindings
by Vasiliy Tolstov 16 Apr '14

16 Apr '14

Hello. I need to compile libvirt with minimal options to pack it via omnibus to chef (need to build libvirt ruby gem). Can somebody explains me what options i need? Does i need remote support or no? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 0

[libvirt] VNC sharePolicy not working as expected
by Kekane, Abhishek 16 Apr '14

16 Apr '14

Hi All, Greetings!!! We are using KVM hypervisor driver for running OpenStack IaaS. Couple of months back we have reported one security issue [1] in OS. Basically we want to limit on the number of vnc client connections that can be opened by users for a given VM. >From libvirt 1.0.6 version onwards share policy feature is supported to control the way consoles are accessed by the user. Presently it is possible to configure share policy for vnc in 3 different ways:- 1. allow-exclusive, allows clients to ask for exclusive access by dropping other connections 2. force-share, This is the default value, It allows multiple clients to connect to the console in parallel sharing the same session 3. ignore, welcomes every connection unconditionally In openstack nova for libvirt driver I am able to configure the sharePolicy value to graphics element of domain's xml. <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="force-shared"> <listen type='address' address='127.0.0.1'/> </graphics> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="allow-exclusive"> <listen type='address' address='127.0.0.1'/> </graphics> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="ignore"> <listen type='address' address='127.0.0.1'/> </graphics> But while testing I am not able to get expected results for allow-exclusive and ignore sharePolicy. For allow-exclusive sharePolicy previous connections are not getting dropped and console contents are getting shared among all open consoles. For ignore sharePolicy also contents are getting shared among all open consoles. I am using libvirt version 1.1.1 and qemu version is 1.5.0. We want to restrict only single authorized user to connect to the console dropping previously connected users automatically by using allow-exclusive sharePolicy. Please let me know what else is required to get this worked successfully. [1] : https://bugs.launchpad.net/nova/+bug/1227575 Thanks, Abhishek ______________________________________________________________________ Disclaimer:This email and any attachments are sent in strictest confidence for the sole use of the addressee and may contain legally privileged, confidential, and proprietary data. If you are not the intended recipient, please advise the sender by replying promptly to this email and then delete and destroy this email and any attachments without any further use, copying or forwarding

3 2

[libvirt] libvirt Hyper-v 2012 r2 fix
by vikhyath reddy 16 Apr '14

16 Apr '14

Hello everyone, Thanks for libvirt. I did see on the libvirt page that hyper-v 2008 is supported (which it does). So I tried running it on Hyper-v 2012 r2 but virsh fails to connect by an error that says *"error: internal error: SOAP fault during enumeration: code 's:Sender', subcode 'n:CannotProcessFilter', reason 'The data source could not process the filter. The filter might be missing or it might be invalid. Change the filter and try the request again. ', detail '500The specified class does not exist in the given namespace. HRESULT 0x8033801a0052150858778HRESULTThe specified class does not exist in the given namespace. ' "* Upon looking into the Hyper-v 2012 r2 server event logs, I found that this is going on [ Source: WMI-Activity Event ID: 5898 Microsoft-Windows-WMI-Activity/Operational ] *Id = {62D480B2-58EF-0000-E580-D462EF58CF01}; ClientMachine = VIKHYPERV; User = VIKHYPERV\Administrator; ClientProcessId = 884;Component = Unknown; Operation = Start IWbemServices::ExecQuery - root\virtualization : select * from Msvm_ComputerSystem whereDescription = "Microsoft Hosting Computer System" ; ResultCode = 0x80041010; PossibleCause = Unknown* Note that* Msvm_ComputerSystem *is missing in the namespace *root\virtualization. *Upon further investigation, I found that the new namespace where *Msvm_ComputerSystem *is located is at root\virtualization\*v2* Is (it possible?) there some way I can know where in the source code, libvirt is specifying the namespace so that I can try patching it up and see if it fixes things? Thanks for all your help, Vik.

2 2

[libvirt] why doesn't libvirt let qemu autostart live-migrated VMs?
by Chris Friesen 15 Apr '14

15 Apr '14

Hi, I've been digging through the libvirt code and something that struck me was that it appears that when using qemu libvirt will migrate the instance with autostart disabled, then sit on the source host periodically polling for migration completion, then once the host detects that migration is completed it will tell the destination to start up the VM. Why don't we let the destination autostart the VM once migration is complete? Chris

2 3

[libvirt] RFC: Exposing backing chains in <domain> XML
by Eric Blake 15 Apr '14

15 Apr '14

tl;dr: I am working on a series of patches to expose backing chain information in <domain> XML. Comments are welcome, to make sure my XML design is on the right track. Purpose ======= Among other things, this will help us support Peter's proposal of enhancing the block-pull and block-commit actions to specify a destination by relative depth in the backing chain (where "vda[0]" represents the active image, "vda[1]" represents the backing file of the active image, and so on). It will also help debug situations where libvirt and qemu disagree on what constitutes a backing chain, and therefore causes sVirt labeling discrepancies or prohibits block-pull/block-commit actions. For example, given the chain "base <- mid <- top", if top forgot the backing_fmt attribute, and /etc/libvirt/qemu.conf allow_disk_format_probing=0 (which it is by default for security resasons), libvirt treats 'mid' as a raw file and refuses to acknowledge that 'base' is part of the chain, while qemu would happily treat mid as qcow2 and therefore use 'base' if permissions allow it to. I have helped debug this scenario several times on IRC or in bugzilla reports. This feature is being driven in part by https://bugzilla.redhat.com/show_bug.cgi?id=1069407 Existing design =============== Note that libvirt can already expose backing file details (but only one layer; it is not recursive) when using virStorageVolGetXMLDesc(); for example: # virsh vol-dumpxml --pool gluster img3 <volume type='network'> <name>img3</name> <key>vol1/img3</key> ... <target> <path>gluster://localhost/vol1/img3</path> <format type='qcow2'/> ... </target> <backingStore> <path>gluster://localhost/vol1/img2</path> <format type='qcow2'/> <permissions> <mode>00</mode> <owner>0</owner> <group>0</group> </permissions> </backingStore> </volume> In the current volume representation, if a <backingStore> element is present, it gives the <path> to the backing file. But this representation is a bit limited: it is rather hard-coded to the assumption that there is only one backing file, and does not do a good job when the backing image is not in the same storage pool as the volume it is describing. Some of the enhancements I'm proposing for <domain> should also be applied to the information output by <volume> XML, which means I have to be careful that the design I'm proposing will mesh well with the storage xml to maximize code reuse. The volume approach is a bit painful to users trying to track the backing chain of a disk tied to a <domain> because it necessitates creating a storage pool and making multiple calls to follow the chain, so we need to expose the backing chain directly in the <disk> element of a domain, and recursively show the entire chain. Furthermore, there are some formats that require multiple resources: for example, both qemu 2.0's new quorum driver and HyperV VHDX images can have multiple backing files, and where these files can in turn have more backing images. Thus, any proper representation of disk resources needs to show a full tree of relationships. Thankfully, circular references in backing files would form an invalid image (all known virtual disk image formats require a DAG of relationships). With existing API, we still have not fully implemented 'virsh snapshot-delete' of external snapshots. So our current advice is for people to manually use qemu-img to alter backing chains, then update libvirt to match. Once libvirt starts tracking backing chains, it becomes all the more important to provide two new actions in libvirt: we need a validation mode (check that what is recorded on disk matches what is recorded in XML and flag an error if they differ) and a correction mode (ignore what is recorded in XML and regenerate it to match what is actually on disk). Proposal ======== For each <disk> of a domain, I will be adding a new <backingStore> element. The element is optional on input, which allows libvirt to continue to understand input from older versions, but will always be present on output, to show what libvirt is tracking as the backing chain. For a file with no backing store (including raw file format), the usage is simple: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/path/to/somewhere'/> <backingStore/> <target dev='vda' bus='virtio'/> </disk> The new explicit <backingStore/> makes it clear that there is no backing chain. A backing chain of 3 files (base <- mid <- top) in the local file system: <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/top.qcow2'/> <backingStore type='file'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/mid.qcow2'/> <backingStore type='file'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/base.qcow2'/> <backingStore/> </backingStore> </backingStore> <target dev='vda' bus='virtio'/> </disk> Note that this is intentionally nested, so that for file formats that support more than one backing resource, it can list parallel <backingStore> as siblings to describe those related resources (thus leaving the door open to expose a qemu quorum as a <disk type='quorum'> with no direct <source> but instead with three <backingStore> sibling elements for each member of the quorum, and where each member of the quorum can further have its own backing chain). Design wise, the <backingStore> element is either completely empty (end-of-chain), or has a mandatory type='...' attribute that mirrors the same type attribute of a <disk>. Then, within the backingStore element, there is a <source> or other appropriate sub-elements similar to what <disk> already uses for describing a single host resource. So, for an example, here would be the output for a 2-element chain on gluster: <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> <backingStore type='network'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img1'> <host name='red'/> </source> <backingStore/> </backingStore> <target dev='vdb' bus='virtio'/> </disk> Or again, but this time using volume references to a storage pool (assuming 'glusterVol1' is the storage pool wrapping gluster://red/vol1): <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='glusterVol1' volume='img2'/> <backingStore type='volume'> <driver name='qemu' type='qcow2'/> <source pool='glusterVol1' volume='img1'/> <backingStore/> </backingStore> <target dev='vdb' bus='virtio'/> </disk> As can be seen, this design heavily reuses existing <disk type='...'> handling, which should make it easier to reuse blocks of code both in libvirt to handle the backing chains, and in clients when processing backing chains to hand to libvirt up front or in inspecting the dumpxml results. Management apps like vdsm that use transient domains should start supplying <backingStore> elements to fully describe chains. Implementation ============== The following APIs will be affected: defining domain XML (whether via define for persistent domains, or create for transient domains): parse the new element. If the element is already present, default to trusting the backing chain in that element instead of reading from the disk files. If the element is absent, read the disk files and populate the element. It is probably also worth adding a flag to trigger validation mode: read the disk files to ensure they match the xml, and refuse the operation if there is a mismatch (as for updating xml to match reality, the simplest is to edit the XML and delete the <backingStore> element then try the define again, so I don't see the need for a flag for that action). I may also need to figure out if it is worth tainting a domain any time where libvirt detects that the XML backing chain vs. the disk file read backing chain have diverged. Note that defining domain XML includes loading from saved state or from incoming migration. dumping domain XML: always output the new element, by default without consulting disk files. By tracking the chain in memory ever since the guest is defined, it should already be available for output. I'm debating whether we need a flag (similar to virsh dumpxml --update-cpu) that can force libvirt to re-read the disk files at the time of the dump and regenerate the chain to match reality of any changes made behind libvirt's back. creating external snapshots: the <domainsnapshot> XMl will continue to be the picture of the domain prior to the creation of the snapshot (but this picture will now include any <backingStore> elements already present in the chain), but after the snapshot is taken, the <domain> XML will also be modified to record the updated chain (the old disk source is now the <backingStore> of the new disk source). deleting external snapshots is not yet implemented, but the implementation will have to shrink the backingStore chain to match reality. block-pull (block-rebase in pull mode), block-commit: at the completion of the pull, the <backingStore> needs to be updated to reflect the new shorter state of the chain block-copy (block-rebase in copy mode): the operation starts out by creating a mirror, but during the first phase, the mirror is not usable as an accurate copy of what the guest sees. Right now we fudge by saying that block copy can only be done on transient domains; but even with that, we still track a <mirror> element in the <disk> XML to track that a block copy is underway (so that the operation survives a libvirtd restart). The <mirror> element will now need to be taught a <backingStore>, particularly if the user passes in a pre-existing file to be reused as the copy destination. Then, when the second phase is complete and the mirroring is ended, the <disk> will need another update to select which side of the backing chain is now in force virsh domblklist: should be taught a new flag to show the backing chain in a tree format, since the command already exists to extract <disk> information from a domain into a nicer human format sVirt security labeling: right now, we are read the disk files to both label and remove labels on a backing chain - obviously, once the chain is tracked natively as part of the <disk>, we should be labeling without having to read disk files storage volumes - investigate how much of the backing chain code can be reused in enhancing storage volume xml output anything else you can think of in the code base that will be impacted? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 17

[libvirt] [java] [PATCH 1/2] GetNodeCpuStat binding
by Pasquale.phate867＠gmail.com 15 Apr '14

15 Apr '14

From: Pasquale Di Rienzo <phate867(a)gmail.com> -Added the getNodeCpuStat binding to Libvirt class -Added virNodeCPUStats and CPUStat classes to support this binding -Added the method getCPUStats to Connect class --- AUTHORS | 1 + src/main/java/org/libvirt/CPUStat.java | 57 ++++++++++++++++++++++ src/main/java/org/libvirt/Connect.java | 53 ++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 5 ++ src/main/java/org/libvirt/jna/virNodeCPUStats.java | 19 ++++++++ 5 files changed, 135 insertions(+) create mode 100644 src/main/java/org/libvirt/CPUStat.java create mode 100644 src/main/java/org/libvirt/jna/virNodeCPUStats.java diff --git a/AUTHORS b/AUTHORS index 07809bf..77139e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Andrea Sansottera <andrea.sansottera(a)gmail.com> Stefan Majer <stefan.majer(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> Eric Blake <eblake(a)redhat.com> +Pasquale Di Rienzo <phate867(a)gmail.com> diff --git a/src/main/java/org/libvirt/CPUStat.java b/src/main/java/org/libvirt/CPUStat.java new file mode 100644 index 0000000..527049c --- /dev/null +++ b/src/main/java/org/libvirt/CPUStat.java @@ -0,0 +1,57 @@ +package org.libvirt; + +import java.nio.charset.Charset; +import org.libvirt.jna.virNodeCPUStats; +import org.libvirt.jna.virTypedParameter; + +/** + * This class holds a cpu time. + * The tag attribute is a string of either "kernel","user","idle","iowait" + * while the value attribute is the actual time value + * @author Pasquale Di Rienzo + * + */ +public class CPUStat { + public String tag; + public long value; + + private String createStringFromBytes(byte[] b){ + Charset ch = Charset.forName("UTF-8"); + int i = 0; + while ((i<b.length) && (b[i]!=0)) + i++; + + return new String(b,0,i,ch); + } + + public CPUStat(virNodeCPUStats stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.longValue(); + } + + public CPUStat(virTypedParameter stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.l; + } + + public String getTag() { + return tag; + } + + public long getValue() { + return value; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public void setValue(long val) { + this.value = val; + } + + @Override + public String toString() { + return String.format("tag:%s%nval:%d%n", tag, value); + } +} diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..d8a4ce2 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -2,6 +2,8 @@ package org.libvirt; import java.util.UUID; +import org.libvirt.CPUStat; +import org.libvirt.LibvirtException; import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.DevicePointer; import org.libvirt.jna.DomainPointer; @@ -14,6 +16,7 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; +import org.libvirt.jna.virNodeCPUStats; import org.libvirt.jna.virNodeInfo; import static org.libvirt.Library.libvirt; @@ -23,6 +26,7 @@ import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Memory; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; /** @@ -207,6 +211,55 @@ public class Connect { } return processError(success); } + + /** + * This function returns statistics about the cpu, that is the time + * each cpu is spending in kernel time, user time, io time and idle time. + * Each CPUStat object refers to a particular time. + * + * Note that not all these stats are granted to be retrieved. + * + * @param the number of the cpu you want to retrieve stats from. + * passing -1 will make this function retrieve a mean value + * from all cpus the system has. + * + * @param some flags + * @return a cpustat object for each cpu + * @throws LibvirtException + */ + public CPUStat[] getCPUStats(int cpuNumber,long flags) throws LibvirtException{ + CPUStat[] stats = null; + + IntByReference nParams = new IntByReference(); + + //according to libvirt reference you call this function once passing + //null as param paramether to get the actual stats (kernel,user,io,idle) number into the + //nParams reference. Generally this number would be 4, but some systems + //may not give all 4 times, so it is always good to call it. + int result = libvirt.virNodeGetCPUStats( + VCP, cpuNumber, null, nParams, flags); + + processError(result); + + if(result == 0){//dunno if this check is actually needed + + //this time we create an array to fit the number of paramethers + virNodeCPUStats[] params = new virNodeCPUStats[nParams.getValue()]; + //and we pass it to the function + result = libvirt.virNodeGetCPUStats(VCP, cpuNumber , params, nParams, flags); + processError(result); + + //finally we parse the result in an user friendly class which does + //not expose libvirt's internal paramethers + if(result >= 0){ + stats = new CPUStat[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStat(params[i]); + } + } + + return stats; + } /** * Compares the given CPU description with the host CPU diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..658299f 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -1,5 +1,8 @@ package org.libvirt.jna; +import org.libvirt.jna.ConnectionPointer; +import org.libvirt.jna.virNodeCPUStats; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -267,6 +270,8 @@ public interface Libvirt extends Library { int virNetworkUndefine(NetworkPointer virConnectPtr); // Node functions + int virNodeGetCPUStats(ConnectionPointer virConnectPtr, int cpuNum, + virNodeCPUStats[] stats,IntByReference nparams, long flags); int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); diff --git a/src/main/java/org/libvirt/jna/virNodeCPUStats.java b/src/main/java/org/libvirt/jna/virNodeCPUStats.java new file mode 100644 index 0000000..a8f2dca --- /dev/null +++ b/src/main/java/org/libvirt/jna/virNodeCPUStats.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.NativeLong; +import com.sun.jna.Structure; + +public class virNodeCPUStats extends Structure{ + public byte[] field = new byte[80]; + public NativeLong value ; + + private static final List fields = Arrays.asList( "field", "value"); + + @Override + protected List getFieldOrder() { + return fields; + } +} -- 1.8.3.2

1 1

[libvirt] [PATCH] nodeinfo: Make sure we always reset errno before calling readdir
by Natanael Copa 15 Apr '14

15 Apr '14

We must always reset errno to 0 even if we do 'continue'. This fixes runtime with musl libc which will set errno on sscanf. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/nodeinfo.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 53ba716..8d3214e 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -452,8 +452,7 @@ virNodeParseNode(const char *node, /* enumerate sockets in the node */ CPU_ZERO(&sock_map); - errno = 0; - while ((cpudirent = readdir(cpudir))) { + for (errno = 0; (cpudirent = readdir(cpudir)); errno = 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; @@ -470,8 +469,6 @@ virNodeParseNode(const char *node, if (sock > sock_max) sock_max = sock; - - errno = 0; } if (errno) { @@ -490,8 +487,7 @@ virNodeParseNode(const char *node, /* iterate over all CPU's in the node */ rewinddir(cpudir); - errno = 0; - while ((cpudirent = readdir(cpudir))) { + for (errno = 0; (cpudirent = readdir(cpudir)); errno = 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; @@ -530,8 +526,6 @@ virNodeParseNode(const char *node, if (siblings > *threads) *threads = siblings; - - errno = 0; } if (errno) { @@ -672,8 +666,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, goto fallback; } - errno = 0; - while ((nodedirent = readdir(nodedir))) { + for (errno = 0; (nodedirent = readdir(nodedir)); errno = 0) { if (sscanf(nodedirent->d_name, "node%u", &node) != 1) continue; @@ -699,8 +692,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, if (threads > nodeinfo->threads) nodeinfo->threads = threads; - - errno = 0; } if (errno) { -- 1.9.1

3 10

[libvirt] [PATCH tck] 202-numa-set-parameters.t: use AFFECT_CONFIG when changing nodeset
by Mike Latimer 15 Apr '14

15 Apr '14

The 202-numa-set-parameters.t test sets NUMA_NODESET using AFFECT_LIVE on a running domain, destroys and starts the domain, then verifies the NUMA_NODESET setting. As AFFECT_LIVE does not write the setting to the domain xml file, the new nodeset setting is lost when the domain is destroyed and the test fails. This patch adds AFFECT_CONFIG to set_numa_parameters, so both the live environment and the xml file are updated with the new setting. An additional test was also added, before the domain is destroyed, to ensure the nodeset change is seen on the live domain. --- scripts/domain/202-numa-set-parameters.t | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index 886a979..f5ed871 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -28,7 +28,7 @@ after the API call to set NUMA parameters for a domain. use strict; use warnings; -use Test::More tests => 12; +use Test::More tests => 13; use Sys::Virt::TCK; use Test::Exception; @@ -57,8 +57,12 @@ my %params = ( Sys::Virt::Domain::NUMA_NODESET => '0', ); -diag "Set numa parameters, affects live config"; -lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_LIVE)}, "set_numa_parameters"); +diag "Set numa parameters, affects live and config"; +lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_LIVE | Sys::Virt::Domain::AFFECT_CONFIG)}, "set_numa_parameters"); + +diag "Get numa parameters"; +my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); diag "Destroy the domain"; $dom->destroy; @@ -68,7 +72,7 @@ $dom->create; ok($dom->get_id > 0, "running domain with ID > 0"); diag "Get numa parameters"; -my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); diag "Destroy the domain"; -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 220-no-ip-spoofing.t: Don't use a static netmask
by Mike Latimer 15 Apr '14

15 Apr '14

For environments not using a /24 netmask, this test can end up in a hung state. This patch reads the netmask from the nic and uses it later when ip addresses are changed and restored. --- scripts/nwfilter/220-no-ip-spoofing.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 5e8e0d7..3a0213d 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -79,19 +79,20 @@ $ssh->login("root", $tck->root_password()); diag "preparing ip spoof"; my $cmdfile = <<EOF; echo "DEV=`ip link | head -3 | tail -1 | awk '{print \\\$2}' | sed -e 's/://'` +MASK=`ip addr show \\\$DEV | grep 'inet ' | awk '{print \\\$2}' | sed -e 's/.*\\///;q'` /sbin/ip addr show \\\$DEV /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add 192.168.122.183/24 dev \\\$DEV +/sbin/ip addr add 192.168.122.183/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up /sbin/ip addr show \\\$DEV /bin/sleep 1 /bin/ping -c 1 192.168.122.1 /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add ${guestip}/24 dev \\\$DEV +/sbin/ip addr add ${guestip}/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up -/sbin/ip link \\\$DEV" > /test.sh +/sbin/ip addr show \\\$DEV" > /test.sh EOF diag $cmdfile; my ($stdout, $stderr, $exit) = $ssh->cmd($cmdfile); -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 210-no-mac-spoofing.t: Catch network is unreachable error
by Mike Latimer 15 Apr '14

15 Apr '14

Some environments (openSUSE 13.1) can report the network is unreachable during this test. Trap that condition as well. --- scripts/nwfilter/210-no-mac-spoofing.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index d7c57e6..7e80216 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -92,7 +92,7 @@ echo "DEV=`ip link | head -3 | tail -1 | awk '{print \\\$2}' | sed -e 's/://'` /sbin/ip link set \\\$DEV address ${macfalse} /sbin/ip link set \\\$DEV up /sbin/ip addr show dev \\\$DEV -/bin/ping -c 10 ${gateway} +/bin/ping -c 10 ${gateway} 2>&1 /sbin/ip link set \\\$DEV down /sbin/ip link set \\\$DEV address ${mac} /sbin/ip link set \\\$DEV up @@ -119,7 +119,7 @@ diag $exit; diag $stdout; diag $stderr; diag $exit; -ok($stdout =~ "100% packet loss", "packet loss expected"); +ok($stdout =~ /100% packet loss|Network is unreachable/, "packet loss expected"); shutdown_vm_gracefully($dom); -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 110-static-relabel-yes.t: Only 5 tests in 110-static-relabel
by Mike Latimer 15 Apr '14

15 Apr '14

Trivial, but there are only 5 tests in 110-static-relabel-yes.t. --- scripts/selinux/110-static-relabel-yes.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index f558cc9..76781ca 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; -use Test::More tests => 6; +use Test::More tests => 5; use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 300-vsitype.t: Skip after $tck is defined
by Mike Latimer 15 Apr '14

15 Apr '14

With $tck added to the skip conditional, the entire codeblock has to be after $tck is defined. Also, $tck->cleanup should be added to the skip conditions. --- scripts/nwfilter/300-vsitype.t | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/nwfilter/300-vsitype.t b/scripts/nwfilter/300-vsitype.t index 1de67d1..430618f 100644 --- a/scripts/nwfilter/300-vsitype.t +++ b/scripts/nwfilter/300-vsitype.t @@ -28,14 +28,6 @@ use warnings; use Test::More; -if ( ! -e '/usr/sbin/lldptool' ) { - eval "use Test::More skip_all => \"lldptool is not available\";"; -} elsif (!$tck->get_host_network_device()) { - eval "use Test::More skip_all => \"no host net device configured\";"; -} else { - eval "use Test::More tests => 4"; -} - use Sys::Virt::TCK; use Sys::Virt::TCK::NetworkHelpers; use Test::Exception; @@ -49,6 +41,16 @@ END { $tck->cleanup if $tck; } +if ( ! -e '/usr/sbin/lldptool' ) { + $tck->cleanup if $tck; + eval "use Test::More skip_all => \"lldptool is not available\";"; +} elsif (!$tck->get_host_network_device()) { + $tck->cleanup if $tck; + eval "use Test::More skip_all => \"no host net device configured\";"; +} else { + eval "use Test::More tests => 4"; +} + # create first domain and start it my $xml = $tck->generic_domain(name => "tck", fullos => 1, netmode => "vepa")->as_xml(); -- 1.8.4.5

2 1

[libvirt] [java] [PATCH] GetNodeCpuStat binding
by phate867＠gmail.com 15 Apr '14

15 Apr '14

From: Pasquale Di Rienzo <phate867(a)gmail.com> -Added the getNodeCpuStat binding to Libvirt class -Added virNodeCPUStats and CPUStat classes to support this binding -Added the method getCPUStats to Connect class --- AUTHORS | 1 + src/main/java/org/libvirt/CPUStat.java | 57 ++++++++++++++++++++++ src/main/java/org/libvirt/Connect.java | 53 ++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 5 ++ src/main/java/org/libvirt/jna/virNodeCPUStats.java | 19 ++++++++ 5 files changed, 135 insertions(+) create mode 100644 src/main/java/org/libvirt/CPUStat.java create mode 100644 src/main/java/org/libvirt/jna/virNodeCPUStats.java diff --git a/AUTHORS b/AUTHORS index 07809bf..77139e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Andrea Sansottera <andrea.sansottera(a)gmail.com> Stefan Majer <stefan.majer(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> Eric Blake <eblake(a)redhat.com> +Pasquale Di Rienzo <phate867(a)gmail.com> diff --git a/src/main/java/org/libvirt/CPUStat.java b/src/main/java/org/libvirt/CPUStat.java new file mode 100644 index 0000000..527049c --- /dev/null +++ b/src/main/java/org/libvirt/CPUStat.java @@ -0,0 +1,57 @@ +package org.libvirt; + +import java.nio.charset.Charset; +import org.libvirt.jna.virNodeCPUStats; +import org.libvirt.jna.virTypedParameter; + +/** + * This class holds a cpu time. + * The tag attribute is a string of either "kernel","user","idle","iowait" + * while the value attribute is the actual time value + * @author Pasquale Di Rienzo + * + */ +public class CPUStat { + public String tag; + public long value; + + private String createStringFromBytes(byte[] b){ + Charset ch = Charset.forName("UTF-8"); + int i = 0; + while ((i<b.length) && (b[i]!=0)) + i++; + + return new String(b,0,i,ch); + } + + public CPUStat(virNodeCPUStats stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.longValue(); + } + + public CPUStat(virTypedParameter stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.l; + } + + public String getTag() { + return tag; + } + + public long getValue() { + return value; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public void setValue(long val) { + this.value = val; + } + + @Override + public String toString() { + return String.format("tag:%s%nval:%d%n", tag, value); + } +} diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..d8a4ce2 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -2,6 +2,8 @@ package org.libvirt; import java.util.UUID; +import org.libvirt.CPUStat; +import org.libvirt.LibvirtException; import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.DevicePointer; import org.libvirt.jna.DomainPointer; @@ -14,6 +16,7 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; +import org.libvirt.jna.virNodeCPUStats; import org.libvirt.jna.virNodeInfo; import static org.libvirt.Library.libvirt; @@ -23,6 +26,7 @@ import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Memory; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; /** @@ -207,6 +211,55 @@ public class Connect { } return processError(success); } + + /** + * This function returns statistics about the cpu, that is the time + * each cpu is spending in kernel time, user time, io time and idle time. + * Each CPUStat object refers to a particular time. + * + * Note that not all these stats are granted to be retrieved. + * + * @param the number of the cpu you want to retrieve stats from. + * passing -1 will make this function retrieve a mean value + * from all cpus the system has. + * + * @param some flags + * @return a cpustat object for each cpu + * @throws LibvirtException + */ + public CPUStat[] getCPUStats(int cpuNumber,long flags) throws LibvirtException{ + CPUStat[] stats = null; + + IntByReference nParams = new IntByReference(); + + //according to libvirt reference you call this function once passing + //null as param paramether to get the actual stats (kernel,user,io,idle) number into the + //nParams reference. Generally this number would be 4, but some systems + //may not give all 4 times, so it is always good to call it. + int result = libvirt.virNodeGetCPUStats( + VCP, cpuNumber, null, nParams, flags); + + processError(result); + + if(result == 0){//dunno if this check is actually needed + + //this time we create an array to fit the number of paramethers + virNodeCPUStats[] params = new virNodeCPUStats[nParams.getValue()]; + //and we pass it to the function + result = libvirt.virNodeGetCPUStats(VCP, cpuNumber , params, nParams, flags); + processError(result); + + //finally we parse the result in an user friendly class which does + //not expose libvirt's internal paramethers + if(result >= 0){ + stats = new CPUStat[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStat(params[i]); + } + } + + return stats; + } /** * Compares the given CPU description with the host CPU diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..658299f 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -1,5 +1,8 @@ package org.libvirt.jna; +import org.libvirt.jna.ConnectionPointer; +import org.libvirt.jna.virNodeCPUStats; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -267,6 +270,8 @@ public interface Libvirt extends Library { int virNetworkUndefine(NetworkPointer virConnectPtr); // Node functions + int virNodeGetCPUStats(ConnectionPointer virConnectPtr, int cpuNum, + virNodeCPUStats[] stats,IntByReference nparams, long flags); int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); diff --git a/src/main/java/org/libvirt/jna/virNodeCPUStats.java b/src/main/java/org/libvirt/jna/virNodeCPUStats.java new file mode 100644 index 0000000..a8f2dca --- /dev/null +++ b/src/main/java/org/libvirt/jna/virNodeCPUStats.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.NativeLong; +import com.sun.jna.Structure; + +public class virNodeCPUStats extends Structure{ + public byte[] field = new byte[80]; + public NativeLong value ; + + private static final List fields = Arrays.asList( "field", "value"); + + @Override + protected List getFieldOrder() { + return fields; + } +} -- 1.8.3.2

3 4

[libvirt] [PATCH] storage: netfs: Handle backend errors
by John Ferlan 15 Apr '14

15 Apr '14

Commit id '18642d10' caused a virt-test regression for NFS backend storage error path checks when running the command: 'virsh find-storage-pool-sources-as netfs Unknown ' when the host did not have Gluster installed. Prior to the commit, the test would fail with the error: error: internal error: Child process (/usr/sbin/showmount --no-headers --exports Unknown) unexpected exit status 1: clnt_create: RPC: Unknown host After the commit, the error would be ignored, the call would succeed, and an empty list of pool sources returned. This was tucked into the commit message as an expected outcome. When the target host does not have a GLUSTER_CLI this is a regression over the previous release. Furthermore, even if Gluster CLI was present, but had a failure to get devices, the API would return a failure even if the NFS backend had found devices. Add code to handle the error conditions. - If NFS fails - If there is no Gluster CLI, then jump to cleanup/failure. - If there is a Gluster CLI, then message the NFS failure and continue with the Gluster checks. - If Gluster fails - If NFS had failed, then jump to cleanup/failure. - Message the Gluster failure and continue on. - If only one fails, fetch and return a list of source devices even if it's empty Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend.c | 14 +++++++++++++ src/storage/storage_backend.h | 1 + src/storage/storage_backend_fs.c | 43 +++++++++++++++++++++++++++++++++++----- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b56fefe..4d73902 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1643,6 +1643,13 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, } #ifdef GLUSTER_CLI +bool +virStorageBackendHaveGlusterCLI(void) +{ + return true; +} + + int virStorageBackendFindGlusterPoolSources(const char *host, int pooltype, @@ -1721,6 +1728,13 @@ virStorageBackendFindGlusterPoolSources(const char *host, return ret; } #else /* #ifdef GLUSTER_CLI */ +bool +virStorageBackendHaveGlusterCLI(void) +{ + return false; +} + + int virStorageBackendFindGlusterPoolSources(const char *host ATTRIBUTE_UNUSED, int pooltype ATTRIBUTE_UNUSED, diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 4f95000..41eed97 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -87,6 +87,7 @@ int virStorageBackendFindFSImageTool(char **tool); virStorageBackendBuildVolFrom virStorageBackendFSImageToolTypeToFunc(int tool_type); +bool virStorageBackendHaveGlusterCLI(void); int virStorageBackendFindGlusterPoolSources(const char *host, int pooltype, virStoragePoolSourceListPtr list); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 4e4a7ae..f3d4a6d 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -238,9 +238,11 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, } -static void +static int virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) { + int ret = -1; + /* * # showmount --no-headers -e HOSTNAME * /tmp * @@ -267,9 +269,13 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) if (virCommandRunRegex(cmd, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, state, NULL) < 0) - virResetLastError(); + goto cleanup; + ret = 0; + + cleanup: virCommandFree(cmd); + return ret; } @@ -289,6 +295,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE virStoragePoolSourcePtr source = NULL; char *ret = NULL; size_t i; + bool failNFS = false; virCheckFlags(0, NULL); @@ -310,12 +317,38 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE state.host = source->hosts[0].name; - virStorageBackendFileSystemNetFindNFSPoolSources(&state); + if (virStorageBackendFileSystemNetFindNFSPoolSources(&state) < 0) { + virErrorPtr err; + /* If no Gluster CLI, then force error right here */ + if (!virStorageBackendHaveGlusterCLI()) + goto cleanup; + + /* If we have a Gluster CLI, then message the error, clean it out, + * and move onto the Gluster code + */ + err = virGetLastError(); + VIR_ERROR(_("Failed to get NFS pool sources: '%s'"), + err != NULL ? err->message: _("unknown error")); + virResetLastError(); + failNFS = true; + } if (virStorageBackendFindGlusterPoolSources(state.host, VIR_STORAGE_POOL_NETFS_GLUSTERFS, - &state.list) < 0) - goto cleanup; + &state.list) < 0) { + virErrorPtr err; + /* If NFS failed as well, then force the error right here */ + if (failNFS) + goto cleanup; + + /* Otherwise, NFS passed, so we message the Gluster error, clean + * it out, and generate the source list (even if it's empty) + */ + err = virGetLastError(); + VIR_ERROR(_("Failed to get Gluster pool sources: '%s'"), + err != NULL ? err->message: _("unknown error")); + virResetLastError(); + } if (!(ret = virStoragePoolSourceListFormat(&state.list))) goto cleanup; -- 1.9.0

2 3

[libvirt] [PATCH] Fix virsystemdtest without SYSTEMD_DAEMON
by Ján Tomko 15 Apr '14

15 Apr '14

Commit 4897698 fixed the build without dbus by only building the virSystemdPMSupportTarget with SYSTEMD_DAEMON. Introduce a virDBusMessageUnref wrapper for dbus_message_unref to let virsystemd.c build without dbus, while still allowing virsystemdtest to run without SYSTEM_DAEMON. --- src/util/virdbus.c | 9 +++++++++ src/util/virdbus.h | 1 + src/util/virsystemd.c | 11 +---------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 0cd3858..4217aea 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1614,6 +1614,11 @@ int virDBusIsServiceRegistered(const char *name) return ret; } +void virDBusMessageUnref(DBusMessage *msg) +{ + dbus_message_unref(msg); +} + #else /* ! WITH_DBUS */ void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED) { @@ -1751,4 +1756,8 @@ int virDBusIsServiceRegistered(const char *name ATTRIBUTE_UNUSED) return -2; } +void virDBusMessageUnref(DBusMessage *msg ATTRIBUTE_UNUSED) +{ + /* nothing */ +} #endif /* ! WITH_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 0f21821..a4987b8 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -74,6 +74,7 @@ int virDBusCall(DBusConnection *conn, DBusError *error); int virDBusMessageRead(DBusMessage *msg, const char *types, ...); +void virDBusMessageUnref(DBusMessage *msg); int virDBusIsServiceEnabled(const char *name); int virDBusIsServiceRegistered(const char *name); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e67956f..ad15a18 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -326,7 +326,6 @@ virSystemdNotifyStartup(void) #endif } -#ifdef WITH_SYSTEMD_DAEMON static int virSystemdPMSupportTarget(const char *methodName, bool *result) { @@ -365,19 +364,11 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) ret = 0; cleanup: - dbus_message_unref(message); + virDBusMessageUnref(message); VIR_FREE(response); return ret; } -#else /* ! WITH_SYSTEMD_DAEMON */ -static int -virSystemdPMSupportTarget(const char *methodName ATTRIBUTE_UNUSED, - bool *result ATTRIBUTE_UNUSED) -{ - return -2; -} -#endif /* ! WITH_SYSTEMD_DAEMON */ int virSystemdCanSuspend(bool *result) { -- 1.8.3.2

2 2

[libvirt] Java Bindings ConnectAuthDefault callback never called
by Sergio Rodriguez de Guzman 14 Apr '14

14 Apr '14

I'm following the instructions mentioned in the list some years ago about using a subclass of ConnectAuth using ConnectAuthDefault as a sample: "You could create your own subclass of ConnectAuth, and override the method:" public abstract int callback(Credential[] cred); What I'm doing is just "copying" ConnectAuthDefault to ConnectAuthAlternate and using exactly the same code. The thing is that the callback defined in that class never fires: ConnectAuth defaultAuth = new ConnectAuthAlternate(); try{ conn = new Connect("qemu+ssh://student@10.164.1.21/system", defaultAuth, 0); } catch (LibvirtException e){ System.out.println("exception caught:"+e); System.out.println(e.getError()); } It works as expected, asks for the user password and connects successfully but it never reaches the callback defined in ConnectAuthAlternate (aka ConnectAuthDefault): @Override public int callback(Credential[] cred) { BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); [...] I'm using libvirt-java 0.5.1, JNA 4.1 and the current libvirt version that comes with ubuntu 13.10: 1.1.1-0ubuntu8.5 Could you give some light about this?. Sergio.

1 0

[libvirt] [PATCH 0/6] RelaxNG improvements for virStorageSource
by Eric Blake 14 Apr '14

14 Apr '14

Part of extending the domain XML to show an entire backing chain is splitting the RelaxNG definitions so that the portion related to a single source within the chain can easily be reused. I'm still debating about the way to handle storage volumes using <format type='qcow2'/> vs. domain disks using <driver name='qcow2' type='qcow2'/>. The majority of the <driver> attributes are associated with the one disk device presented to the guest, rather than attributes for a file in the chain. So I'm thinking of having domain disks add a new <format> element; where we output the format under both elements but accept either spelling for new input (back-compat reasons require that we always provide the old spelling). Eric Blake (6): conf: create common storage RNG grammar file conf: better <disk> interleaving in schema conf: tighten <domainsnapshot> schema conf: split <disk> schema into more pieces conf: move storage source details to common RNG file conf: move <auth> and <encryption> to disk source docs/schemas/Makefile.am | 5 +- docs/schemas/domain.rng | 15 +- docs/schemas/domaincommon.rng | 268 ++---------------- docs/schemas/domainsnapshot.rng | 85 +++--- docs/schemas/storagecommon.rng | 312 +++++++++++++++++++++ docs/schemas/storageencryption.rng | 33 --- docs/schemas/storagefilefeatures.rng | 24 -- docs/schemas/storagevol.rng | 3 +- .../qemuxml2argv-disk-drive-discard.xml | 8 +- .../qemuxml2argv-disk-source-pool.xml | 12 +- .../qemuxml2xmlout-disk-drive-discard.xml | 37 +++ .../qemuxml2xmlout-disk-source-pool.xml | 44 +++ tests/qemuxml2xmltest.c | 4 +- 13 files changed, 477 insertions(+), 373 deletions(-) create mode 100644 docs/schemas/storagecommon.rng delete mode 100644 docs/schemas/storageencryption.rng delete mode 100644 docs/schemas/storagefilefeatures.rng create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml -- 1.9.0

2 9

[libvirt] [PATCHv2] virsh: Make vshCommandOpt* report error
by Michal Privoznik 14 Apr '14

14 Apr '14

Currently, the virsh code is plenty of the following pattern: if (vshCommandOptUInt(..) < 0) { vshError(...); goto cleanup; } It doesn't make much sense to repeat the code everywhere. Moreover, some functions from the family already report error some of them don't. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vcpupin | 2 +- tools/virsh-domain-monitor.c | 7 +-- tools/virsh-domain.c | 102 +++++++++++++++---------------------------- tools/virsh-host.c | 25 +++-------- tools/virsh-interface.c | 4 +- tools/virsh-network.c | 4 +- tools/virsh-volume.c | 16 ++----- tools/virsh.c | 99 +++++++++++++++++++++++++++++++---------- tools/virsh.h | 24 +++++----- 9 files changed, 140 insertions(+), 143 deletions(-) diff --git a/tests/vcpupin b/tests/vcpupin index f1fb038..638f62b 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -34,7 +34,7 @@ fail=0 $abs_top_builddir/tools/virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 -error: vcpupin: Invalid or missing vCPU number. +error: Unable to parse integer parameter to --vcpu EOF compare exp out || fail=1 diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 18d551a..0da4f91 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -324,12 +324,9 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) /* Providing a period will adjust the balloon driver collection period. * This is not really an unsigned long, but it */ - if ((rv = vshCommandOptInt(cmd, "period", &period)) < 0) { - vshError(ctl, "%s", - _("Unable to parse integer parameter.")); + if ((rv = vshCommandOptInt(ctl, cmd, "period", &period)) < 0) { goto cleanup; - } - if (rv > 0) { + } else if (rv > 0) { if (period < 0) { vshError(ctl, _("Invalid collection period value '%d'"), period); goto cleanup; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..821ed62 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1119,8 +1119,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) goto cleanup; - if ((rv = vshCommandOptULongLong(cmd, "total-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, @@ -1128,8 +1128,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "read-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, @@ -1137,8 +1137,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "write-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, @@ -1146,8 +1146,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "total-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, @@ -1155,8 +1155,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "read-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, @@ -1164,8 +1164,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "write-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, @@ -1216,10 +1216,6 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) error: vshError(ctl, "%s", _("Unable to change block I/O throttle")); goto cleanup; - - interror: - vshError(ctl, "%s", _("Unable to parse integer parameter")); - goto cleanup; } /* @@ -1315,8 +1311,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) { - vshError(ctl, "%s", _("Unable to parse integer parameter")); + if ((rv = vshCommandOptInt(ctl, cmd, "weight", &weight)) < 0) { goto cleanup; } else if (rv > 0) { if (weight <= 0) { @@ -1457,10 +1452,8 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) goto cleanup; - if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { - vshError(ctl, "%s", _("bandwidth must be a number")); + if (vshCommandOptUL(ctl, cmd, "bandwidth", &bandwidth) < 0) goto cleanup; - } switch ((vshCmdBlockJobMode) mode) { case VSH_CMD_BLOCK_JOB_ABORT: @@ -2215,10 +2208,8 @@ cmdBlockResize(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "path", (const char **) &path) < 0) return false; - if (vshCommandOptScaledInt(cmd, "size", &size, 1024, ULLONG_MAX) < 0) { - vshError(ctl, "%s", _("Unable to parse integer")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &size, 1024, ULLONG_MAX) < 0) return false; - } /* Prefer the older interface of KiB. */ if (size % 1024 == 0) @@ -2805,10 +2796,8 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptULongLong(cmd, "duration", &duration) < 0) { - vshError(ctl, _("Invalid duration argument")); + if (vshCommandOptULongLong(ctl, cmd, "duration", &duration) < 0) goto cleanup; - } if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) goto cleanup; @@ -4709,10 +4698,8 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0) return false; - if (vshCommandOptUInt(cmd, "screen", &screen) < 0) { - vshError(ctl, "%s", _("invalid screen ID")); + if (vshCommandOptUInt(ctl, cmd, "screen", &screen) < 0) return false; - } if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; @@ -5819,9 +5806,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) query = !cpulist; /* In query mode, "vcpu" is optional */ - if (vshCommandOptInt(cmd, "vcpu", &vcpu) < !query) { - vshError(ctl, "%s", - _("vcpupin: Invalid or missing vCPU number.")); + if (vshCommandOptInt(ctl, cmd, "vcpu", &vcpu) < !query) { virDomainFree(dom); return false; } @@ -6063,7 +6048,7 @@ static bool cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - int count = 0; + unsigned int count = 0; bool ret = false; bool maximum = vshCommandOptBool(cmd, "maximum"); bool config = vshCommandOptBool(cmd, "config"); @@ -6089,10 +6074,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "count", &count) < 0 || count <= 0) { - vshError(ctl, "%s", _("Invalid number of virtual CPUs")); + if (vshCommandOptUInt(ctl, cmd, "count", &count) < 0) goto cleanup; - } if (flags == -1) { if (virDomainSetVcpus(dom, count) != 0) @@ -6384,8 +6367,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) show_total = vshCommandOptBool(cmd, "total"); - if ((rv = vshCommandOptInt(cmd, "start", &cpu)) < 0) { - vshError(ctl, "%s", _("Unable to parse integer parameter for start")); + if ((rv = vshCommandOptInt(ctl, cmd, "start", &cpu)) < 0) { goto cleanup; } else if (rv > 0) { if (cpu < 0) { @@ -6395,9 +6377,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) show_per_cpu = true; } - if ((rv = vshCommandOptInt(cmd, "count", &show_count)) < 0) { - vshError(ctl, "%s", - _("Unable to parse integer parameter for CPUs to show")); + if ((rv = vshCommandOptInt(ctl, cmd, "count", &show_count)) < 0) { goto cleanup; } else if (rv > 0) { if (show_count < 0) { @@ -7157,10 +7137,8 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "codeset", &codeset_option) <= 0) codeset_option = "linux"; - if (vshCommandOptUInt(cmd, "holdtime", &holdtime) < 0) { - vshError(ctl, _("invalid value of --holdtime")); + if (vshCommandOptUInt(ctl, cmd, "holdtime", &holdtime) < 0) goto cleanup; - } codeset = virKeycodeSetTypeFromString(codeset_option); if (codeset < 0) { @@ -7384,8 +7362,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) max = 1024ull * ULONG_MAX; else max = ULONG_MAX; - if (vshCommandOptScaledInt(cmd, "size", &bytes, 1024, max) < 0) { - vshError(ctl, "%s", _("memory size has to be a number")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { virDomainFree(dom); return false; } @@ -7481,8 +7458,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) max = 1024ull * ULONG_MAX; else max = ULONG_MAX; - if (vshCommandOptScaledInt(cmd, "size", &bytes, 1024, max) < 0) { - vshError(ctl, "%s", _("memory size has to be a number")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { virDomainFree(dom); return false; } @@ -8123,9 +8099,11 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) bool ret = false; unsigned int flags = 0; unsigned int pid_value; /* API uses unsigned int, not pid_t */ + int rv; - if (vshCommandOptUInt(cmd, "pid", &pid_value) <= 0) { - vshError(ctl, "%s", _("missing pid value")); + if ((rv = vshCommandOptUInt(ctl, cmd, "pid", &pid_value)) <= 0) { + if (rv == 0) + vshError(ctl, "%s", _("missing pid value")); goto cleanup; } @@ -8220,9 +8198,8 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) } guest_agent_cmd = virBufferContentAndReset(&buf); - judge = vshCommandOptInt(cmd, "timeout", &timeout); + judge = vshCommandOptInt(ctl, cmd, "timeout", &timeout); if (judge < 0) { - vshError(ctl, "%s", _("timeout number has to be a number")); goto cleanup; } else if (judge > 0) { judge = 1; @@ -9089,17 +9066,14 @@ static bool cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - long long downtime = 0; + unsigned long long downtime = 0; bool ret = false; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptLongLong(cmd, "downtime", &downtime) < 0 || - downtime < 1) { - vshError(ctl, "%s", _("migrate: Invalid downtime")); + if (vshCommandOptULongLong(ctl, cmd, "downtime", &downtime) < 0) goto done; - } if (virDomainMigrateSetMaxDowntime(dom, downtime, 0)) goto done; @@ -9152,9 +9126,7 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - rc = vshCommandOptULongLong(cmd, "size", &size); - if (rc < 0) { - vshError(ctl, "%s", _("Unable to parse size parameter")); + if ((rc = vshCommandOptULongLong(ctl, cmd, "size", &size)) < 0) { goto cleanup; } else if (rc != 0) { if (virDomainMigrateSetCompressionCache(dom, size, 0) < 0) @@ -9211,10 +9183,8 @@ cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { - vshError(ctl, "%s", _("migrate: Invalid bandwidth")); + if (vshCommandOptUL(ctl, cmd, "bandwidth", &bandwidth) < 0) goto done; - } if (virDomainMigrateSetMaxSpeed(dom, bandwidth, 0) < 0) goto done; @@ -11371,10 +11341,8 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return ret; - if (vshCommandOptULongLong(cmd, "minimum", &minimum) < 0) { - vshError(ctl, _("Unable to parse integer parameter minimum")); + if (vshCommandOptULongLong(ctl, cmd, "minimum", &minimum) < 0) goto cleanup; - } if (vshCommandOptStringReq(ctl, cmd, "mountpoint", &mountPoint) < 0) goto cleanup; diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..61be4c0 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -111,10 +111,8 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(all, cellno); - if (cellno && vshCommandOptInt(cmd, "cellno", &cell) < 0) { - vshError(ctl, "%s", _("cell number has to be a number")); + if (cellno && vshCommandOptInt(ctl, cmd, "cellno", &cell) < 0) return false; - } if (all) { if (!(cap_xml = virConnectGetCapabilities(ctl->conn))) { @@ -372,10 +370,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) unsigned long long cpu_stats[VSH_CPU_LAST] = { 0 }; bool present[VSH_CPU_LAST] = { false }; - if (vshCommandOptInt(cmd, "cpu", &cpuNum) < 0) { - vshError(ctl, "%s", _("Invalid value of cpuNum")); + if (vshCommandOptInt(ctl, cmd, "cpu", &cpuNum) < 0) return false; - } if (virNodeGetCPUStats(ctl->conn, cpuNum, NULL, &nparams, 0) != 0) { vshError(ctl, "%s", @@ -481,10 +477,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) virNodeMemoryStatsPtr params = NULL; bool ret = false; - if (vshCommandOptInt(cmd, "cell", &cellNum) < 0) { - vshError(ctl, "%s", _("Invalid value of cellNum")); + if (vshCommandOptInt(ctl, cmd, "cell", &cellNum) < 0) return false; - } /* get the number of memory parameters */ if (virNodeGetMemoryStats(ctl->conn, cellNum, NULL, &nparams, 0) != 0) { @@ -555,10 +549,8 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) return false; - if (vshCommandOptLongLong(cmd, "duration", &duration) < 0) { - vshError(ctl, _("Invalid duration argument")); + if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0) return false; - } if (STREQ(target, "mem")) suspendTarget = VIR_NODE_SUSPEND_TARGET_MEM; @@ -862,8 +854,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) int rc = -1; size_t i; - if ((rc = vshCommandOptUInt(cmd, "shm-pages-to-scan", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-pages-to-scan number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-pages-to-scan", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, @@ -872,8 +863,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rc = vshCommandOptUInt(cmd, "shm-sleep-millisecs", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-sleep-millisecs number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-sleep-millisecs", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, @@ -882,8 +872,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rc = vshCommandOptUInt(cmd, "shm-merge-across-nodes", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-merge-across-nodes number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-merge-across-nodes", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index d4ec854..4dfd4ae 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -844,10 +844,8 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) /* use "no-stp" because we want "stp" to default true */ stp = !vshCommandOptBool(cmd, "no-stp"); - if (vshCommandOptUInt(cmd, "delay", &delay) < 0) { - vshError(ctl, "%s", _("Unable to parse delay parameter")); + if (vshCommandOptUInt(ctl, cmd, "delay", &delay) < 0) goto cleanup; - } nostart = vshCommandOptBool(cmd, "no-start"); diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 4b0df62..1f42b0d 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -943,10 +943,8 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (vshCommandOptInt(cmd, "parent-index", &parentIndex) < 0) { - vshError(ctl, "%s", _("malformed parent-index argument")); + if (vshCommandOptInt(ctl, cmd, "parent-index", &parentIndex) < 0) goto cleanup; - } /* The goal is to have a full xml element in the "xml" * string. This is provided in the --xml option, either directly diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 55bf6f0..24a2b14 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -658,15 +658,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; unsigned long long offset = 0, length = 0; - if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) return false; - } - if (vshCommandOptULongLong(cmd, "length", &length) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "length", &length) < 0) return false; - } if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) { return false; @@ -768,15 +764,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) unsigned long long offset = 0, length = 0; bool created = false; - if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) return false; - } - if (vshCommandOptULongLong(cmd, "length", &length) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "length", &length) < 0) return false; - } if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) return false; diff --git a/tools/virsh.c b/tools/virsh.c index 28af3c3..b2edea3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1469,6 +1469,7 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, /** * vshCommandOptInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1480,7 +1481,10 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, * <0 in all other cases (@value untouched) */ int -vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) +vshCommandOptInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + int *value) { vshCmdOpt *arg; int ret; @@ -1489,14 +1493,19 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) if (ret <= 0) return ret; - if (virStrToLong_i(arg->data, NULL, 10, value) < 0) + if (virStrToLong_i(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptUInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1505,7 +1514,10 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) * See vshCommandOptInt() */ int -vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) +vshCommandOptUInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned int *value) { vshCmdOpt *arg; int ret; @@ -1514,14 +1526,19 @@ vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) if (ret <= 0) return ret; - if (virStrToLong_ui(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ui(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /* * vshCommandOptUL: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1530,7 +1547,10 @@ vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) * See vshCommandOptInt() */ int -vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) +vshCommandOptUL(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned long *value) { vshCmdOpt *arg; int ret; @@ -1539,8 +1559,12 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) if (ret <= 0) return ret; - if (virStrToLong_ul(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ul(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } @@ -1620,6 +1644,7 @@ vshCommandOptStringReq(vshControl *ctl, /** * vshCommandOptLongLong: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1628,7 +1653,9 @@ vshCommandOptStringReq(vshControl *ctl, * See vshCommandOptInt() */ int -vshCommandOptLongLong(const vshCmd *cmd, const char *name, +vshCommandOptLongLong(vshControl *ctl, + const vshCmd *cmd, + const char *name, long long *value) { vshCmdOpt *arg; @@ -1638,13 +1665,18 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, if (ret <= 0) return ret; - if (virStrToLong_ll(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ll(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptULongLong: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1653,7 +1685,9 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, * See vshCommandOptInt() */ int -vshCommandOptULongLong(const vshCmd *cmd, const char *name, +vshCommandOptULongLong(vshControl *ctl, + const vshCmd *cmd, + const char *name, unsigned long long *value) { vshCmdOpt *arg; @@ -1663,14 +1697,19 @@ vshCommandOptULongLong(const vshCmd *cmd, const char *name, if (ret <= 0) return ret; - if (virStrToLong_ull(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ull(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptScaledInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1681,8 +1720,11 @@ vshCommandOptULongLong(const vshCmd *cmd, const char *name, * See vshCommandOptInt() */ int -vshCommandOptScaledInt(const vshCmd *cmd, const char *name, - unsigned long long *value, int scale, +vshCommandOptScaledInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned long long *value, + int scale, unsigned long long max) { const char *str; @@ -1692,9 +1734,18 @@ vshCommandOptScaledInt(const vshCmd *cmd, const char *name, ret = vshCommandOptString(cmd, name, &str); if (ret <= 0) return ret; - if (virStrToLong_ull(str, &end, 10, value) < 0 || - virScaleInteger(value, end, scale, max) < 0) + if (virStrToLong_ull(str, &end, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } + + if (virScaleInteger(value, end, scale, max) < 0) { + vshError(ctl, "%s", + _("value falls out of range")); + return -1; + } return 1; } @@ -1771,20 +1822,22 @@ vshCmdHasOption(vshControl *ctl, const vshCmd *cmd, const char *optname) int vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout) { - int rv = vshCommandOptInt(cmd, "timeout", timeout); + int rv = vshCommandOptInt(ctl, cmd, "timeout", timeout); - if (rv < 0 || (rv > 0 && *timeout < 1)) { + if (rv <= 0) + return rv; + + if (*timeout < 1) { vshError(ctl, "%s", _("invalid timeout")); return -1; } - if (rv > 0) { - /* Ensure that we can multiply by 1000 without overflowing. */ - if (*timeout > INT_MAX / 1000) { - vshError(ctl, "%s", _("timeout is too big")); - return -1; - } - *timeout *= 1000; + + /* Ensure that we can multiply by 1000 without overflowing. */ + if (*timeout > INT_MAX / 1000) { + vshError(ctl, "%s", _("timeout is too big")); + return -1; } + *timeout *= 1000; return rv; } diff --git a/tools/virsh.h b/tools/virsh.h index 3e0251b..b217206 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -168,7 +168,7 @@ struct _vshCmdInfo { struct _vshCmdOptDef { const char *name; /* the name of option, or NULL for list end */ vshCmdOptType type; /* option type */ - unsigned int flags; /* flags */ + unsigned int flags; /* bitwise OR of VSH_OFLAG_**/ const char *help; /* non-NULL help string; or for VSH_OT_ALIAS * the name of a later public option */ vshCompleter completer; /* option completer */ @@ -280,13 +280,14 @@ bool vshCmddefHelp(vshControl *ctl, const char *name); const vshCmdGrp *vshCmdGrpSearch(const char *grpname); bool vshCmdGrpHelp(vshControl *ctl, const char *name); -int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) +int vshCommandOptInt(vshControl *ctl, const vshCmd *cmd, + const char *name, int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptUInt(const vshCmd *cmd, const char *name, - unsigned int *value) +int vshCommandOptUInt(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptUL(const vshCmd *cmd, const char *name, - unsigned long *value) +int vshCommandOptUL(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) @@ -295,13 +296,14 @@ int vshCommandOptStringReq(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptLongLong(const vshCmd *cmd, const char *name, - long long *value) +int vshCommandOptLongLong(vshControl *ctl, const vshCmd *cmd, + const char *name, long long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptULongLong(const vshCmd *cmd, const char *name, - unsigned long long *value) +int vshCommandOptULongLong(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned long long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptScaledInt(const vshCmd *cmd, const char *name, +int vshCommandOptScaledInt(vshControl *ctl, + const vshCmd *cmd, const char *name, unsigned long long *value, int scale, unsigned long long max) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -- 1.9.0

2 1

[libvirt] [PATCH] build: Don't use code with dbus_message_unref when built without dbus
by Martin Kletzander 14 Apr '14

14 Apr '14

In order to do that, virNodeSuspendSupportsTargetPMUtils() and virSystemdPMSupportTarget() are created even when pm-utils and dbus are compiled out, respectively, but in that case returning -2 meaning "unavailable" (this return code was already used for unavailability before). Error is reported in virNodeSuspendSupportsTarget() only if both functions returned -2, otherwise the error (or success) is properly propagated up the stack. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v1: https://www.redhat.com/archives/libvir-list/2014-April/msg00550.html This is a build-breaker if building --without-dbus due to dbus_message_unref being called unconditionally. However, I'm not pushing it as such. I haven't followed the suggestion of return codes -1, 0 and 1 because there is already a -2 used for unavailability and these return codes are used in other parts of the code for similar reasons as well (e.g. storage driver). src/util/virnodesuspend.c | 22 ++++++++++++++++++---- src/util/virsystemd.c | 11 ++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 59b84ef..60b86ee 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -1,6 +1,7 @@ /* * virnodesuspend.c: Support for suspending a node (host machine) * + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2011 Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> * * This library is free software; you can redistribute it and/or @@ -267,7 +268,14 @@ virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } -#endif +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTargetPMUtils(unsigned int target ATTRIBUTE_UNUSED, + bool *supported ATTRIBUTE_UNUSED) +{ + return -2; +} +#endif /* ! WITH_PM_UTILS */ static int virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) @@ -313,10 +321,16 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) int ret; ret = virNodeSuspendSupportsTargetSystemd(target, supported); -#ifdef WITH_PM_UTILS - if (ret < 0) + + /* If just unavailable, try other options */ + if (ret == -2) ret = virNodeSuspendSupportsTargetPMUtils(target, supported); -#endif + + /* If still unavailable, then report error */ + if (ret == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot probe for supported suspend types")); + } return ret; } diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e9ca564..e67956f 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -1,7 +1,7 @@ /* * virsystemd.c: helpers for using systemd APIs * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -326,6 +326,7 @@ virSystemdNotifyStartup(void) #endif } +#ifdef WITH_SYSTEMD_DAEMON static int virSystemdPMSupportTarget(const char *methodName, bool *result) { @@ -369,6 +370,14 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) return ret; } +#else /* ! WITH_SYSTEMD_DAEMON */ +static int +virSystemdPMSupportTarget(const char *methodName ATTRIBUTE_UNUSED, + bool *result ATTRIBUTE_UNUSED) +{ + return -2; +} +#endif /* ! WITH_SYSTEMD_DAEMON */ int virSystemdCanSuspend(bool *result) { -- 1.9.2

2 1

[libvirt] [PATCH] build: Embed dbus_message_unref in virdbus
by Martin Kletzander 14 Apr '14

14 Apr '14

Adding dbus_message_unref() into virDBusMessageDecodeArgs() makes sure that the message gets unref'd, thus making one more pure dbus call not necessary. Even though we are calling a lot of dbus_* functions outside virdbus (which should be fixed in the future IMHO), this patch fixes only this one instance because it merely aims to fix a build-breaker caused by improperly included dbus.h. The message printed when failing (using --without-dbus) is: util/virsystemd.c: In function 'virSystemdPMSupportTarget': util/virsystemd.c:367:5: error: implicit declaration of function 'dbus_message_unref' [-Werror=implicit-function-declaration] dbus_message_unref(message); ^ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I checked that we're not unreffing the message twice anywhere, but I wanted to check there is no crash if we do unref it twice. While trying whether double unreffing the message breaks anything, I saw that dbus_message_unref() has a refcount and it cleans structure when the refcount reaches 0, the cleansing means it sets it to -1 as well. OK, so it doesn't break anything, but the allocated structure is still not free()'d. I ran virsystemdtest under valgrind and saw that the message is really not free()'d. But here comes the best part; out of 6 test functions, only 3 of them are causing a leak and adding VIR_FREE(msg) to any test function other than the last one (which gets rid of one leak out of three) causes a segfault. I though dbus has it's own memory management or whatever, but looking at the backtrace, the crash happens when we are allocating DBusMessageIter *newiter one function later than the VIR_FREE(msg) is done (and msg is local to that function, btw). Even though this has nothing to do with the patch sent, I'd appreciate any explanation from anyone more dbus-knowledgeable than me (most probably anyone). src/util/virdbus.c | 1 + src/util/virsystemd.c | 3 +-- tests/virdbustest.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 0cd3858..aef1d34 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1112,6 +1112,7 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, } ret = virDBusMessageIterDecode(&iter, types, args); + dbus_message_unref(msg); cleanup: return ret; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e9ca564..9f67ac0 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -1,7 +1,7 @@ /* * virsystemd.c: helpers for using systemd APIs * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -364,7 +364,6 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) ret = 0; cleanup: - dbus_message_unref(message); VIR_FREE(response); return ret; diff --git a/tests/virdbustest.c b/tests/virdbustest.c index a798fbe..50578d9 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -121,7 +121,6 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); return ret; } @@ -171,7 +170,6 @@ static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); return ret; } @@ -224,7 +222,6 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); return ret; } @@ -322,7 +319,6 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) for (i = 0; i < out_nstrv2; i++) VIR_FREE(out_strv2[i]); VIR_FREE(out_strv2); - dbus_message_unref(msg); return ret; } @@ -397,7 +393,6 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); return ret; } @@ -467,7 +462,6 @@ static int testMessageDict(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_key1); VIR_FREE(out_key2); VIR_FREE(out_key3); - dbus_message_unref(msg); return ret; } -- 1.9.2

2 6

[libvirt] [PATCH] qemu: Avoid overflow when setting migration speed
by Jiri Denemark 14 Apr '14

14 Apr '14

When passing migration bandwidth to QEMU, we multiply it by 1024 * 1024 to convert the speed to B/s and the result still needs to fit in int64_t. https://bugzilla.redhat.com/show_bug.cgi?id=1083483 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5a5a59b..912bea1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2047,6 +2047,13 @@ int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon, return -1; } + if (bandwidth > QEMU_DOMAIN_MIG_BANDWIDTH_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + QEMU_DOMAIN_MIG_BANDWIDTH_MAX + 1ULL); + return -1; + } + if (mon->json) ret = qemuMonitorJSONSetMigrationSpeed(mon, bandwidth); else -- 1.9.2

2 2

[libvirt] [PATCH] RFC: bhyve: implement PCI address allocation
by Roman Bogorodskiy 14 Apr '14

14 Apr '14

Hi, This is the first attempt to implement PCI address allocation for the bhyve driver. This patch is by no means a complete version and the idea of this is to understand if I'm moving in a right direction. This code is based on the one from QEMU driver. Even though bhyve currently has no support for PCI bridges, it should be possible to add that support without major rewrites when this feature will be available in bhyve. So, currently we have the following. For a domain like that: https://gist.github.com/novel/10569989#file-domainin-xml The processed domain looks this way: https://gist.github.com/novel/10569989#file-domainout-xml and the command is: https://gist.github.com/novel/10569989#file-cmd Please let me know if it's uncomfortable to follow gist links; I didn't put domain xml inline as it's pretty lengthy. Open questions are: * What's the best way to deal with the 0:0,hostbridge device, should it be explicitly added to the domain definition? * How to handle lpc device, that's required for console. From bhyve point of view it looks like this: -s 31,lpc -l com1,ttydev That is, LPC PCI-ISA bridge on PCI slot and com1 port on that bridge. Things that need to be fixed in that patch, but are obvious: * Fix 'make check' which fails for obvious reasons of new addresses in domain xml * As we support more than one disk device, respect boot order Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 128 +++++++++++----------- src/bhyve/bhyve_device.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_device.h | 41 +++++++ src/bhyve/bhyve_domain.c | 75 +++++++++++++ src/bhyve/bhyve_domain.h | 41 +++++++ src/bhyve/bhyve_driver.c | 9 +- 8 files changed, 503 insertions(+), 68 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

2 3