- Devel - libvirt List Archives

[libvirt] [PATCH 0/2 v2] Fixes on shareable SCSI host device
by Osier Yang 23 Jan '14

23 Jan '14

*** BLURB HERE *** Osier Yang (2): util: Add "shareable" field for virSCSIDevice struct qemu: Don't fail if the SCSI host device is shareable between domains src/libvirt_private.syms | 3 +- src/qemu/qemu_cgroup.c | 3 +- src/qemu/qemu_hostdev.c | 84 ++++++++++++++++++++++------------------ src/security/security_apparmor.c | 3 +- src/security/security_dac.c | 6 ++- src/security/security_selinux.c | 6 ++- src/util/virscsi.c | 59 +++++++++++++++++++++++----- src/util/virscsi.h | 11 ++++-- 8 files changed, 116 insertions(+), 59 deletions(-) -- 1.8.1.4

2 12

[libvirt] [PATCH v3] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 23 Jan '14

23 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the cpuid read from /proc/stat, it will cause obvious error. For example: 'virsh nodecpustats 1' will display stats of cpu1* if the latter is online and cpu1 is offline. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..cf6d29b 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -691,7 +691,7 @@ linuxNodeGetCPUStats(FILE *procstat, char line[1024]; unsigned long long usr, ni, sys, idle, iowait; unsigned long long irq, softirq, steal, guest, guest_nice; - char cpu_header[3 + INT_BUFSIZE_BOUND(cpuNum)]; + char cpu_header[4 + INT_BUFSIZE_BOUND(cpuNum)]; if ((*nparams) == 0) { /* Current number of cpu stats supported by linux */ @@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat, } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { - strcpy(cpu_header, "cpu"); + strcpy(cpu_header, "cpu "); } else { - snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum); } while (fgets(line, sizeof(line), procstat) != NULL) { -- 1.7.7.6

2 1

[libvirt] [PATCH] util: Correct the NUMA node range checking
by Osier Yang 23 Jan '14

23 Jan '14

There are 2 issues here: First we shouldn't add "1" to the return value of numa_max_node(), since the semanteme of the error message was changed, it's not saying about the number of total NUMA nodes anymore. Second, the value of "bit" is the position of the first bit which exceeds either numa_max_node() or NUMA_NUM_NODES, it can be any number in the range, so saying "bigger than $bit" is quite confused now. For example, assuming there is a NUMA machine which has 10 NUMA nodes, and one specifies the "nodeset" as "0,5,88", the error message will be like: Nodeset is out of range, host cannot support NUMA node bigger than 88 It sounds like all NUMA node number less than 88 is fine, but actually the maximum NUMA node number the machine supports is 9. This patch fixes the issues by removing the addition with "1" and simplifies the error message as "NUMA node $bit is out of range". --- src/util/virnuma.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/util/virnuma.c b/src/util/virnuma.c index ab46591..500dca7 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -99,7 +99,6 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, int ret = -1; int bit = 0; size_t i; - int maxnode = 0; virBitmapPtr tmp_nodemask = NULL; if (numatune.memory.placement_mode == @@ -122,16 +121,13 @@ virNumaSetupMemoryPolicy(virNumaTuneDef numatune, return -1; } - maxnode = numa_max_node() + 1; - /* Convert nodemask to NUMA bitmask. */ nodemask_zero(&mask); bit = -1; while ((bit = virBitmapNextSetBit(tmp_nodemask, bit)) >= 0) { - if (bit > maxnode || bit > NUMA_NUM_NODES) { + if (bit > numa_max_node() || bit > NUMA_NUM_NODES) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("Nodeset is out of range, host cannot support " - "NUMA node bigger than %d"), bit); + _("NUMA node %d is out of range"), bit); return -1; } nodemask_set(&mask, bit); -- 1.8.1.4

2 2

[libvirt] mingw64 + gnulib time.h / pthread.h / gmtime_r incompatibility
by Daniel P. Berrange 23 Jan '14

23 Jan '14

I'm attempting to make libvirt capable of building with mingw64 toolchain's pthread.h, instead of directly using Windows thread primitives. As a quick hack I just changed libvirt logic to force use of pthreads, since configure is already doing the neccessary pthread.h probes for us even on win32 eg diff --git a/src/util/virthread.c b/src/util/virthread.c index dd1768e..8849d7d 100644 --- a/src/util/virthread.c +++ b/src/util/virthread.c @@ -25,7 +25,7 @@ /* On mingw, we prefer native threading over the sometimes-broken * pthreads-win32 library wrapper. */ -#ifdef WIN32 +#ifdef WINx32 # include "virthreadwin32.c" #elif defined HAVE_PTHREAD_MUTEXATTR_INIT # include "virthreadpthread.c" diff --git a/src/util/virthread.h b/src/util/virthread.h index 84d3bdc..649285e 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -111,7 +111,7 @@ int virThreadLocalInit(virThreadLocalPtr l, void *virThreadLocalGet(virThreadLocalPtr l); int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; -# ifdef WIN32 +# ifdef WINx32 # include "virthreadwin32.h" # elif defined HAVE_PTHREAD_MUTEXATTR_INIT # include "virthreadpthread.h" When attempting to build though I see failures CC util/libvirt_util_la-virerror.lo In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/time.h:10:0, from ../gnulib/lib/sys/time.h:39, from ../gnulib/lib/sys/select.h:117, from util/virutil.h:31, from util/virerror.c:35: ../gnulib/lib/time.h:468:21: error: expected identifier or '(' before '{' token _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer, ^ In file included from /usr/i686-w64-mingw32/sys-root/mingw/include/sys/time.h:10:0, from ../gnulib/lib/sys/time.h:39, from ../gnulib/lib/sys/select.h:117, from util/virutil.h:31, from util/virerror.c:35: ../gnulib/lib/time.h:490:21: error: expected identifier or '(' before '{' token _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer, ^ The problem appears to be that mingw64's pthread.h has the following craziness: /* Recursive API emulation. */ #undef localtime_r #define localtime_r(_Time, _Tm) ({ struct tm *___tmp_tm; \ pthread_testcancel(); \ ___tmp_tm = localtime((_Time));\ if (___tmp_tm) { \ *(_Tm) = *___tmp_tm; \ ___tmp_tm = (_Tm); \ } \ ___tmp_tm; }) #undef gmtime_r #define gmtime_r(_Time,_Tm) ({ struct tm *___tmp_tm; \ pthread_testcancel(); \ ___tmp_tm = gmtime((_Time)); \ if (___tmp_tm) { \ *(_Tm) = *___tmp_tm; \ ___tmp_tm = (_Tm); \ } \ ___tmp_tm; }) which clashes with the gnulib provided declarations for gmtime_r/localtime_r gnulib appears to be trying to workaround this problem already - the generated gnulib/lib/time.h file shows this though, which indicates its workaround hasn't been activated by 'configure': /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in <sys/time.h> (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the pthreads-win32 library defines it in <pthread.h>. */ # if ! 1 # if 0 # include <sys/time.h> # elif 0 # include <pthread.h> /* The pthreads-win32 <pthread.h> also defines a couple of broken macros. */ # undef asctime_r # undef ctime_r # undef gmtime_r # undef localtime_r # undef rand_r # undef strtok_r # else ie I would have expected that 'elif' to be 1 instead of 0. It seems the logic in gnulib/m4/time_h.m4 is incorrect. The configure check shows checking for struct timespec in <time.h>... yes and so time_h.m4 never gets as far as trying to detect the broken pthreads.h - its hidden in an unreachable else block. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH] api: require write permission for guest agent interaction
by Eric Blake 22 Jan '14

22 Jan '14

I noticed that we allow virDomainGetVcpusFlags even for read-only connections, but that with a flag, it can require guest agent interaction. It is feasible that a malicious guest could intentionally abuse the replies it sends over the guest agent connection to possibly trigger a bug in libvirt's JSON parser, or withhold an answer so as to prevent the use of the agent in a later command such as a shutdown request. Although we don't know of any such exploits now (and therefore don't mind posting this patch publicly without trying to get a CVE assigned), it is better to err on the side of caution and explicitly require full access to any domain where the API requires guest interaction to operate correctly. I audited all commands that are marked as conditionally using a guest agent. Note that at least virDomainFSTrim is documented as needing a guest agent, but that such use is unconditional depending on the hypervisor (so the existing domain:fs_trim ACL should be sufficient there, rather than also requirng domain:write). But when designing future APIs, such as the plans for obtaining a domain's IP addresses, we should copy the approach of this patch in making interaction with the guest be specified via a flag, and use that flag to also require stricter access checks. * src/libvirt.c (virDomainGetVcpusFlags): Forbid guest interaction on read-only connection. (virDomainShutdownFlags, virDomainReboot): Improve docs on agent interaction. * src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML) (REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS) (REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS, REMOTE_PROC_DOMAIN_REBOOT) (REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS): Require domain:write for any conditional use of a guest agent. * src/xen/xen_driver.c: Fix clients. * src/libxl/libxl_driver.c: Likewise. * src/uml/uml_driver.c: Likewise. * src/qemu/qemu_driver.c: Likewise. * src/lxc/lxc_driver.c: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/libvirt.c | 12 +++++++++--- src/libxl/libxl_driver.c | 6 +++--- src/lxc/lxc_driver.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- src/remote/remote_protocol.x | 5 +++++ src/uml/uml_driver.c | 2 +- src/xen/xen_driver.c | 6 +++--- 7 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 6a41fd7..c15e29a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -3134,6 +3134,9 @@ error: * in which the hypervisor tries each shutdown method is undefined, * and a hypervisor is not required to support all methods. * + * To use guest agent (VIR_DOMAIN_SHUTDOWN_GUEST_AGENT) the domain XML + * must have <channel> configured. + * * Returns 0 in case of success and -1 in case of failure. */ int @@ -3180,7 +3183,7 @@ error: * * If @flags is set to zero, then the hypervisor will choose the * method of shutdown it considers best. To have greater control - * pass one or more of the virDomainShutdownFlagValues. The order + * pass one or more of the virDomainRebootFlagValues. The order * in which the hypervisor tries each shutdown method is undefined, * and a hypervisor is not required to support all methods. * @@ -9347,7 +9350,7 @@ error: * current virtual CPU count. * * If @flags includes VIR_DOMAIN_VCPU_GUEST, then the state of the processors - * is modified in the guest instead of the hypervisor. This flag is only usable + * is queried in the guest instead of the hypervisor. This flag is only usable * on live domains. Guest agent may be needed for this flag to be available. * * Returns the number of vCPUs in case of success, -1 in case of failure. @@ -9362,6 +9365,10 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) virResetLastError(); virCheckDomainReturn(domain, -1); + conn = domain->conn; + + if (flags & VIR_DOMAIN_VCPU_GUEST) + virCheckReadOnlyGoto(conn->flags, error); /* At most one of these two flags should be set. */ if ((flags & VIR_DOMAIN_AFFECT_LIVE) && @@ -9372,7 +9379,6 @@ virDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags) __FUNCTION__); goto error; } - conn = domain->conn; if (conn->driver->domainGetVcpusFlags) { int ret; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 4115fff..fc0efa2 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1409,7 +1409,7 @@ libxlDomainShutdownFlags(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -1456,7 +1456,7 @@ libxlDomainReboot(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -2316,7 +2316,7 @@ libxlDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; active = virDomainObjIsActive(vm); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4c2744d..4c716ef 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2721,7 +2721,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, priv = vm->privateData; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { @@ -2798,7 +2798,7 @@ lxcDomainReboot(virDomainPtr dom, priv = vm->privateData; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7059f7a..8006882 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1835,7 +1835,7 @@ static int qemuDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { if (agentRequested || (!flags && priv->agent)) useAgent = true; - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (priv->agentError) { @@ -1936,7 +1936,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags) priv = vm->privateData; - if (virDomainRebootEnsureACL(dom->conn, vm->def) < 0) + if (virDomainRebootEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if ((flags & VIR_DOMAIN_REBOOT_GUEST_AGENT) || @@ -4898,7 +4898,7 @@ qemuDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) priv = vm->privateData; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) @@ -13070,7 +13070,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, cfg = virQEMUDriverGetConfig(driver); - if (virDomainSnapshotCreateXMLEnsureACL(domain->conn, vm->def) < 0) + if (virDomainSnapshotCreateXMLEnsureACL(domain->conn, vm->def, flags) < 0) goto cleanup; if (!(caps = virQEMUDriverGetCapabilities(driver, false))) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 5a82395..8238405 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3185,6 +3185,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:init_control + * @acl: domain:write:VIR_DOMAIN_REBOOT_GUEST_AGENT */ REMOTE_PROC_DOMAIN_REBOOT = 27, @@ -4278,6 +4279,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:snapshot + * @acl: domain:write:VIR_DOMAIN_SNAPSHOT_CREATE_QUIESCE */ REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185, @@ -4370,12 +4372,14 @@ enum remote_procedure { * @acl: domain:write * @acl: domain:save:!VIR_DOMAIN_AFFECT_CONFIG|VIR_DOMAIN_AFFECT_LIVE * @acl: domain:save:VIR_DOMAIN_AFFECT_CONFIG + * @acl: domain:write:VIR_DOMAIN_VCPU_GUEST */ REMOTE_PROC_DOMAIN_SET_VCPUS_FLAGS = 199, /** * @generate: both * @acl: domain:read + * @acl: domain:write:VIR_DOMAIN_VCPU_GUEST */ REMOTE_PROC_DOMAIN_GET_VCPUS_FLAGS = 200, @@ -4762,6 +4766,7 @@ enum remote_procedure { /** * @generate: both * @acl: domain:init_control + * @acl: domain:write:VIR_DOMAIN_SHUTDOWN_GUEST_AGENT */ REMOTE_PROC_DOMAIN_SHUTDOWN_FLAGS = 258, diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index f286f41..89afefe 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -1635,7 +1635,7 @@ static int umlDomainShutdownFlags(virDomainPtr dom, goto cleanup; } - if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, vm->def, flags) < 0) goto cleanup; #if 0 diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index 65c3a5c..c45d980 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -952,7 +952,7 @@ xenUnifiedDomainShutdownFlags(virDomainPtr dom, if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainShutdownFlagsEnsureACL(dom->conn, def) < 0) + if (virDomainShutdownFlagsEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenDaemonDomainShutdown(dom->conn, def); @@ -979,7 +979,7 @@ xenUnifiedDomainReboot(virDomainPtr dom, unsigned int flags) if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainRebootEnsureACL(dom->conn, def) < 0) + if (virDomainRebootEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenDaemonDomainReboot(dom->conn, def); @@ -1526,7 +1526,7 @@ xenUnifiedDomainGetVcpusFlags(virDomainPtr dom, unsigned int flags) if (!(def = xenGetDomainDefForDom(dom))) goto cleanup; - if (virDomainGetVcpusFlagsEnsureACL(dom->conn, def) < 0) + if (virDomainGetVcpusFlagsEnsureACL(dom->conn, def, flags) < 0) goto cleanup; ret = xenUnifiedDomainGetVcpusFlagsInternal(dom, def, flags); -- 1.8.4.2

2 2

[libvirt] LSN-2013-0020: libvirtd crash when hot-plugging disks for qemu domains
by Eric Blake 22 Jan '14

22 Jan '14

Libvirt Security Notice: LSN-2013-0020 ====================================== Summary: libvirtd crash when hot-plugging disks for qemu domains Reported on: 20131220 Published on: 20131213 Fixed on: 20140107 Reported by: Alexandre M <alexandre.mclean(a)ubisoft.com> Patched by: Jiri Denemark <jdenemar(a)redhat.com> See also: CVE-2013-6458, redhat bug #1043069 Description ----------- Several methods in the qemu block driver were accessing details about disks associated with a domain outside of a job lock. If another connection is adding or removing disks, the details in use by the first connection could become stale and lead to a libvirtd crash. Among the methods impacted, it is possible to trigger the race from four APIs accessible from read-only clients: virDomainBlockStats, virDomainGetBlockInfo, virDomainGetBlockJobInfo, and virDomainGetBlockIoTune. Impact ------ Each of the four affected APIs could be used by any user that can connect through the read-only libvirtd UNIX domain socket. Also, if ACLs are active, access to the affected APIs is granted to any user with the 'read' permission on the 'domain' object, which is granted by default to all users. As a result an unprivileged user will be able to inflict a denial of service attack on other users of the libvirtd daemon with higher privilege. Workaround ---------- The impact can be mitigated by blocking access to the read-only libvirtd UNIX domain socket, with policykit or the 'auth_unix_ro' parameter in '/etc/libvirt/libvirtd.conf'. If ACLs are active, the 'read' permission should be removed from any untrusted users. This will not prevent the crash, but will stop unprivileged users from inflicting the denial of service on higher privileged users. Additionally, avoiding disk hot-plug actions is sufficient to avoid the problem. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v0.8.2 Broken in: v0.8.3 Broken in: v0.8.4 Broken in: v0.8.5 Broken in: v0.8.6 Broken in: v0.8.7 Broken in: v0.8.8 Broken in: v0.9.0 Broken in: v0.9.1 Broken in: v0.9.2 Broken in: v0.9.3 Broken in: v0.9.4 Broken in: v0.9.5 Broken in: v0.9.6 Broken in: v0.9.7 Broken in: v0.9.8 Broken in: v0.9.9 Broken in: v0.9.10 Broken in: v0.9.11 Broken in: v0.9.12 Broken in: v0.9.13 Broken in: v0.10.0 Broken in: v0.10.1 Broken in: v0.10.2 Broken in: v1.0.0 Broken in: v1.0.1 Broken in: v1.0.2 Broken in: v1.0.3 Broken in: v1.0.4 Broken in: v1.0.5 Broken in: v1.0.6 Broken in: v1.1.0 Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Fixed in: v1.2.1 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: db86da5ca2109e4006c286a09b6c75bfe10676ad Fixed by: b799259583bd65c0b2f5042e6c3ff19637ade881 Fixed by: f93d2caa070f6197ab50d372d286018b0ba6bbd8 Fixed by: 3b56425938e2f97208d5918263efa0d6439e4ecd Branch: v0.8.3-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Branch: v0.9.6-maint Broken in: v0.9.6.1 Broken in: v0.9.6.2 Broken in: v0.9.6.3 Broken in: v0.9.6.4 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Branch: v0.9.11-maint Broken in: v0.9.11.1 Broken in: v0.9.11.2 Broken in: v0.9.11.3 Broken in: v0.9.11.4 Broken in: v0.9.11.5 Broken in: v0.9.11.6 Broken in: v0.9.11.7 Broken in: v0.9.11.8 Broken in: v0.9.11.9 Broken in: v0.9.11.10 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Branch: v0.9.12-maint Broken in: v0.9.12.1 Broken in: v0.9.12.2 Fixed in: v0.9.12.3 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c430c002dd8287c5d7b834993ddfbd61435248c4 Fixed by: 4dd29d3bdf4bf3a4c4b1077ddf4355bcf548ca2f Fixed by: 3e7d9e54e9ce286fe1bee5d32089cd58d63e5cee Fixed by: 2786686eb5855e0046817d47055cd784881ca8cb Branch: v0.10.2-maint Broken in: v0.10.2.1 Broken in: v0.10.2.2 Broken in: v0.10.2.3 Broken in: v0.10.2.4 Broken in: v0.10.2.5 Broken in: v0.10.2.6 Broken in: v0.10.2.7 Broken in: v0.10.2.8 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 5f5e9eb23dead857b1858da8b97a6cb0442fabed Fixed by: 7a9bcfa1ccc190e33e6fa931df8143cc9623cf24 Fixed by: 95836cb26b1d91b8e9eba0c4764bc24cccc78684 Fixed by: f59d02c487659e9d9f8e152673a0fe4d612172b2 Branch: v1.0.2-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 561b03f9165a860139edd3c03bb3e35a2c2f85ca Fixed by: 324279f2c867f404712c659adc4f399f8d343eda Fixed by: c973eb035ee0d8863d0f2ed25f0523e3e7fee433 Fixed by: d0a4e2498d7d3b1cf1683b0720b9bc6edabcd364 Branch: v1.0.3-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 59d46c6cd5cb892ce68e83c99c14023f29e073a7 Fixed by: 12ca0aaf2fc32647d3a570780a2c7467a26b0ecd Fixed by: da2d96d12521a20305d0ea3190539e1c4b367d75 Fixed by: c51986ba820dde30e48b4f1694862c3cf4d8b7ec Branch: v1.0.4-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: d003b8f294801adfc655096cfc80480e7f2e17ae Fixed by: e966f1155ccb1c4e3ddc41a02b1107af2d98f98d Fixed by: fa5c087aef266e27a0641c720bbbf95cd5ace6b1 Fixed by: 473b751d895d248f37766bab32e20ee00ac3913a Branch: v1.0.5-maint Broken in: v1.0.5.1 Broken in: v1.0.5.2 Broken in: v1.0.5.3 Broken in: v1.0.5.4 Broken in: v1.0.5.5 Broken in: v1.0.5.6 Broken in: v1.0.5.7 Broken in: v1.0.5.8 Fixed in: v1.0.5.9 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c67b0de046b16dca352537e8f39ff935a5fded76 Fixed by: 923319189022c5806da01b963dddd8dff0d6c747 Fixed by: 6cd879829aaf02f56182feb16b4284d5b3fdcfd7 Fixed by: dee5fc756648e62062da3366583fc343413e1ba7 Branch: v1.0.6-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 938ef6e611b39630b00b368b8b8d7db7e619ed99 Fixed by: 6eae1538c1d5b7aaee34f3ca81389906d8af0626 Fixed by: 8bdc22d281105fe32c85da58faf817ab9b2da369 Fixed by: ac8feea58029fea294c3c60c220592ca7c9734c8 Branch: v1.1.0-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 5efb996317f1f8a57fea625526075be9ef84e69c Fixed by: c1f8276a81de8d31578f16cc6bfdafc5e807427d Fixed by: 1478ebf2bcadbaf3b66d9e91086bcca39a41bb65 Fixed by: 8cc2474f0645fab308090f477e98317b0dff485f Branch: v1.1.1-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 84c251faec7a0003863fe1c9b1abc7960f395faa Fixed by: 3451828a28a333e570af621eceb93245763fa044 Fixed by: 571629b2dfd2eeb8001efddac2569b12621d1db3 Fixed by: c5b379e17daa2f641363712212a18b3b31cacdea Branch: v1.1.2-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 17db7e28a1ec77382bb8fa96205ef2cf6deefa88 Fixed by: 54cb7f05ec5c822bb786833367dc80327648f2c0 Fixed by: bcb9a035a99cf8389069c401c94605aedccdc4df Fixed by: 82daa87f6a020ba2d1274b300f8e95f903fbe0f8 Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Fixed in: v1.1.3.3 Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 1bfc35e3f837ab7b399fe664281b7db06db96a05 Fixed by: 0e98442e3bcbf832f49a6d36f94558bb026e3f3a Fixed by: 7354aaf4607beaa9f4a6d68e3b26a28c97494e58 Fixed by: a7844b9ec2718dad9f5e5316cc0673e95098d812 Branch: v1.1.4-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: c8fa19d9e385d8bae368385aece1c3f493be4e71 Fixed by: 4ee6ed6f50a71868fbb8a5f28edbcfd7170f5bf5 Fixed by: 36c1691c6d61aa5a0d9a65d64bc3af3e15692d62 Fixed by: 8fcc0f0237f728361065caf6fac0fce1965230a0 Branch: v1.2.0-maint Broken by: ebb0c19c48690f0598de954f8e0e9d4d29d48b85 Broken by: 18c2a592064d69499f70428e498f4a3cb5161cda Broken by: b976165ca4d82788be77d14843a4d079139539ba Broken by: eca96694a7f992be633d48d5ca03cedc9bbc3c9a Fixed by: 13051a86cb093d4c421a8669ccd7591578d004aa Fixed by: 3a0286f978c19ecc7b2ef2242b33688239428f85 Fixed by: 4d8c603ca2cb1fb70c0e0d2e0d51d1fe3261c7b9 Fixed by: c6fbbe85aa496d178d5e4188bee166a5abb97029 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] LSN-2013-0019: libvirtd crash when reading numa tunables for libxl guest in shutoff status
by Eric Blake 22 Jan '14

22 Jan '14

Libvirt Security Notice: LSN-2013-0019 ====================================== Summary: libvirtd crash when reading numa tunables for libxl guest in shutoff status Reported on: 20131220 Published on: 20131220 Fixed on: 20131220 Reported by: Dario Faggioli <dario.faggioli(a)citrix.com> Patched by: Dario Faggioli <dario.faggioli(a)citrix.com> See also: CVE-2013-6457 Description ----------- The libxlDomainGetNumaParameters method in the libxl driver did not check whether the guest being accessed was running or not. When shutoff, the code attempts to clean up an uninitialized bitmap, causing malloc corruption most commonly observed as a crash. Impact ------ A user who has permission to invoke the virDomainGetNumaParameters API against the libxl driver will be able to crash the libvirtd daemon. Access to this API is granted to any user who connects to the read-only libvirtd UNIX domain socket. If ACLs are active, access is granted to any user with the 'read' permission on the 'domain' object, which is granted by default to all users. As a result an unprivileged user will be able to inflict a denial of service attack on other users of the libvirtd daemon with higher privilege. Workaround ---------- The impact can be mitigated by blocking access to the read-only libvirtd UNIX domain socket, with policykit or the 'auth_unix_ro' parameter in '/etc/libvirt/libvirtd.conf'. If ACLs are active, the 'read' permission should be removed from any untrusted users. This will not prevent the crash, but will stop unprivileged users from inflicting the denial of service on higher privileged users. Affected product ---------------- Name: libvirt Repository: git://libvirt.org/git/libvirt.git http://libvirt.org/git/?p=libvirt.git Branch: master Broken in: v1.1.1 Broken in: v1.1.2 Broken in: v1.1.3 Broken in: v1.1.4 Broken in: v1.2.0 Fixed in: v1.2.1 Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: f9ee91d35510ccbc6fc42cef8864b291b2d220f4 Branch: v1.1.1-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: d5f89a6dd725baf8bca1f1e28f5b858bf0053a99 Branch: v1.1.2-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 52c40003805f1702f103095dc5c3d00cf38e7a82 Branch: v1.1.3-maint Broken in: v1.1.3.1 Broken in: v1.1.3.2 Fixed in: v1.1.3.3 Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 5904ba60159ce67826f301e78103191600a07600 Branch: v1.1.4-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 626eb91f964a032af56b448e63fde9f74e592290 Branch: v1.2.0-maint Broken by: 261c4f5fb93c5e23b8002f2760d4a7937cdb7f63 Fixed by: 36378d1a41464517d7c31d8854fcfd8f69221409 -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH v3] vbox: add support for v4.2.20+ and v4.3.4+
by Manuel VIVES 22 Jan '14

22 Jan '14

Hi, While working on adding virDomain*Stats support to the vbox driver, we found bugs in the VirtualBox API C bindings. These bugs have been fixed in versions 4.2.20 and 4.3.4. However, the changes in the C bindings are incompatible with the vbox_CAPI_v4_2.h and vbox_CAPI_v4_3.h files which are bundled in libvirt source code. This is why the following patch adds vbox_CAPI_v4_2_20.h and vbox_CAPI_v4_3_4.h. As stated by Matthias Bolte, the actual underlying problem here is that libvirt assumes that VirtualBox API can only change between release versions (4.2 -> 4.3), but we have a case here where it changed (or got fixed) between minor versions (4.2.18 -> 4.2.20). This patch makes the VBOX_API_VERSION represent the full API version number (i.e 4002 => 4002000) so there are specific version numbers for Vbox 4.2.20 (4002020) and 4.3.4 (4003004) As the patch is too big for the mailing list, it is publicly available at http://git-lab.diateam.net/cots/libvirt.git/ with the branch name 'vbox-4.2.20-4.3.4-support-v3' Regards, Manuel VIVES v3: - Changed the commit message for being more precise. - Resend after freeze.

2 1

[libvirt] [PATCH 0/6] Coverity cleanups
by John Ferlan 22 Jan '14

22 Jan '14

A recent Coverity version update discovered some existing issues (and some benign cases). This patch set cleans them all up. John Ferlan (6): VSMS: Coverity cleanups libxkutil:pool_parsing: Coverity cleanups libxkutil:device_parsing: Coverity cleanups libxkutil/xml_parse_test: Coverity cleanup RAFP: Coverity cleanup EAFP: Coverity cleanup libxkutil/device_parsing.c | 41 +++++++++++++++++-------------- libxkutil/pool_parsing.c | 39 +++++++++++++++-------------- libxkutil/xml_parse_test.c | 1 + src/Virt_ElementAllocatedFromPool.c | 6 ++++- src/Virt_ResourceAllocationFromPool.c | 7 ++++-- src/Virt_SettingsDefineCapabilities.c | 2 +- src/Virt_VirtualSystemManagementService.c | 11 ++++++--- 7 files changed, 63 insertions(+), 44 deletions(-) -- 1.8.4.2

2 10

[libvirt] [RFC PATCH 0/7] Adding 'config' driver
by Adam Walters 22 Jan '14

22 Jan '14

This patchset adds a driver named 'config' that allows access to configuration data, such as secret and storage definitions. This is a pre-requisite for my next patchset which resolves the race condition on libvirtd startup and the circular dependencies between QEMU and the storage driver. The basic rationale behind this idea is that there exist circumstances under which a driver may need to access things such as secrets during a time at which there is no active connection to a hypervisor. Without a connection, the data can't be accessed currently. I felt that this was a much simpler solution to the problem that building new APIs that do not require a connection to operate. This driver is technically what one may call a hypervisor driver, but it does not implement any domain operations. It simply exists to handle requests by drivers for access to informatino that would otherwise require a connection. The URI used for this driver is 'config:///' and has been tested working on 4 different machines of mine, running three different distributions of Linux (Archlinux, Gentoo, and CentOS). Being a very simple driver, I would expect it to work pretty much anywhere. I would love to hear any comments and suggestions you may have about this driver. At the very least this plus my next patchset resolves the startup race condition on my machine. If a more robust setup (likely a new internal API) is in the works, this driver could act as a band-aid to allow access to this type of data in the interim if a better resolution is a ways off. Adam Walters (7): config: Adding source for the config driver config: Adding header for the config driver virterror: Adding a new VIR_FROM_ define libvirtd: Add config driver hooks po: Add config_driver.c to POTFILES.in configure: Add config driver to configure script Makefile: Add config driver to src/Makefile.am configure.ac | 10 ++ daemon/libvirtd.c | 21 ++-- include/libvirt/virterror.h | 2 + po/POTFILES.in | 1 + src/Makefile.am | 25 +++++ src/config/config_driver.c | 237 ++++++++++++++++++++++++++++++++++++++++++++ src/config/config_driver.h | 44 ++++++++ src/util/virerror.c | 2 + 8 files changed, 336 insertions(+), 6 deletions(-) create mode 100644 src/config/config_driver.c create mode 100644 src/config/config_driver.h -- 1.8.5.2

4 22

[libvirt] [PATCH v2]qemu:sheepdog correct OR to AND Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: root <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7a0bee2..9cf2767 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1403,7 +1403,7 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI ) && (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " "storage pool is of iscsi type or only direct for sheepdog ")); -- 1.8.3.2

3 2

[libvirt] [sec-notice PATCH 1/2] maint: typo fixes
by Eric Blake 22 Jan '14

22 Jan '14

Noticed this while working on some additions. * docs/schema.txt: Typo fixes. * README: Refer to the schema. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- README | 5 +++-- docs/schema.txt | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README b/README index 426d9ca..fa7f103 100644 --- a/README +++ b/README @@ -5,11 +5,12 @@ This repository records all Libvirt Security Notices that are issued. Notices must only added to this repository once any embargo is -lifted, since the GIT repository is fully public +lifted, since the GIT repository is fully public. Notices are written in XML in a file "notices/$YEAR/$NUM.xml" eg notices/2014/0001.xml. Assign numbers incrementally as -new issues are reported. +new issues are reported. More details on the XML format can +be found in "docs/schema.txt". When a new notice is published for the first time, send the text rendering of the notice to the libvirt-announce(a)redhat.com diff --git a/docs/schema.txt b/docs/schema.txt index ca8203a..189abef 100644 --- a/docs/schema.txt +++ b/docs/schema.txt @@ -2,7 +2,7 @@ ============================== The top level element of a libvirt security notice has -a name of "security-notice" and is in a XML namespace +a name of "security-notice" and is in an XML namespace of http://security.libvirt.org/xmlns/security-notice/1.0 Basic metadata @@ -45,7 +45,7 @@ resources. It will have one or more child elements which can be either "advisory" or "bug". An "advisory" element includes a "type" and "id" attribute where "type" is currently allowed to be "CVE" and "id" is the identifier -of the report. A "bug" elements incudes "tracker" and +of the report. A "bug" elements includes "tracker" and "id" attribute where "tracker" is allowed to be "redhat", "debian" or a short name for another vendors' bug tracker. @@ -74,7 +74,7 @@ Product data The "product" element provides information about the codebase of the affected products. The "name" attribute is the name of a libvirt product, typically based on the tar.gz archive name -with the suffice stripped. This contains a child "repository" +with the suffix stripped. This contains a child "repository" element which is a URL to the master GIT repository. There is then one or more "branch" elements which details the state of affected branches. -- 1.8.4.2

2 12

[libvirt] [PATCH]qemu:sheepdog Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: Joël Simoes <jsimoes@jsimoes> --- src/qemu/qemu_conf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..2d2f428 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1185,6 +1185,56 @@ int qemuDriverAllocateID(virQEMUDriverPtr driver) return virAtomicIntInc(&driver->nextvmid); } + +static int +qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, + virStoragePoolDefPtr pooldef) +{ + int ret = -1; + char **tokens = NULL; + + /* Only support one host */ + if (pooldef->source.nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + /* iscsi pool only supports one host */ + def->nhosts = 1; + + if (VIR_ALLOC_N(def->hosts, def->nhosts) < 0) + goto cleanup; + + if (VIR_STRDUP(def->hosts[0].name, pooldef->source.hosts[0].name) < 0) + goto cleanup; + + if (virAsprintf(&def->hosts[0].port, "%d", + pooldef->source.hosts[0].port ? + pooldef->source.hosts[0].port : + 7000) < 0) + goto cleanup; + + + + + + /* Storage pool have not supported these 2 attributes yet, + * use the defaults. + */ + def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; + def->hosts[0].socket = NULL; + + + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + + ret = 0; + +cleanup: + virStringFreeList(tokens); + return ret; +} + static int qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, virStoragePoolDefPtr pooldef) @@ -1353,10 +1403,10 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " - "storage pool is of iscsi type")); + "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } @@ -1439,9 +1489,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } break; - case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + // force direct mode + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + def->src = virStorageVolGetPath(vol); + + qemuAddSheepPoolSourceHost(def, pooldef); + break; + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

1 0

[libvirt] [PATCH]qemu:sheepdog Permit qemu to access sheepdog volume on sheepdog's pool
by joel SIMOES 22 Jan '14

22 Jan '14

From: Joel SIMOES <joel.simoes(a)laposte.net> --- src/qemu/qemu_conf.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..2d2f428 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1185,6 +1185,56 @@ int qemuDriverAllocateID(virQEMUDriverPtr driver) return virAtomicIntInc(&driver->nextvmid); } + +static int +qemuAddSheepPoolSourceHost(virDomainDiskDefPtr def, + virStoragePoolDefPtr pooldef) +{ + int ret = -1; + char **tokens = NULL; + + /* Only support one host */ + if (pooldef->source.nhost != 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Expected exactly 1 host for the storage pool")); + goto cleanup; + } + + /* iscsi pool only supports one host */ + def->nhosts = 1; + + if (VIR_ALLOC_N(def->hosts, def->nhosts) < 0) + goto cleanup; + + if (VIR_STRDUP(def->hosts[0].name, pooldef->source.hosts[0].name) < 0) + goto cleanup; + + if (virAsprintf(&def->hosts[0].port, "%d", + pooldef->source.hosts[0].port ? + pooldef->source.hosts[0].port : + 7000) < 0) + goto cleanup; + + + + + + /* Storage pool have not supported these 2 attributes yet, + * use the defaults. + */ + def->hosts[0].transport = VIR_DOMAIN_DISK_PROTO_TRANS_TCP; + def->hosts[0].socket = NULL; + + + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + + ret = 0; + +cleanup: + virStringFreeList(tokens); + return ret; +} + static int qemuAddISCSIPoolSourceHost(virDomainDiskDefPtr def, virStoragePoolDefPtr pooldef) @@ -1353,10 +1403,10 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, def->srcpool->pooltype = pooldef->type; def->srcpool->voltype = info.type; - if (def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) { + if ((def->srcpool->mode && pooldef->type != VIR_STORAGE_POOL_ISCSI) || (def->srcpool->mode != VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT && pooldef->type == VIR_STORAGE_POOL_SHEEPDOG ) ) { virReportError(VIR_ERR_XML_ERROR, "%s", _("disk source mode is only valid when " - "storage pool is of iscsi type")); + "storage pool is of iscsi type or only direct for sheepdog ")); goto cleanup; } @@ -1439,9 +1489,17 @@ qemuTranslateDiskSourcePool(virConnectPtr conn, } break; - case VIR_STORAGE_POOL_MPATH: - case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_SHEEPDOG: + def->srcpool->actualtype = VIR_DOMAIN_DISK_TYPE_NETWORK; + // force direct mode + def->srcpool->mode = VIR_DOMAIN_DISK_SOURCE_POOL_MODE_DIRECT; + def->protocol = VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG; + def->src = virStorageVolGetPath(vol); + + qemuAddSheepPoolSourceHost(def, pooldef); + break; + case VIR_STORAGE_POOL_MPATH: + case VIR_STORAGE_POOL_RBD: case VIR_STORAGE_POOL_GLUSTER: case VIR_STORAGE_POOL_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

1 0

[libvirt] [PATCHv2 0/2] Add a test for linuxNodeGetCPUStats
by Ján Tomko 22 Jan '14

22 Jan '14

v1: https://www.redhat.com/archives/libvir-list/2014-January/msg00951.html v2: use ticks instead of nsecs in test data Ján Tomko (2): Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats src/libvirt_linux.syms | 1 + src/nodeinfo.c | 83 +++++++-------- tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 131 ++++++++++++++++++++++++ 5 files changed, 342 insertions(+), 48 deletions(-) create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

3 5

[libvirt] [PATCH] qemu: Avoid crash in qemuDiskGetActualType
by Peter Krempa 22 Jan '14

22 Jan '14

Libvirtd would crash if a domain contained an empty cdrom drive of type='volume' as the disk def->srcpool member would be dereferenced. Fix it by checking if the source pool is present before dereferencing it. Also alter tests to catch this issue in the future. Reported by: Kevin Shanahan Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1056328 --- src/qemu/qemu_conf.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args | 2 ++ tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4378791..ac53f6d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1302,7 +1302,7 @@ cleanup: int qemuDiskGetActualType(virDomainDiskDefPtr def) { - if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME) + if (def->type == VIR_DOMAIN_DISK_TYPE_VOLUME && def->srcpool) return def->srcpool->actualtype; return def->type; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args index da87ad9..6b409b7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args @@ -3,6 +3,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -drive \ file=/some/block/device/cdrom,if=none,media=cdrom,id=drive-ide0-0-1 -device \ ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -drive \ +if=none,media=cdrom,id=drive-ide0-1-0 -device \ +ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -drive \ file=/tmp/idedisk.img,if=none,id=drive-ide0-0-2 -device \ ide-drive,bus=ide.0,unit=2,drive=drive-ide0-0-2,id=ide0-0-2 -device \ virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml index 6ca5cf7..e96f76e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml @@ -24,6 +24,12 @@ <readonly/> <address type='drive' controller='0' bus='0' target='0' unit='1'/> </disk> + <disk type='volume' device='cdrom'> + <driver name='qemu' type='raw'/> + <target dev='hdc' bus='ide'/> + <readonly/> + <address type='drive' controller='0' bus='1' target='0' unit='0'/> + </disk> <disk type='file' device='disk'> <source file='/tmp/idedisk.img'/> <target dev='hdc' bus='ide'/> -- 1.8.5.3

2 2

[libvirt] [PATCH 0/3] Doc fixes
by Osier Yang 22 Jan '14

22 Jan '14

*** BLURB HERE *** Osier Yang (3): virsh: Fix the string breaking style Doc: Improve the document for nodesuspend Doc: Add "note" for node-memory-tune tools/virsh-host.c | 6 +++--- tools/virsh.pod | 16 +++++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) -- 1.8.1.4

2 7

[libvirt] [PATCH v2] virtlockd: make re-exec more robust
by Michael Chapman 22 Jan '14

22 Jan '14

- Use $XDG_RUNTIME_DIR for re-exec state file when running unprivileged. - argv[0] may not contain a full path to the binary, however it should contain something that can be looked up in the PATH. Use execvp() to do path lookup on re-exec. - As per list discussion [1], ignore --daemon on re-exec. [1] https://www.redhat.com/archives/libvir-list/2013-December/msg00514.html Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/locking/lock_daemon.c | 128 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 94 insertions(+), 34 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index a6be43c..b405e3a 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -925,7 +925,41 @@ error: } -#define VIR_LOCK_DAEMON_RESTART_EXEC_FILE LOCALSTATEDIR "/run/virtlockd-restart-exec.json" +static int +virLockDaemonExecRestartStatePath(bool privileged, + char **state_file) +{ + if (privileged) { + if (VIR_STRDUP(*state_file, LOCALSTATEDIR "/run/virtlockd-restart-exec.json") < 0) + goto error; + } else { + char *rundir = NULL; + mode_t old_umask; + + if (!(rundir = virGetUserRuntimeDirectory())) + goto error; + + old_umask = umask(077); + if (virFileMakePath(rundir) < 0) { + umask(old_umask); + goto error; + } + umask(old_umask); + + if (virAsprintf(state_file, "%s/virtlockd-restart-exec.json", rundir) < 0) { + VIR_FREE(rundir); + goto error; + } + + VIR_FREE(rundir); + } + + return 0; + +error: + return -1; +} + static char * virLockDaemonGetExecRestartMagic(void) @@ -938,7 +972,10 @@ virLockDaemonGetExecRestartMagic(void) static int -virLockDaemonPostExecRestart(bool privileged) +virLockDaemonPostExecRestart(const char *state_file, + const char *pid_file, + int *pid_file_fd, + bool privileged) { const char *gotmagic; char *wantmagic = NULL; @@ -948,14 +985,14 @@ virLockDaemonPostExecRestart(bool privileged) VIR_DEBUG("Running post-restart exec"); - if (!virFileExists(VIR_LOCK_DAEMON_RESTART_EXEC_FILE)) { - VIR_DEBUG("No restart file %s present", - VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + if (!virFileExists(state_file)) { + VIR_DEBUG("No restart state file %s present", + state_file); ret = 0; goto cleanup; } - if (virFileReadAll(VIR_LOCK_DAEMON_RESTART_EXEC_FILE, + if (virFileReadAll(state_file, 1024 * 1024 * 10, /* 10 MB */ &state) < 0) goto cleanup; @@ -982,13 +1019,18 @@ virLockDaemonPostExecRestart(bool privileged) goto cleanup; } + /* Re-claim PID file now as we will not be daemonizing */ + if (pid_file && + (*pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) + goto cleanup; + if (!(lockDaemon = virLockDaemonNewPostExecRestart(object, privileged))) goto cleanup; ret = 1; cleanup: - unlink(VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + unlink(state_file); VIR_FREE(wantmagic); VIR_FREE(state); virJSONValueFree(object); @@ -997,7 +1039,8 @@ cleanup: static int -virLockDaemonPreExecRestart(virNetServerPtr srv, +virLockDaemonPreExecRestart(const char *state_file, + virNetServerPtr srv, char **argv) { virJSONValuePtr child; @@ -1065,15 +1108,15 @@ virLockDaemonPreExecRestart(virNetServerPtr srv, VIR_DEBUG("Saving state %s", state); - if (virFileWriteStr(VIR_LOCK_DAEMON_RESTART_EXEC_FILE, + if (virFileWriteStr(state_file, state, 0700) < 0) { virReportSystemError(errno, _("Unable to save state file %s"), - VIR_LOCK_DAEMON_RESTART_EXEC_FILE); + state_file); goto cleanup; } - if (execv(argv[0], argv) < 0) { + if (execvp(argv[0], argv) < 0) { virReportSystemError(errno, "%s", _("Unable to restart self")); goto cleanup; @@ -1153,6 +1196,7 @@ int main(int argc, char **argv) { char *pid_file = NULL; int pid_file_fd = -1; char *sock_file = NULL; + char *state_file = NULL; bool implicit_conf = false; mode_t old_umask; bool privileged = false; @@ -1276,21 +1320,13 @@ int main(int argc, char **argv) { VIR_DEBUG("Decided on socket paths '%s'", sock_file); - if (godaemon) { - char ebuf[1024]; - - if (chdir("/") < 0) { - VIR_ERROR(_("cannot change to root directory: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); - goto cleanup; - } - - if ((statuswrite = virLockDaemonForkIntoBackground(argv[0])) < 0) { - VIR_ERROR(_("Failed to fork as daemon: %s"), - virStrerror(errno, ebuf, sizeof(ebuf))); - goto cleanup; - } + if (virLockDaemonExecRestartStatePath(privileged, + &state_file) < 0) { + VIR_ERROR(_("Can't determine restart state file path")); + exit(EXIT_FAILURE); } + VIR_DEBUG("Decided on restart state file path '%s'", + state_file); /* Ensure the rundir exists (on tmpfs on some systems) */ if (privileged) { @@ -1317,20 +1353,41 @@ int main(int argc, char **argv) { } umask(old_umask); - /* If we have a pidfile set, claim it now, exiting if already taken */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { - ret = VIR_LOCK_DAEMON_ERR_PIDFILE; - goto cleanup; - } - - if ((rv = virLockDaemonPostExecRestart(privileged)) < 0) { + if ((rv = virLockDaemonPostExecRestart(state_file, + pid_file, + &pid_file_fd, + privileged)) < 0) { ret = VIR_LOCK_DAEMON_ERR_INIT; goto cleanup; } /* rv == 1, means we setup everything from saved state, - * so we only setup stuff from scratch if rv == 0 */ + * so only (possibly) daemonize and setup stuff from + * scratch if rv == 0 + */ if (rv == 0) { + if (godaemon) { + char ebuf[1024]; + + if (chdir("/") < 0) { + VIR_ERROR(_("cannot change to root directory: %s"), + virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; + } + + if ((statuswrite = virLockDaemonForkIntoBackground(argv[0])) < 0) { + VIR_ERROR(_("Failed to fork as daemon: %s"), + virStrerror(errno, ebuf, sizeof(ebuf))); + goto cleanup; + } + } + + /* If we have a pidfile set, claim it now, exiting if already taken */ + if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + ret = VIR_LOCK_DAEMON_ERR_PIDFILE; + goto cleanup; + } + if (!(lockDaemon = virLockDaemonNew(config, privileged))) { ret = VIR_LOCK_DAEMON_ERR_INIT; goto cleanup; @@ -1388,7 +1445,9 @@ int main(int argc, char **argv) { virNetServerRun(lockDaemon->srv); if (execRestart && - virLockDaemonPreExecRestart(lockDaemon->srv, argv) < 0) + virLockDaemonPreExecRestart(state_file, + lockDaemon->srv, + argv) < 0) ret = VIR_LOCK_DAEMON_ERR_REEXEC; else ret = 0; @@ -1410,6 +1469,7 @@ cleanup: virPidFileReleasePath(pid_file, pid_file_fd); VIR_FREE(pid_file); VIR_FREE(sock_file); + VIR_FREE(state_file); VIR_FREE(run_dir); return ret; -- 1.8.4.2

2 2

[libvirt] [PATCH] docs: refer to the correct event ID for DomainEventIOErrorReasonCallback
by Claudio Bley 22 Jan '14

22 Jan '14

s/_ID_IO_ERROR/_ID_IO_ERROR_REASON/ Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Pushed under the trivial rule. include/libvirt/libvirt.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index a448411..47a896b 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4664,7 +4664,7 @@ typedef void (*virConnectDomainEventIOErrorCallback)(virConnectPtr conn, * @opaque: application specified data * * The callback signature to use when registering for an event of type - * VIR_DOMAIN_EVENT_ID_IO_ERROR with virConnectDomainEventRegisterAny() + * VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON with virConnectDomainEventRegisterAny() * */ typedef void (*virConnectDomainEventIOErrorReasonCallback)(virConnectPtr conn, -- 1.7.9.5

1 0

[libvirt] [PATCH 0/2] Add a test for linuxNodeGetCPUStats
by Ján Tomko 22 Jan '14

22 Jan '14

Ján Tomko (2): Add test for linuxNodeGetCPUStats Simplify linuxNodeGetCPUStats src/libvirt_linux.syms | 1 + src/nodeinfo.c | 83 +++++++-------- tests/nodeinfodata/linux-cpustat-24cpu.out | 150 ++++++++++++++++++++++++++++ tests/nodeinfodata/linux-cpustat-24cpu.stat | 25 +++++ tests/nodeinfotest.c | 128 ++++++++++++++++++++++++ 5 files changed, 339 insertions(+), 48 deletions(-) create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.out create mode 100644 tests/nodeinfodata/linux-cpustat-24cpu.stat -- 1.8.3.2

1 3

[libvirt] [PATCH] qemu: snapshot: Forbid snapshots when backing is a scsi passthrough disk
by Peter Krempa 22 Jan '14

22 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1034993 SCSI passthrough disks (<disk .. device="lun">) can't be used as backing for snapshots. Currently with upstream qemu the vm crashes on such attempt. This patch adds a early check to catch an attempt to do such a snapshot and rejects it right away. qemu will fix the issue but this will let us control the error message. --- Notes: You need a domain with a similar disk config to test this patch: <disk type='block' device='lun'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-path/ip-192.168.122.223:3260-iscsi-iqn.2011-03.org.example.istgt:test-lun-0'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> <controller type='scsi' index='0' model='virtio-scsi'> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </controller> src/qemu/qemu_driver.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b101d77..bc29714 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12206,7 +12206,7 @@ endjob: } static int -qemuDomainSnapshotPrepareDiskExternalBacking(virDomainDiskDefPtr disk) +qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk) { int actualType = qemuDiskGetActualType(disk); @@ -12250,6 +12250,23 @@ qemuDomainSnapshotPrepareDiskExternalBacking(virDomainDiskDefPtr disk) static int +qemuDomainSnapshotPrepareDiskExternalBackingActive(virDomainDiskDefPtr disk) +{ + int actualType = qemuDiskGetActualType(disk); + + if (actualType == VIR_DOMAIN_DISK_TYPE_BLOCK && + disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("external active snapshots are not supported on scsi " + "passthrough devices")); + return -1; + } + + return 0; +} + + +static int qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr disk) { int actualType = qemuSnapshotDiskGetActualType(disk); @@ -12315,12 +12332,15 @@ qemuDomainSnapshotPrepareDiskExternal(virConnectPtr conn, if (qemuTranslateDiskSourcePool(conn, disk) < 0) return -1; - if (qemuDomainSnapshotPrepareDiskExternalBacking(disk) < 0) + if (qemuDomainSnapshotPrepareDiskExternalBackingInactive(disk) < 0) return -1; if (qemuDomainSnapshotPrepareDiskExternalOverlayInactive(snapdisk) < 0) return -1; } else { + if (qemuDomainSnapshotPrepareDiskExternalBackingActive(disk) < 0) + return -1; + if (qemuDomainSnapshotPrepareDiskExternalOverlayActive(snapdisk) < 0) return -1; } -- 1.8.5.3

2 2

[libvirt] [vmware] Fix VMware driver version checking on Linux
by ryan woodsmall 22 Jan '14

22 Jan '14

Recent changes to the VMware driver allow for VMware Fusion version checking on OS X. It looks like the version checking on Linux for VMware Workstation and Player could possibly be broken by the changes. The version check in vmware_conf.c bundled STDOUT and STDERR into a common buffer; when/if something is printed to STDERR, at least on Player, version checking fails. This example output causes the version check to fail on a RHEL6-based Linux install: ** [ryan@os-sl6-controller ~]$ vmplayer -v Gtk-Message: Failed to load module "canberra-gtk-module": libcanberra-gtk-module.so: cannot open shared object file: No such file or directory VMware Player 6.0.1 build-1379776 [ryan@os-sl6-controller ~]$ virsh -c vmwareplayer:///session error: failed to connect to the hypervisor error: internal error: failed to parse VMware Player version ** This patch bundles STDERR into the checked buffer only with the VMware Fusion driver, allowing the VMware Player version check to succeed on Linux even with the above warning. It looks like there's still an issue (see below) but virsh now starts at least. ** [ryan@os-sl6-controller ~]$ virsh -c vmwareplayer:///session Welcome to virsh, the virtualization interactive terminal. Type: 'help' for help with commands 'quit' to quit virsh # version Compiled against library: libvirt 1.2.1 Using library: libvirt 1.2.1 Using API: VMware 1.2.1 Cannot extract running VMware hypervisor version ** This is virsh running against VMware Player 6.0.1 on Linux x86_64. I have not tested on OS X since I don't have a license for VMware Fusion. Thanks everyone! -r diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index c96bd62..502d5c9 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -293,7 +293,8 @@ vmwareExtractVersion(struct vmware_driver *driver) cmd = virCommandNewArgList(bin, "-v", NULL); virCommandSetOutputBuffer(cmd, &outbuf); - virCommandSetErrorBuffer(cmd, &outbuf); + if (driver->type == VMWARE_DRIVER_FUSION) + virCommandSetErrorBuffer(cmd, &outbuf); if (virCommandRun(cmd, NULL) < 0) goto cleanup;

2 3

Re: [libvirt] [Users] libvirt migration port configuration and virPortAllocator
by Dan Kenigsberg 21 Jan '14

21 Jan '14

On Wed, Jan 08, 2014 at 01:26:23AM +0100, Gianluca Cecchi wrote: > Hello, > following the bugzilla here: > https://bugzilla.redhat.com/show_bug.cgi?id=1019053 > > we have > " > This is now fixed by v1.1.3-188-g0196845 and v1.1.3-189-ge3ef20d > " > > Does this mean that f19 that has > libvirt-1.0.5.8-1.fc19.x86_64 > is out? > Any time soon to update it? > I see at > http://libvirt.org/sources/ > files such as > libvirt-1.1.4-1.fc19.x86_64.rpm > since beginning of November... > any particular reason for no packages neither in updates-testing repo? > > Also, Fedora 20 has libvirt-1.1.3.2-1.fc20.x86_64.rpm > Did it receive the patch update? I see nothing particular in its changelog... I suspect that you'd see this bugfix only on libvirt>=1.2, but the best place for such questions is the libvirt mailing list (CCed). Unfortunately, that version is not even on virt-preview http://fedorapeople.org/groups/virt/virt-preview/fedora-19 (but it is on http://fedorapeople.org/groups/virt/virt-preview/fedora-20 !) Dan.

5 5

[libvirt] [[PATCH v2]] virsh nodecpustats returns incorrect stats of cpu on Linux when the number of online cpu exceed 9.
by mars＠linux.vnet.ibm.com 21 Jan '14

21 Jan '14

From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> To retrieve node cpu statistics on Linux system, the linuxNodeGetCPUstats function simply uses STRPREFIX() to match the cpuid with the cpuid read from /proc/stat, it will cause obvious error. For example: 'virsh nodecpustats 1' will display stats of cpu1* if the latter is online and cpu1 is offline. This patch fixes this bug. Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 05bc038..cba2fc1 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -708,9 +708,9 @@ linuxNodeGetCPUStats(FILE *procstat, } if (cpuNum == VIR_NODE_CPU_STATS_ALL_CPUS) { - strcpy(cpu_header, "cpu"); + strcpy(cpu_header, "cpu "); } else { - snprintf(cpu_header, sizeof(cpu_header), "cpu%d", cpuNum); + snprintf(cpu_header, sizeof(cpu_header), "cpu%d ", cpuNum); } while (fgets(line, sizeof(line), procstat) != NULL) { -- 1.7.7.6

2 1

[libvirt] [PATCH] Honour prefix in wireshark install dir
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Trying to run $ ./configure --prefix=$HOME/usr/libvirt-git $ make install results in libvirt trying to install in /usr/lib/wireshark/plugins/.... with predictable amounts of fail. The configure script should not be hardcoding /usr/lib by default but rather honour $libdir Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b9375f1..3a70375 100644 --- a/configure.ac +++ b/configure.ac @@ -2566,7 +2566,7 @@ AC_ARG_WITH([ws-plugindir], if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '` - ws_plugindir=`dirname $WIRESHARK`/../lib/wireshark/plugins/$ws_version + ws_plugindir="$libdir/wireshark/plugins/$ws_version" fi AC_SUBST([ws_plugindir]) -- 1.8.4.2

2 1

Re: [libvirt] [PATCH] Be more clever and verbose about localization-initialization.
by andreas.fuchs＠sit.fraunhofer.de 21 Jan '14

21 Jan '14

I should have been more specific. If e.g. an LC_MESSAGE is set that cannot be found it returns "initialization failed" and nothing more... See the bug report.Spent >1h this morning trying to get some demonstrator running... So I thought rather share it... ----- Reply message ----- Von: "Daniel P. Berrange" <berrange(a)redhat.com> An: "Fuchs, Andreas" <andreas.fuchs(a)sit.fraunhofer.de> Cc: "libvir-list(a)redhat.com" <libvir-list(a)redhat.com> Betreff: [libvirt] [PATCH] Be more clever and verbose about localization-initialization. Datum: Mo., Okt 7, 2013 17:52 On Mon, Oct 07, 2013 at 03:47:48PM +0000, Fuchs, Andreas wrote: > Currently libvirt fails with an uninformative error message > if no translations are found. I don't see any failure if I delete all the libvirt.mo files. What are you actually doing to trigger an error, and what is the exact error you get. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

5 9

[libvirt] RFC: Move tests into same directory as the sources
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Currently we have a split with all the "source" code under various subdirectories of src/, while the test cases are (mostly) all under the tests/ directory. I think there could be some benefits to moving the test files to be alongside the source files being tested. eg instead of tests/virhashtest.c have src/util/virhashtest.c The tests/ directory is getting reasonably large, and is likely to grow even more as we push for greater unit tests. We could split it up into various sub-directories mirroring the split of dirs under src/, but it seems easier to put have them directory under src/ and remove the arbitrary split of source and tests. Having the test files alongside the source files makes it obvious to anyone looking in a directory that tests exist for a file. This might encourage people to think about adding tests when changing a source file. It also makes it more slightly obvious which files lack proper tests. In essence I'm suggesting that our code file naming should be thus virfoo.h - exports of module foo for general internal usage virfoo.c - implementation of module foo virfoopriv.h - exports of module foo for test suite usage only virfootest.c - implementation of tests for module foo virfoomock.c - implementation of LD_PRELOAD hack for module foo tests Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

3 3

[libvirt] [PATCHv2 0/2] Avoid libvirtd crash when qemu crashes while snapshotting
by Peter Krempa 21 Jan '14

21 Jan '14

Peter Krempa (2): DO NOT APPLY UPSTREAM: Reproducer for disk snapshot crash qemu: snapshot: Avoid libvirtd crash when qemu crashes while snapshotting src/qemu/qemu_driver.c | 56 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 12 deletions(-) -- 1.8.5.3

4 6

[libvirt] [PATCH 0/2] v6: spice: expose the disable file transfer option
by Francesco Romani 21 Jan '14

21 Jan '14

Changes v6: amended commit message for patch #2 as suggested by Doug. Francesco Romani (2): spice: detect if qemu can disable file transfer spice: expose the QEMU disable file transfer option docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 11 ++++++ src/conf/domain_conf.c | 31 ++++++++++++++++- src/conf/domain_conf.h | 10 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 2 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++ tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + ...emuxml2argv-graphics-spice-agent-file-xfer.args | 9 +++++ ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 40 ++++++++++++++++++++++ .../qemuxml2argv-graphics-spice.args | 5 +-- .../qemuxml2argv-graphics-spice.xml | 1 + tests/qemuxml2argvtest.c | 9 ++++- 15 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.xml -- 1.8.4.2

2 4

[libvirt] [PATCH] patch to correct bug to refresh volume on sheepdog from a sheep pool Reload correctly pool and get vols.
by joel.simoes＠laposte.net 21 Jan '14

21 Jan '14

From: Joël Simoes <jsimoes@jsimoes> --- src/storage/storage_backend_sheepdog.c | 91 ++++++++++++++++++++++++++++++---- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index a6981ce..fbed11a 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -86,7 +86,8 @@ virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, pool->available = pool->capacity - pool->allocation; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -109,6 +110,71 @@ virStorageBackendSheepdogAddHostArg(virCommandPtr cmd, virCommandAddArgFormat(cmd, "%d", port); } +static int +virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED, + virStoragePoolObjPtr pool) +{ + int ret; + char *output = NULL; + + virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", "-r", NULL); + virStorageBackendSheepdogAddHostArg(cmd, pool); + virCommandSetOutputBuffer(cmd, &output); + ret = virCommandRun(cmd, NULL); + char** lines; + char** cells; + + if (ret < 0) + goto cleanup; + + lines = virStringSplit(output, "\n", 0); + size_t i; + for (i = 0; *(lines + i); i++) { + char *line = *(lines + i); + cells = virStringSplit(line, " ", 0); + size_t j; + for (j = 0; *(cells + j); j++) { + + char *cell = *(cells + j); + if (j == 1) { + virStorageVolDefPtr vol = NULL; + if (VIR_ALLOC(vol) < 0) + goto cleanup; + + if (VIR_STRDUP(vol->name, cell) < 0) + goto cleanup; + + vol->type = VIR_STORAGE_VOL_BLOCK; + + if (VIR_EXPAND_N(pool->volumes.objs, pool->volumes.count, 1) < 0) + goto cleanup; + pool->volumes.objs[pool->volumes.count - 1] = vol; + + if (virStorageBackendSheepdogRefreshVol(conn, pool, vol) < 0) + goto cleanup; + + vol = NULL; + } + + VIR_FREE(*(cells + j)); + } + + VIR_FREE(cells); + VIR_FREE(*(lines + i)); + } + + + VIR_FREE(lines); + + + + +cleanup: + virCommandFree(cmd); + VIR_FREE(lines); + VIR_FREE(cells); + return ret; +} static int virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, @@ -122,15 +188,16 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendSheepdogAddHostArg(cmd, pool); virCommandSetOutputBuffer(cmd, &output); ret = virCommandRun(cmd, NULL); - if (ret == 0) - ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + if (ret < 0) + goto cleanup; + ret = virStorageBackendSheepdogParseNodeInfo(pool->def, output); + virStorageBackendSheepdogRefreshAllVol(conn, pool); +cleanup: virCommandFree(cmd); - VIR_FREE(output); return ret; } - static int virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -143,12 +210,14 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; } - static int virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -174,7 +243,6 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, return 0; } - static int virStorageBackendSheepdogBuildVol(virConnectPtr conn, virStoragePoolObjPtr pool, @@ -195,12 +263,12 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn, goto cleanup; ret = 0; + cleanup: virCommandFree(cmd); return ret; } - int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output) @@ -257,7 +325,8 @@ virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, return -1; return 0; - } while ((p = next)); + } + while ((p = next)); return -1; } @@ -295,7 +364,6 @@ cleanup: return ret; } - static int virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virStoragePoolObjPtr pool, @@ -310,7 +378,10 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandAddArgFormat(cmd, "%llu", capacity); virStorageBackendSheepdogAddHostArg(cmd, pool); int ret = virCommandRun(cmd, NULL); + if (ret < 0) + goto cleanup; +cleanup: virCommandFree(cmd); return ret; -- 1.8.3.2

1 0

[libvirt] [PATCH glib] Switch over to using standard gobject introspection macros
by Daniel P. Berrange 21 Jan '14

21 Jan '14

Remove hand crafted configure.ac and Makefile.am rules in favour of the standard macros. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 25 +--------------- libvirt-gconfig/Makefile.am | 71 ++++++++++++++++++++------------------------- libvirt-glib/Makefile.am | 51 ++++++++++++++------------------ libvirt-gobject/Makefile.am | 71 ++++++++++++++++++--------------------------- 4 files changed, 83 insertions(+), 135 deletions(-) diff --git a/configure.ac b/configure.ac index 9b5d09c..8b0b63b 100644 --- a/configure.ac +++ b/configure.ac @@ -232,30 +232,7 @@ AC_SUBST([PYTHON_VERSION]) AC_SUBST([PYTHON_INCLUDES]) AC_SUBST([PYTHON_SITE_PACKAGES]) -AC_ARG_ENABLE([introspection], - AS_HELP_STRING([--enable-introspection], [enable GObject introspection]), - [], [enable_introspection=check]) - -if test "x$enable_introspection" != "xno" ; then - PKG_CHECK_MODULES([GOBJECT_INTROSPECTION], - [gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED], - [enable_introspection=yes], - [ - if test "x$enable_introspection" = "xcheck"; then - enable_introspection=no - else - AC_MSG_ERROR([gobject-introspection is not available]) - fi - ]) - if test "x$enable_introspection" = "xyes" ; then - AC_DEFINE([WITH_GOBJECT_INTROSPECTION], [1], [enable GObject introspection support]) - AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS) - AC_SUBST(GOBJECT_INTROSPECTION_LIBS) - AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)]) - AC_SUBST([G_IR_COMPILER], [$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)]) - fi -fi -AM_CONDITIONAL([WITH_GOBJECT_INTROSPECTION], [test "x$enable_introspection" = "xyes"]) +GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_REQUIRED]) AC_ARG_ENABLE([vala], AS_HELP_STRING([--enable-vala], [enable Vala binding generation]), diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 0793da1..03e4036 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -168,6 +168,10 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-storage-vol-target.c \ libvirt-gconfig-xml-doc.c +GCONFIG_GENERATED_FILES = \ + libvirt-gconfig-enum-types.c \ + libvirt-gconfig-enum-types.h + libvirt_gconfig_1_0_ladir = $(includedir)/libvirt-gconfig-1.0/libvirt-gconfig libvirt_gconfig_1_0_la_HEADERS = \ $(GCONFIG_HEADER_FILES) @@ -177,7 +181,7 @@ libvirt_gconfig_1_0_la_SOURCES = \ $(libvirt_gconfig_1_0_la_HEADERS) \ $(GCONFIG_SOURCE_FILES) nodist_libvirt_gconfig_1_0_la_SOURCES = \ - $(builddir)/libvirt-gconfig-enum-types.c + $(GCONFIG_GENERATED_FILES) libvirt_gconfig_1_0_la_CFLAGS = \ -DG_LOG_DOMAIN="\"Libvirt.GConfig\"" \ -DDATADIR="\"$(datadir)\"" \ @@ -199,9 +203,7 @@ libvirt_gconfig_1_0_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libvirt-gconfig.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) -BUILT_SOURCES = \ - libvirt-gconfig-enum-types.c \ - libvirt-gconfig-enum-types.h +BUILT_SOURCES = $(GCONFIG_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) @@ -213,44 +215,33 @@ libvirt-gconfig-enum-types.c: $(GCONFIG_HEADER_FILES) libvirt-gconfig-enum-types $(AM_V_GEN) ( $(GLIB_MKENUMS) --template $(srcdir)/libvirt-gconfig-enum-types.c.template $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) ) | \ sed -e "s/G_TYPE_VIR_CONFIG/GVIR_CONFIG_TYPE/" -e "s/g_vir/gvir/" > libvirt-gconfig-enum-types.c -if WITH_GOBJECT_INTROSPECTION - -LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGConfig \ - --nsversion 1.0 \ - --include GObject-2.0 \ - --identifier-prefix=GVirConfig \ - --symbol-prefix=gvir_config \ - --library=$(builddir)/libvirt-gconfig-1.0.la \ - --output $@ \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - --verbose \ - --c-include="libvirt-gconfig/libvirt-gconfig.h" \ - --pkg=libxml-2.0 \ - --pkg-export=libvirt-gconfig-1.0 \ - $(srcdir)/libvirt-gconfig.h \ - $(GCONFIG_SOURCE_FILES:%=$(srcdir)/%) \ - $(GCONFIG_HEADER_FILES:%=$(srcdir)/%) \ - $(builddir)/libvirt-gconfig-enum-types.c \ - $(builddir)/libvirt-gconfig-enum-types.h - +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = + +if HAVE_INTROSPECTION +LibvirtGConfig-1.0.gir: libvirt-gconfig-1.0.la +LibvirtGConfig_1_0_gir_INCLUDES = GObject-2.0 +LibvirtGConfig_1_0_gir_PACKAGES = gobject-2.0 +LibvirtGConfig_1_0_gir_EXPORT_PACKAGES = libvirt-gconfig-1.0 +LibvirtGConfig_1_0_gir_LIBS = libvirt-gconfig-1.0.la +LibvirtGConfig_1_0_gir_FILES = \ + $(GCONFIG_SOURCE_FILES) \ + $(GCONFIG_HEADER_FILES) \ + $(GCONFIG_GENERATED_FILES) \ + $(NULL) +LibvirtGConfig_1_0_gir_CFLAGS = $(libvirt_gconfig_1_0_la_CFLAGS) +LibvirtGConfig_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVirConfig \ + --symbol-prefix=gvir_config \ + --c-include="libvirt-gconfig/libvirt-gconfig.h" \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGConfig-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGConfig-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGConfig-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGConfig-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION diff --git a/libvirt-glib/Makefile.am b/libvirt-glib/Makefile.am index 1370ebc..36404f1 100644 --- a/libvirt-glib/Makefile.am +++ b/libvirt-glib/Makefile.am @@ -37,38 +37,31 @@ libvirt_glib_1_0_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libvirt-glib.sym \ -version-info $(LIBVIRT_GLIB_VERSION_INFO) -if WITH_GOBJECT_INTROSPECTION -LibvirtGLib-1.0.gir: libvirt-glib-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGLib \ - --nsversion 1.0 \ - --include GLib-2.0 \ - --identifier-prefix=GVir \ - --symbol-prefix=gvir \ - --library=$(builddir)/libvirt-glib-1.0.la \ - --output $@ \ - -I$(top_srcdir) \ - --verbose \ - --pkg=gthread-2.0 \ - --c-include="libvirt-glib/libvirt-glib.h" \ - --pkg-export=libvirt-glib-1.0 \ - $(libvirt_glib_1_0_la_SOURCES:%=$(srcdir)/%) +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +CLEANFILES= + +if HAVE_INTROSPECTION +LibvirtGLib-1.0.gir: libvirt-glib-1.0.la +LibvirtGLib_1_0_gir_INCLUDES = GLib-2.0 +LibvirtGLib_1_0_gir_PACKAGES = glib-2.0 +LibvirtGLib_1_0_gir_EXPORT_PACKAGES = libvirt-glib-1.0 +LibvirtGLib_1_0_gir_LIBS = libvirt-glib-1.0.la +LibvirtGLib_1_0_gir_FILES = $(libvirt_glib_1_0_la_SOURCES) +LibvirtGLib_1_0_gir_CFLAGS = $(libvirt_glib_1_0_la_CFLAGS) +LibvirtGLib_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVir \ + --symbol-prefix=gvir \ + --c-include="libvirt-glib/libvirt-glib.h" \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGLib-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGLib-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGLib-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES = $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGLib-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION diff --git a/libvirt-gobject/Makefile.am b/libvirt-gobject/Makefile.am index 3284b2c..9c05cb5 100644 --- a/libvirt-gobject/Makefile.am +++ b/libvirt-gobject/Makefile.am @@ -119,50 +119,37 @@ BUILT_SOURCES = $(GOBJECT_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) -if WITH_GOBJECT_INTROSPECTION - -LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la $(G_IR_SCANNER) Makefile.am - $(AM_V_GEN)$(G_IR_SCANNER) \ - --quiet \ - --warn-all \ - --namespace LibvirtGObject \ - --nsversion 1.0 \ - --include GObject-2.0 \ - --include Gio-2.0 \ - --include-uninstalled $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir \ - --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ - --identifier-prefix=GVir \ - --symbol-prefix=gvir \ - --library=$(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ - --library=$(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ - --library=$(builddir)/libvirt-gobject-1.0.la \ - --output $@ \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - --verbose \ - --c-include="libvirt-gobject/libvirt-gobject.h" \ - --pkg=gthread-2.0 \ - --pkg=libxml-2.0 \ - --pkg-export=libvirt-gobject-1.0 \ - $(srcdir)/libvirt-gobject.h \ - $(GOBJECT_SOURCE_FILES:%=$(srcdir)/%) \ - $(GOBJECT_HEADER_FILES:%=$(srcdir)/%) \ - $(GOBJECT_GENERATED_FILES:%=$(builddir)/%) +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = + +if HAVE_INTROSPECTION +LibvirtGObject-1.0.gir: libvirt-gobject-1.0.la +LibvirtGObject_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 +LibvirtGObject_1_0_gir_PACKAGES = gobject-2.0 +LibvirtGObject_1_0_gir_EXPORT_PACKAGES = libvirt-gobject-1.0 +LibvirtGObject_1_0_gir_LIBS = \ + $(top_builddir)/libvirt-glib/libvirt-glib-1.0.la \ + $(top_builddir)/libvirt-gconfig/libvirt-gconfig-1.0.la \ + libvirt-gobject-1.0.la +LibvirtGObject_1_0_gir_FILES = \ + $(GOBJECT_SOURCE_FILES) \ + $(GOBJECT_HEADER_FILES) \ + $(GOBJECT_GENERATED_FILES) \ + $(NULL) +LibvirtGObject_1_0_gir_CFLAGS = $(libvirt_gobject_1_0_la_CFLAGS) +LibvirtGObject_1_0_gir_SCANNERFLAGS = \ + --identifier-prefix=GVir --symbol-prefix=gvir \ + --c-include="libvirt-gobject/libvirt-gobject.h" \ + --include-uninstalled $(top_builddir)/libvirt-glib/LibvirtGLib-1.0.gir \ + --include-uninstalled $(top_builddir)/libvirt-gconfig/LibvirtGConfig-1.0.gir \ + $(NULL) +INTROSPECTION_GIRS += LibvirtGObject-1.0.gir girdir = $(datadir)/gir-1.0 gir_DATA = LibvirtGObject-1.0.gir -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = LibvirtGObject-1.0.typelib - -%.typelib: %.gir - $(AM_V_GEN)$(G_IR_COMPILER) \ - --includedir=$(top_builddir)/libvirt-glib \ - --includedir=$(top_builddir)/libvirt-gconfig \ - --includedir=$(builddir) \ - --includedir=$(girdir) \ - -o $@ $< - -CLEANFILES += $(gir_DATA) $(typelibs_DATA) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = LibvirtGObject-1.0.typelib -endif # WITH_GOBJECT_INTROSPECTION +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif # HAVE_INTROSPECTION -- 1.8.4.2

2 3

[libvirt] [PATCH RESEND v4 0/2] Libvirt Wireshark Dissector
by Yuto KAWAMURA(kawamuray) 21 Jan '14

21 Jan '14

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Changes from version 3: * Merge tools/wireshark/.gitignore into ROOT/.gitignore * Fix dissect_xdr_pointer() bug which pointed by Michal * Added -module option to libvirt_la_LDFLAGS respecting official build process Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector .gitignore | 2 + Makefile.am | 3 +- cfg.mk | 8 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 22 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/packet-libvirt.c | 512 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1011 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 198 ++++++ 12 files changed, 2229 insertions(+), 6 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.3.2

4 8

[libvirt] [PATCH] lxc: Fix coverity
by Martin Kletzander 21 Jan '14

21 Jan '14

Commit 399394ab74ebf3f6e60771044fda0ee69a2acf67 removed some coverity comments which skipped the dead code, so add them back. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/lxc/lxc_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f35f93..e319234 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2621,6 +2621,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, goto cleanup; break; + /* coverity[dead_error_begin] */ default: break; /* should not hit here */ @@ -2812,6 +2813,7 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, } break; + /* coverity[dead_error_begin] */ default: break; /* should not hit here */ -- 1.8.5.3

2 2

[libvirt] [libvirt-java] [PATCH] Depend on JNA versions 3.3 to 4.0
by Claudio Bley 21 Jan '14

21 Jan '14

Specify a version range for the net.java.dev.jna / jna artefact in order to accept any version we tested the libvirt Java bindings against. --- It's been some time we discussed this[1], but here we go... https://www.redhat.com/archives/libvir-list/2013-September/msg00929.html pom.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml.in b/pom.xml.in index 25b2ae7..4e7a7c1 100644 --- a/pom.xml.in +++ b/pom.xml.in @@ -27,7 +27,7 @@ <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> <scope>provided</scope> - <version>3.5.0</version> + <version>[3.3,4.0]</version> </dependency> </dependencies> -- 1.8.5.2.msysgit.0

1 0

[libvirt] [PATCH v2 0/8] Add throttle blkio cgroup support for libvirt
by Gao feng 21 Jan '14

21 Jan '14

Right now, libvirt only supports the cfq based blkio cgorup, this means if the block devices doesn't use cfq scheduler, the blkio cgroup will loss effect. This patchset adds the throttle blkio cgroup support for libvirt, introduces four elements for domain configuration and extend the virsh command blkiotune. This patchset is a new version of Guan Qiang's patchset ://www.redhat.com/archives/libvir-list/2013-October/msg01066.html Change from v1: 1, rearrange the order of patches 2, change the options/elements of throttle blkio cgroup to consist with disk iotune. 3, fix complie error when cgroup is unavailable. 4, remove virCgroupSetBlkioDevice, split virCgroupSetBlkioDeviceBps and virCgroupSetBlkioDeviceIops Change from Guan Qiang's patchset: 1, split to 8 patches, make logic more clear 2, change the type of read/write iops form unsigned long long to unsigned int, trying to set read/write iops to the value which bigger than max number of unsigned int will fail. 3, fix some logic shortage. Gao feng (8): rename virDomainBlkioDeviceWeightParseXML to virDomainBlkioDeviceParseXML rename virBlkioDeviceWeightArrayClear to virBlkioDeviceArrayClear rename virBlkioDeviceWeightPtr to virBlkioDevicePtr domain: introduce xml elements for throttle blkio cgroup blkio: Setting throttle blkio cgroup for domain virsh: add setting throttle blkio cgroup option to blkiotune qemu: allow to setup throttle blkio cgroup through virsh lxc: allow to setup throttle blkio cgroup through virsh docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 45 ++ src/conf/domain_conf.c | 113 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 6 +- src/lxc/lxc_cgroup.c | 29 +- src/lxc/lxc_driver.c | 649 ++++++++++++++++++++- src/qemu/qemu_cgroup.c | 29 +- src/qemu/qemu_driver.c | 443 ++++++++++++-- src/util/vircgroup.c | 224 ++++++- src/util/vircgroup.h | 16 + .../qemuxml2argv-blkiotune-device.xml | 8 + tools/virsh-domain.c | 64 ++ tools/virsh.pod | 36 +- 14 files changed, 1583 insertions(+), 123 deletions(-) -- 1.8.3.1

3 26

[libvirt] [v10 0/6] Write separate module for hostdev passthrough
by Chunyan Liu 20 Jan '14

20 Jan '14

These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. patch 1/6: extract hostdev passthrough function from qemu_hostdev.c and make it reusable by multiple drivers. patch 2/6: add a unit test for hostdev common library. patch 3/6: switch qemu driver to use the common library instead of its own hostdev passthrough APIs. patch 4/6: switch lxc driver to use the common library instead of its own hostdev passthrough APIs. patch 5/6: add a hostdev pci backend type for xen usage. patch 6/6: add pci passthrough to libxl driver. --- Changes * change copyright to 2014 * use VIR_DEBUG instead of self-defined DPRINTF in virhostdevtest.c * rebase to lasest source code Chunyan Liu (6): add hostdev passthrough common library add unit test to hostdev common library change qemu driver to use hostdev common library change lxc driver to use hostdev common library add hostdev pci backend type for xen add pci passthrough to libxl driver .gnulib | 2 +- docs/schemas/domaincommon.rng | 1 + po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 21 + src/libxl/libxl_conf.c | 63 + src/libxl/libxl_conf.h | 4 + src/libxl/libxl_domain.c | 9 + src/libxl/libxl_driver.c | 448 +++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 47 +- src/lxc/lxc_hostdev.c | 413 ----- src/lxc/lxc_hostdev.h | 43 - src/lxc/lxc_process.c | 24 +- src/qemu/qemu_command.c | 4 +- src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_domain.c | 22 + src/qemu/qemu_driver.c | 81 +- src/qemu/qemu_hostdev.c | 1454 ----------------- src/qemu/qemu_hostdev.h | 76 - src/qemu/qemu_hotplug.c | 136 +- src/qemu/qemu_process.c | 40 +- src/util/virhostdev.c | 1703 ++++++++++++++++++++ src/util/virhostdev.h | 134 ++ src/util/virpci.c | 30 +- src/util/virpci.h | 9 +- src/util/virscsi.c | 28 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 29 +- src/util/virusb.h | 8 +- tests/Makefile.am | 5 + .../qemuxml2argv-hostdev-pci-address.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml | 2 + tests/virhostdevtest.c | 473 ++++++ tests/virpcimock.c | 23 +- 38 files changed, 3152 insertions(+), 2213 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h create mode 100644 tests/virhostdevtest.c

2 10

[libvirt] [PATCH] Add test for transient disk support in VMX files
by Wout Mertens 20 Jan '14

20 Jan '14

From: Wout Mertens <Wout.Mertens(a)gmail.com> Adds test for transient disk translation in vmx files --- tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx | 6 +++++ tests/vmx2xmldata/vmx2xml-harddisk-transient.xml | 25 ++++++++++++++++++++++ tests/vmx2xmltest.c | 1 + 3 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-harddisk-transient.xml diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx new file mode 100644 index 0000000..68ef382 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.vmx @@ -0,0 +1,6 @@ +config.version = "8" +virtualHW.version = "4" +ide0:0.present = "true" +ide0:0.deviceType = "ata-hardDisk" +ide0:0.fileName = "harddisk.vmdk" +ide0:0.mode = "independent-nonpersistent" diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml new file mode 100644 index 0000000..3786e2f --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-harddisk-transient.xml @@ -0,0 +1,25 @@ +<domain type='vmware'> + <uuid>00000000-0000-0000-0000-000000000000</uuid> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/harddisk.vmdk'/> + <target dev='hda' bus='ide'/> + <transient/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <video> + <model type='vmvga' vram='4096'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 13515f0..70178f7 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -221,6 +221,7 @@ mymain(void) DO_TEST("harddisk-scsi-file", "harddisk-scsi-file"); DO_TEST("harddisk-ide-file", "harddisk-ide-file"); + DO_TEST("harddisk-transient", "harddisk-transient"); DO_TEST("cdrom-scsi-file", "cdrom-scsi-file"); DO_TEST("cdrom-scsi-device", "cdrom-scsi-device"); -- 1.7.1

2 1

[libvirt] [PATCH] Use AC_PATH_PROG to search for dmidecode
by Roman Bogorodskiy 20 Jan '14

20 Jan '14

This is useful in certain circumstances, for example when libvirtd is being executed by FreeBSD rc script, it cannot find dmidecode installed from FreeBSD ports because it doesn't have /usr/local (default prefix for ports) in PATH. --- configure.ac | 4 ++++ src/util/virsysinfo.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 146418f..c34c7b8 100644 --- a/configure.ac +++ b/configure.ac @@ -391,6 +391,8 @@ dnl External programs that we can use if they are available. dnl We will hard-code paths to these programs unless we cannot dnl detect them, in which case we'll search for the program dnl along the $PATH at runtime and fail if it's not there. +AC_PATH_PROG([DMIDECODE], [dmidecode], [dmidecode], + [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([DNSMASQ], [dnsmasq], [dnsmasq], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) AC_PATH_PROG([RADVD], [radvd], [radvd], @@ -408,6 +410,8 @@ AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl], AC_PATH_PROG([SCRUB], [scrub], [scrub], [/sbin:/usr/sbin:/usr/local/sbin:$PATH]) +AC_DEFINE_UNQUOTED([DMIDECODE],["$DMIDECODE"], + [Location or name of the dmidecode program]) AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"], [Location or name of the dnsmasq program]) AC_DEFINE_UNQUOTED([RADVD],["$RADVD"], diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 18f426d..92484f5 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -44,7 +44,7 @@ VIR_ENUM_IMPL(virSysinfo, VIR_SYSINFO_LAST, "smbios"); -static const char *sysinfoDmidecode = "dmidecode"; +static const char *sysinfoDmidecode = DMIDECODE; static const char *sysinfoSysinfo = "/proc/sysinfo"; static const char *sysinfoCpuinfo = "/proc/cpuinfo"; -- 1.8.4.3

2 1

[libvirt] 'host-passthrough' for arm64
by Oleg Strikov 20 Jan '14

20 Jan '14

Hello guys, I'm trying to come up with basic OpenStack support for arm64 node. I'd like to use 'libvirt_cpu_mode=host-passthrough' configuration option with Nova which issues <cpu mode='host-passthrough'> to libvirt xml config. But with this option passed libvirt crashes with 'error: unsupported configuration: CPU specification not supported by hypervisor'. This happens because the following handlers are not implemented (or implemented as stubs) inside src/cpu/cpu_aarch64.c: * AArch64Decode() * AArch64Update() * AArch64guestData() To solve exactly this 'host-passthrough'-related issue that's enough to have the following set of handlers: AArch64Decode(<...>) { virCheckFlags(VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES, -1); /* I don't know any way to detect 'cortex-a57' or any other armv8 CPU for now */ /* But I don't think that we can meet anything else than cortex-a57 */ /* We may also put 'host' there to specifically point out that qemu-aarch64 supports only '-cpu host' for now */ /* pm215 told me that the ETA for '-cpu cortex-a57' and friends is around 3 months from now */ return !(VIR_STRDUP(cpu->model, "host" or "cortex-a57") == 1); } static int AArch64Update(<...>) { /* qemu-aarch64 supports only '-cpu host' for now */ guest->match = VIR_CPU_MATCH_EXACT; virCPUDefFreeModel(guest); return virCPUDefCopyModel(guest, host, true); } static virCPUCompareResult AArch64guestData(<..>) { return VIR_CPU_COMPARE_IDENTICAL; } That's clear that these handlers provide just basic functionality ('host-passthrough'-only) and have to be extended in future. But is it something we can commit for now? Another way to deal with this issue is to adopt some code from PPC handlers (including CPU model detection and best fit qemu configuration discovery). But this way will be blocked until: (1) I find any way to reliably detect CPU model on ARMv8 board (any ideas?) (2) pm215 implements TCG for arm64 What is the best way to choose to come up with the commitable code? Many thanks for your help! Oleg

2 1

[libvirt] [RFC PATCH 0/3] Implement two-tier driver loading
by Adam Walters 20 Jan '14

20 Jan '14

This patchset implements a two-tier driver loading system. I split the hypervisor drivers out into their own tier, which is loaded after the other drivers. This has the net effect of ensuring that things like secrets, networks, etc., are initialized and auto-started before any hypervisors, such as qemu, lxc, etc., are touched. This resolves the race condition present when starting libvirtd while domains are running, which happens when restarting libvirtd after having started at least one domain. This patch will work without my config driver patchset, but does prevent RBD storage pools from auto-starting. It may also affect other pool types, but I only have file and RBD to test with, personally. The RBD storage pool is only affected because it requires a hypervisor connection (prior to this patchset, that connection was hardcoded to be a connection to qemu on localhost) in order to look up secrets. Any pool type that does not use/need data outside of the base storage pool definition should continue to auto-start (file backed pools definitely still work) and also no longer be part of the restart race condition. For anyone who is not familiar with the race condition I mentioned above, the basic description is the upon restarting libvirtd, any running QEMU domains using storage pool backed disks are killed (randomly) due to their storage pool not being online. This is due to storage pool auto-start not having finished before QEMU initalization runs. I would appreciate any comments and suggestions about this patchset. It works for me on 4 machines running three different distros of Linux (Archlinux, Gentoo, and CentOS), so I would imagine it should work most anywhere. Adam Walters (3): driver: Implement new state driver field storage: Fix hardcoded qemu connection libvirt: Implement two-tier driver loading src/config/config_driver.c | 1 + src/driver.h | 6 ++++ src/interface/interface_backend_netcf.c | 1 + src/libvirt.c | 57 ++++++++++++++++++++++++++++----- src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/network/bridge_driver.c | 1 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 1 + src/storage/storage_driver.c | 13 ++++---- src/uml/uml_driver.c | 1 + src/xen/xen_driver.c | 1 + 16 files changed, 75 insertions(+), 14 deletions(-) -- 1.8.5.2

2 6

[libvirt] How to configure MacVtap passthrough mode to SR-IOV VF?
by opendaylight 20 Jan '14

20 Jan '14

Hi guys. These days I'm doing research on SR-IOV & Live migration. As we all know there is big problem that SR-IOV & Live migration can not exist at the same time. I heard that KVM + SRIOV + MacVtap can solve this problem. So I want to try. My environment: Host: Dell R610, OS: RHEL 6.4 ( kernel 2.6.32) NIC: intel 82599 I follow a document from intel guy, it said that I should write xml like below: ============================ <network> <name>macvtap_passthrough’</name> <forward mode=’passthrough> <interface dev=’vf0’ /> <interface dev=’vf1’ /> .. .. </forward> </network> ============================ I guess here the vf0 & vf1 should be the VFs of Intel 82599. What make me confused is that we know we can not see the vf 0 & vf 1 directly from the host server with "ifconfig", that is to say, vf 0 & vf1 are not a real physical interface. I try #: virsh net-define macvtap_passthrough.xml #: virsh net-start macvtap_passthrough When I try to configure macvtap_passthrough for a VNIC of a VM, the virt-manager told : "Can't get vf 0, no such a device". When I try from virt-manager: add hardware--->network--->host device (macvtap_passthrough:pass_through network), I got error like : "Error adding device: xmlParseDoc() failed". I guess I can not write like this " <interface dev=’vf0’ />" in the xml. I try to change as below, but the result is same. ============================ <network> <name>macvtap_passthrough’</name> <forward mode=’passthrough> <pf dev=’p2p1’ /> // p2p1 is intel sriov physical nic </forward> </network> ============================ I don't know how to write correctly. Please help me. You can refer to intel document as below. Many thanks. ==========document from intel======================== Linux/KVM VM Live Migration (SRIOV And MacVtap) By Waseem Ahmad (waseem.ahmad(a)intel.com In this scenario we are using 3 machines:  Server 1: DNS/NFS – nfs.vtt.priv  Server 2: Hv1  Server3: Hv2 HV1 and HV2 are Linux/KVM machines. We will get to them in a minute however we first must address kvm and nfs. NFS:  Create a storage area, where both HV1, and HV2 can access it. There are several methods available for this (FCOE/ISCSI/NFS). For this write-up use nfs. Configure NFS:  Create a directory on nfs.vtt.priv where you want your storage to be. In this case used /home/vmstorage  Edit /etc/exports and add the following /home/vmstorage 172.0.0.0/1(rw,no_root_squash,sync)  Now to /etc/sysconfig/nfs Uncomment RPCNFSDARGS=”-N 4” This will disable nfs v4. If you don’t do this you will have issues with not being able to access the share from within VirtManager.  Add all three machines ip addresses to each machines /hosts file. MIGRATION WILL NOT WORK WITHOUT FULLY QUALIFIED DOMAIN NAMES. KVM: On both HV1, and HV2 servers:  Edit /etc/selinux/config SELINUX=disabled  Edit /etc/libvirt/qemu.conf Change security_driver=none  On HV1 and HV2 start Virtual Machine Manager  Double click on localhost(QEMU)  Then click on the storage tab at the top of the window that pops up  Down in the left hand corner is a box with a + sign in it, click on that. A new window will appear entitled Add a New Storage Pool  In the name box type vmstorage, then click on the type box and select netfs: Network Exported Directory, now click next.  You will see the last step of the network Storage Pool Dialog. The first option is the target path. This is the path where we will mount our storage on the local server. I have chosen to leave this alone.  The next option is format, leave this set on auto: Host name: nfs.vtt.priv Source path: /home/vmstorage  Click on finish  Repeat the above steps on HV2 server Create vms  On HV1 server go back to the connection details screen, (this is the one that showed up when you double clicked on localhost (qemu), and click on the storage tab again.  Click on vmstorage then click on new volume at the bottom.  A new dialog will appear entitled add a storage volume.  In the Name box type vm1  In the Max Capacity box type 20000  And do the same in the allocation box then click finish.  Now you can close the connection details box by click on the x in the corner.  Now click on the terminal in the corner, right underneath file, and type the name of our vm in the box that is entitled Name, vm1 choose how your installation media, probably local install media, and click forward. Click on use cdrom or dvd, and place a rh6.2 dvd in the dvd player on HV1. Select Linux, for the OS type, and Red Hat Enterprise Linux 6 for the version. Memory I chose to leave this at its default of 1024, and assigned 1 cpu to the guest. Click forward, select “select managed or other existing storage” and click the browse button. Click on vmstoarge, and select vm1.img then click forward. Then click on finish.  We will configure network after we make sure migration between the two servers works properly.  Now go ahead and install the operating system as you would normally. Create networks Create a file that looks like the following < there is no support for adding a macvtap interface from the gui as of yet, this is the only manual step in the process. Create a file named macvtap_passthrough.xml with the following contents. <network> <name>macvtap_passthrough’</name> <forward mode=’passthrough> <interface dev=’vf0’ /> <interface dev=’vf1’ /> .. .. </forward> </network> <network> <name>’macvtap_bridge’</name> <forward mode=’bridge’> <interface dev=’p3p1’/> </forward> </network> Save it and run the following commands:  virsh net-define macvtap_passthrough.xml  virsh net-start macvtap_passthrough Make sure all of your virtual interfaces that you used in the xml file are up. for i in $(ifconfig –a | awk ‘/eth/ {print $1}’); do ifconfig $i up; done Then double click on your vm and click on the big blue i On the next screen click on add hardware, then on network, then select Virtual network “macvtap_passthrough” Then click on finish. Start your vm and make sure that the macvtap was created on the host by doing ip link | grep ‘macvtap’ In the vm configure the ip information for the virtio adapter. In the virtual machine manager click on file, add connection. Then check the connect to remote host fill in the username and hostname, then click on connect Right click on your VM and select Migrate, select the host you want to migrate the machine to, then click on advanced options, check the address box, and type the ip address of the machine you want to migrate to, and click the migrate button.

2 1

[libvirt] Propose patch?
by Joel Simoes 20 Jan '14

20 Jan '14

Hi, all. I'm Joel I wan't propose patch to correct bug to refresh volume on sheepdog from a sheep pool. Bug I'm not understanding how to configure correctly my .git/config to send patch. Warning, I'm not C developper, this patch requiered correction for char analyse and copy. It's work but ... My patch (add auto volumes (vdi) and refresh when adding a pool sheepdog) Thanks.

2 1

[libvirt] [PATCH 0/2] Improve whitespace syntax checks
by Thorsten Behrens 20 Jan '14

20 Jan '14

Check for whitespace around assignments / compount assignment operators. Fix syntax-check fallout in PATCH 2/2. Thorsten Behrens (2): Make syntax check notice assignments w/o surrounding spaces. maint: align whitespace with project conventions. build-aux/bracket-spacing.pl | 8 +++++ examples/object-events/event-test.c | 20 +++++------ src/conf/nwfilter_conf.c | 72 ++++++++++++++++++------------------- src/esx/esx_vi.c | 2 +- src/libvirt.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 2 +- src/phyp/phyp_driver.c | 2 +- src/util/virlog.c | 4 +-- src/util/virsysinfo.c | 2 +- src/xen/xen_driver.c | 4 +-- src/xen/xs_internal.c | 10 +++--- src/xenapi/xenapi_driver.c | 22 ++++++------ tests/commandtest.c | 4 +-- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 6 ++-- tools/virsh-host.c | 2 +- tools/virt-login-shell.c | 2 +- 19 files changed, 89 insertions(+), 81 deletions(-) -- 1.8.4

2 4

[libvirt] [PATCH 0/9] Fix corner cases in nodedev detach and reattach
by Jiri Denemark 20 Jan '14

20 Jan '14

https://bugzilla.redhat.com/show_bug.cgi?id=1046919 The first two patches fix bugs in PCI device handling code, the third patch provides a nice error message when nodedev detach is not supported and the rest are tests for testing the bugs fixed in the first two patches. Jincheng Miao (1): qemu: Don't detach devices if passthrough doesn't work Jiri Denemark (8): pci: Make reattach work for unbound devices pci: Fix failure paths in detach virpcitest: Show PCI device tested by each test pci: Publish some internal code for virpcitest virpcimock: Mock /sys/bus/pci/drivers_probe virpcitest: More tests for device detach and reattach virpcimock: Add PCI driver which always fails virpcitest: Test virPCIDeviceDetach failure src/libvirt_private.syms | 2 + src/qemu/qemu_driver.c | 32 +++++--- src/util/virpci.c | 121 +++++++++++++++++----------- src/util/virpci.h | 5 ++ tests/virpcimock.c | 76 ++++++++++++------ tests/virpcitest.c | 199 ++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 355 insertions(+), 80 deletions(-) -- 1.8.5.3

2 21

[libvirt] [PATCH 0/6] Add BlkIO and CPU/mem stat API implementations for lxc
by Thorsten Behrens 20 Jan '14

20 Jan '14

This patch set adds block io, memory and domain cpu statistics API slot implementations to the LXC driver, in order to get linux container monitoring and accounting a bit closer to qemu standards. The last patch is a tad quirky (happy to hear suggestions on alternative ways), in that it widens the permissible value set at the .domainBlockStats slot: for lxc guests, it is relatively likely to have zero disk devices, since host filesystems can be used via passthrough bind mounts. Therefore, passing the null ptr or the zero-length string as device path, is interpreted as 'return summary stats for the entire domains's block io'. Thorsten Behrens (6): Add util virCgroupGetBlkioIo*Serviced methods. Implement domainMemoryStats API slot for LXC driver. Make qemuGetDomainTotalCPUStats a virCgroup function. Implement domainGetCPUStats for lxc driver. Implemet lxcDomainBlockStats for lxc driver Widening API change - accept empty path for virDomainBlockStats src/libvirt.c | 1 - src/libvirt_private.syms | 3 + src/lxc/lxc_driver.c | 245 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_driver.c | 56 +--------- src/remote/remote_driver.c | 2 + src/test/test_driver.c | 2 + src/util/vircgroup.c | 261 +++++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 17 +++ src/xen/xen_driver.c | 2 + 9 files changed, 536 insertions(+), 53 deletions(-) -- 1.8.4

2 14

[libvirt] Help out
by Giorgio Zoppi 20 Jan '14

20 Jan '14

Hi all, how could I help out? Is there a bug list or a todo list? Are u able to pin a virtualization sandbox to a given processor? Best Regards, Giorgio

2 1

[libvirt] [libvirt-glib] Fix GVirConfigDomainTimerPit parent class/object
by Christophe Fergeau 18 Jan '14

18 Jan '14

GVirConfigDomainTimerPit is correctly define as inheriting from GVirConfigDomainTimer in the G_DEFINE_TYPE macro, but it only embeds GVirConfigObject/GVirConfigObjectClass structs. This is an ABI break as this changes the size of the GVirConfigDomainTimerPit/GVirConfigDomainTimerPitClass structs However, since these structs only have non-public members, users of the library will not be trying to access fields of the struct past the first field (which is the one which changed size). This would also be an issue if anything had subclassed GVirConfigDomainTimerPit, which is unlikely at this point. All in all, it's imo more convenient to silently fix this without an soname bump. I've tested that GNOME Boxes built with an older version of libvirt-gconfig still generates the correct GVirConfigDomainTimerPit elements when using a version of libvirt-gconfig with this patch. --- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.h b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.h index b644c52..7802ac4 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.h @@ -42,7 +42,7 @@ typedef struct _GVirConfigDomainTimerPitClass GVirConfigDomainTimerPitClass; struct _GVirConfigDomainTimerPit { - GVirConfigObject parent; + GVirConfigDomainTimer parent; GVirConfigDomainTimerPitPrivate *priv; @@ -51,7 +51,7 @@ struct _GVirConfigDomainTimerPit struct _GVirConfigDomainTimerPitClass { - GVirConfigObjectClass parent_class; + GVirConfigDomainTimerClass parent_class; gpointer padding[20]; }; -- 1.8.4.2

2 1

[libvirt] [libvirt-glib 0/4] Add API to build <timer name="hpet" present="no"/>
by Christophe Fergeau 18 Jan '14

18 Jan '14

This series allows to generate <timer name="hpet" present="no"/> using libvirt-gconfig. This is a prerequisite for fixing this Boxes bug https://bugzilla.gnome.org/show_bug.cgi?id=722293 Patch 2/4 doesn't anything to do in this series, but this was easy to implement after 1/4 so I slipped it there. Christophe

2 10

[libvirt] [PATCH] doc: Add missing space in <clock> documentation
by Christophe Fergeau 17 Jan '14

17 Jan '14

--- Pushed under the trivial rule. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 68860ef..80d9495 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1348,7 +1348,7 @@ </dl> A <code>clock</code> may have zero or more - <code>timer</code>sub-elements. Since + <code>timer</code> sub-elements. Since 0.8.0 </dd> -- 1.8.4.2

1 0

[libvirt] [PATCH] build: add $(prefix) to SYSTEMD_UNIT_DIR
by Laine Stump 17 Jan '14

17 Jan '14

I noticed this problem when adding systemd support to netcf, because I setup the configure.ac to automatically prefer using systemd over initscripts when possible - although I had copied the install-data-local target from the example of libvirt's "libvirt-guests" service more or less verbatim, "make distcheck" would fail because it was trying to install the service file directly into /lib/systemd/system rather than into /home/user/some/unimportant/name/lib/systemd/system. This is caused by the install/uninstall rules for the systemd unit files relying on $(DESTDIR) pointing the installed files to the right place, but in reality $(DESTDIR) is empty during this part of make distcheck - it instead sets $(prefix) with the toplevel directory used for its test build/install/uninstall cycle. (This problem hasn't been seen when running "make distcheck" in libvirt because libvirt will never build/install systemd support unless explicitly told to do so on the configure commandline, and "make distcheck" doesn't put the "--with-initscript=..." option on the configure commandline.) I verified that the same problem does exist in libvirt by modifying libvirt's configure.ac to set: init_systemd=yes with_init_script=systemd+redhat This forces a build/install of the systemd unit files during distcheck, which yields an error like this: /usr/bin/install -c -m 644 virtlockd.service \ /lib/systemd/system/ libtool: install: warning: relinking `libvirt-qemu.la' /usr/bin/install: cannot remove '/lib/systemd/system/virtlockd.service': Permission denied make[4]: *** [install-systemd] Error 1 After adding $(prefix) to all the definitions of SYSTEMD_UNIT_DIR, make distcheck now completes successfully with the modified configure.ac, and the above lines change to something like this: /usr/bin/install -c -m 644 virtlockd.service \ /home/laine/devel/libvirt/libvirt-1.2.1/_inst/lib/systemd/system/ --- daemon/Makefile.am | 4 ++-- src/Makefile.am | 4 ++-- tools/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e5c5db8..00221ab 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-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 @@ -387,7 +387,7 @@ endif ! LIBVIRT_INIT_SCRIPT_UPSTART if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system BUILT_SOURCES += libvirtd.service install-init-systemd: install-sysconfig libvirtd.service diff --git a/src/Makefile.am b/src/Makefile.am index 57e163f..8f77658 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-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 @@ -2220,7 +2220,7 @@ EXTRA_DIST += \ if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system BUILT_SOURCES += virtlockd.service virtlockd.socket DISTCLEANFILES += virtlockd.service virtlockd.socket diff --git a/tools/Makefile.am b/tools/Makefile.am index 256a8f3..6847f13 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2005-2013 Red Hat, Inc. +## Copyright (C) 2005-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 @@ -306,7 +306,7 @@ libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh EXTRA_DIST += libvirt-guests.service.in -SYSTEMD_UNIT_DIR = /lib/systemd/system +SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system if LIBVIRT_INIT_SCRIPT_SYSTEMD install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh -- 1.8.4.2

2 1