- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: fix net-dhcp-leases no output in quiet mode
by Luyao Huang 06 Nov '14

06 Nov '14

When run net-dhcp-leases in quiet mode, cannot get any output. # virsh -q net-dhcp-leases default Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-network.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 4610a34..8f9fbd3 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1377,10 +1377,10 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) ignore_value(virAsprintf(&cidr_format, "%s/%d", lease->ipaddr, lease->prefix)); - vshPrintExtra(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n", - expirytime, EMPTYSTR(lease->mac), - EMPTYSTR(typestr), cidr_format, - EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); + vshPrint(ctl, " %-20s %-18s %-9s %-25s %-15s %s\n", + expirytime, EMPTYSTR(lease->mac), + EMPTYSTR(typestr), cidr_format, + EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); VIR_FREE(cidr_format); } -- 1.8.3.1

2 1

[libvirt] [PATCH 0/5] Allow time sync on domain resume
by Michal Privoznik 06 Nov '14

06 Nov '14

*** BLURB HERE *** Michal Privoznik (5): Introduce virDomainResumeFlags API Implement virDomainResumeFlags in all drivers qemu: Split qemuDomainSetTime into two functions qemuDomainResumeFlags: Introduce VIR_DOMAIN_RESUME_SYNC_TIME virsh: Implement virDomainResumeFlags include/libvirt/libvirt-domain.h | 6 +++ src/driver-hypervisor.h | 5 ++ src/esx/esx_driver.c | 14 +++++- src/hyperv/hyperv_driver.c | 14 +++++- src/libvirt-domain.c | 44 ++++++++++++++++ src/libvirt_public.syms | 5 ++ src/libxl/libxl_driver.c | 14 +++++- src/lxc/lxc_driver.c | 15 +++++- src/openvz/openvz_driver.c | 13 ++++- src/parallels/parallels_driver.c | 11 +++- src/phyp/phyp_driver.c | 12 ++++- src/qemu/qemu_driver.c | 106 ++++++++++++++++++++++++++------------- src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++- src/remote_protocol-structs | 5 ++ src/test/test_driver.c | 13 ++++- src/vbox/vbox_common.c | 11 +++- src/vmware/vmware_driver.c | 12 ++++- src/xen/xen_driver.c | 14 +++++- src/xenapi/xenapi_driver.c | 21 +++++++- tools/virsh-domain.c | 13 ++++- tools/virsh.pod | 10 ++-- 22 files changed, 316 insertions(+), 56 deletions(-) -- 2.0.4

3 12

[libvirt] [PATCH] Free job statistics from the migration cookie
by Ján Tomko 06 Nov '14

06 Nov '14

==404== 232 bytes in 1 blocks are definitely lost in loss record 669 of 758 ==404== at 0x4C2B934: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==404== by 0x52A2BF3: virAlloc (viralloc.c:144) ==404== by 0x1D49AD70: qemuMigrationCookieAddStatistics (qemu_migration.c:554) ==404== by 0x1D49AD70: qemuMigrationBakeCookie (qemu_migration.c:1228) ==404== by 0x1D4A43B8: qemuMigrationFinish (qemu_migration.c:5002) ==404== by 0x1D4C9339: qemuDomainMigrateFinish3Params (qemu_driver.c:11526) Introduced by commit 5d6fb96 --- src/qemu/qemu_migration.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 94a4cf6..c797206 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -219,6 +219,7 @@ static void qemuMigrationCookieFree(qemuMigrationCookiePtr mig) VIR_FREE(mig->lockState); VIR_FREE(mig->lockDriver); VIR_FREE(mig->nbd); + VIR_FREE(mig->jobInfo); VIR_FREE(mig); } -- 2.0.4

2 1

[libvirt] [python PATCH] Check return value of libvirt_uintUnwrap
by Jiri Denemark 06 Nov '14

06 Nov '14

libvirt_virDomainSendKey didn't check whether libvirt_uintUnwrap succeeded or not. https://bugzilla.redhat.com/show_bug.cgi?id=1161039 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- Providing extra context for easier review... libvirt-override.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libvirt-override.c b/libvirt-override.c index a53b46f..f496c6e 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7119,47 +7119,48 @@ static PyObject * libvirt_virDomainSendKey(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; virDomainPtr domain; PyObject *pyobj_domain; PyObject *pyobj_list; int codeset; int holdtime; unsigned int flags; int ret; size_t i; unsigned int keycodes[VIR_DOMAIN_SEND_KEY_MAX_KEYS]; unsigned int nkeycodes; if (!PyArg_ParseTuple(args, (char *)"OiiOiI:virDomainSendKey", &pyobj_domain, &codeset, &holdtime, &pyobj_list, &nkeycodes, &flags)) { DEBUG("%s failed to parse tuple\n", __FUNCTION__); return VIR_PY_INT_FAIL; } domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); if (!PyList_Check(pyobj_list)) { return VIR_PY_INT_FAIL; } if (nkeycodes != PyList_Size(pyobj_list) || nkeycodes > VIR_DOMAIN_SEND_KEY_MAX_KEYS) { return VIR_PY_INT_FAIL; } for (i = 0; i < nkeycodes; i++) { - libvirt_uintUnwrap(PyList_GetItem(pyobj_list, i), &(keycodes[i])); + if (libvirt_uintUnwrap(PyList_GetItem(pyobj_list, i), &keycodes[i]) < 0) + return VIR_PY_INT_FAIL; } LIBVIRT_BEGIN_ALLOW_THREADS; ret = virDomainSendKey(domain, codeset, holdtime, keycodes, nkeycodes, flags); LIBVIRT_END_ALLOW_THREADS; DEBUG("virDomainSendKey ret=%d\n", ret); py_retval = libvirt_intWrap(ret); return py_retval; } #if LIBVIR_CHECK_VERSION(1, 0, 3) -- 2.1.3

3 4

[libvirt] [PATCH] Fix build-time pkg-config files in VPATH
by Jiri Denemark 06 Nov '14

06 Nov '14

Since libvirt.h was split into several files, it is impossible to compile anything against a VPATH-built libvirt. In VPATH, only libvirt.h is in build/include/libvirt while all other libvirt-*.h files are in source/include/libvirt. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/libvirt-lxc.pc.in | 3 ++- src/libvirt-qemu.pc.in | 3 ++- src/libvirt.pc.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libvirt-lxc.pc.in b/src/libvirt-lxc.pc.in index dd04950..b9e1319 100644 --- a/src/libvirt-lxc.pc.in +++ b/src/libvirt-lxc.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_lxc_api=@datadir@/docs/libvirt-lxc-api.xml @@ -15,4 +16,4 @@ Version: @VERSION@ Description: libvirt LXC library Requires: Libs: -L${libdir} -lvirt-lxc -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} diff --git a/src/libvirt-qemu.pc.in b/src/libvirt-qemu.pc.in index 5483da9..173ec5c 100644 --- a/src/libvirt-qemu.pc.in +++ b/src/libvirt-qemu.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_qemu_api=@datadir@/docs/libvirt-qemu-api.xml @@ -15,4 +16,4 @@ Version: @VERSION@ Description: libvirt QEMU library Requires: Libs: -L${libdir} -lvirt-qemu -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} diff --git a/src/libvirt.pc.in b/src/libvirt.pc.in index 548fa77..9fe2f1f 100644 --- a/src/libvirt.pc.in +++ b/src/libvirt.pc.in @@ -6,6 +6,7 @@ prefix=@abs_top_builddir@ exec_prefix=@abs_top_builddir@ libdir=@abs_top_builddir@/src/.libs includedir=@abs_top_builddir@/include +source_includedir=@abs_top_srcdir@/include datarootdir=@abs_top_srcdir@ libvirt_api=@datadir@/docs/libvirt-api.xml @@ -20,4 +21,4 @@ Version: @VERSION@ Description: libvirt library Requires: Libs: -L${libdir} -lvirt -Cflags: -I${includedir} +Cflags: -I${includedir} -I${source_includedir} -- 2.1.3

2 1

[libvirt] [PATCH] virsh: Fix types for option bandwidth in block*
by Hao Liu 06 Nov '14

06 Nov '14

Bandwidth options in blockcommit, blockcopy, blockjob and blockpull are parsed by vshCommandOptULWrap() and should be shown as a number type option. And a typo is fixed. Signed-off-by: Hao Liu <hliu(a)redhat.com> --- tools/virsh-domain.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index dfc3a8c..bd5f404 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1616,7 +1616,7 @@ static const vshCmdOptDef opts_block_commit[] = { .help = N_("fully-qualified path of disk") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "base", @@ -1834,7 +1834,7 @@ static const vshCmdOptDef opts_block_copy[] = { .help = N_("path of the copy to create") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "shallow", @@ -2190,8 +2190,8 @@ static const vshCmdOptDef opts_block_job[] = { .help = N_("implies --info; output details rather than human summary") }, {.name = "bandwidth", - .type = VSH_OT_DATA, - .help = N_("set the Bandwidth limit in MiB/s") + .type = VSH_OT_INT, + .help = N_("set the bandwidth limit in MiB/s") }, {.name = NULL} }; @@ -2349,7 +2349,7 @@ static const vshCmdOptDef opts_block_pull[] = { .help = N_("fully-qualified path of disk") }, {.name = "bandwidth", - .type = VSH_OT_DATA, + .type = VSH_OT_INT, .help = N_("bandwidth limit in MiB/s") }, {.name = "base", -- 1.8.3.1

2 1

[libvirt] [PATCH v2 0/8] Post-copy live migration support
by Cristian Klein 06 Nov '14

06 Nov '14

Qemu currently implements pre-copy live migration. VM memory pages are first copied from the source hypervisor to the destination, potentially multiple times as pages get dirtied during transfer, then VCPU state is migrated. Unfortunately, if the VM dirties memory faster than the network bandwidth, then pre-copy cannot finish. `virsh` currently includes an option to suspend a VM after a timeout, so that migration may finish, but at the expense of downtime. A future version of qemu will implement post-copy live migration. The VCPU state is first migrated to the destination hypervisor, then memory pages are pulled from the source hypervisor. Post-copy has the potential to do migration with zero-downtime, despite the VM dirtying pages fast, with minimum performance impact. On the other hand, one post-copy is in progress, any network failure would render the VM unusable, as its memory is partitioned between the source and destination hypervisor. Therefore, post-copy should only be used when necessary. Post-copy migration in qemu will work as follows: (1) The `x-postcopy-ram` migration capability needs to be set. (2) Migration is started. (3) When the user decides so, post-copy migration is activated by sending the `migrate-start-postcopy` command. Qemu acknowledges by setting migration status to `postcopy-active`. v2: - Fixed formatting - Set target version to libvirt 1.2.10 - Only use JSON monitor - Renamed `qemuMigrateStartPostCopy` to `qemuDomainMigrateStartPostCopy` - Added parameter `flags` to domainMigrateStartPostCopy (currently unused) - Misc fixes required for `make check` - Stop perform phase, when post-copy starts - Wait for post-copy completion in confirm phase, before killing source VM Implementation note: `qemuMigrationWaitForCompletion` is overloaded. When called the first time it waits for post-copy to start, when called the second time it waits for post-copy to complete. I did so to reduce code duplication, but am not sure this is the best solution. Cristian Klein (8): Added public API to enable post-copy migration Added public API to start post-copy migration Added low-level API to qemu post-copy migration Implemented VIR_MIGRATE_POSTCOPY in qemu driver Added job type VIR_DOMAIN_JOB_PHASE1_COMPLETED Implemented post-copy migration logic in qemu Implement virDomainMigrateStartPostCopy in qemu virsh: add postcopy-after option to migrate command include/libvirt/libvirt.h.in | 5 +++ src/driver.h | 5 +++ src/libvirt.c | 46 ++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 58 ++++++++++++++++++++++++++++++ src/qemu/qemu_migration.c | 85 ++++++++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 24 +++++++++++-- src/qemu/qemu_monitor.h | 4 +++ src/qemu/qemu_monitor_json.c | 23 +++++++++++- src/qemu/qemu_monitor_json.h | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++++- src/remote_protocol-structs | 5 +++ tools/virsh-domain.c | 75 ++++++++++++++++++++++++++++++++++++-- tools/virsh.pod | 5 +++ 16 files changed, 347 insertions(+), 11 deletions(-) -- 1.9.1

6 29

[libvirt] [PATCH] CVE-2014-7823: dumpxml: security hole with migratable flag
by Eric Blake 06 Nov '14

06 Nov '14

Commit 28f8dfd (v1.0.0) introduced a security hole: in at least the qemu implementation of virDomainGetXMLDesc, the use of the flag VIR_DOMAIN_XML_MIGRATABLE (which is usable from a read-only connection) triggers the implicit use of VIR_DOMAIN_XML_SECURE prior to calling qemuDomainFormatXML. However, the use of VIR_DOMAIN_XML_SECURE is supposed to be restricted to read-write clients only. This patch treats the migratable flag as requiring the same permissions, rather than analyzing what might break if migratable xml no longer includes secret information. Fortunately, the information leak is low-risk: all that is gated by the VIR_DOMAIN_XML_SECURE flag is the VNC connection password; but VNC passwords are already weak (FIPS forbids their use, and on a non-FIPS machine, anyone stupid enough to trust a max-8-byte password sent in plaintext over the network deserves what they get). SPICE offers better security than VNC, and all other secrets are properly protected by use of virSecret associations rather than direct output in domain XML. * src/remote/remote_protocol.x (REMOTE_PROC_DOMAIN_GET_XML_DESC): Tighten rules on use of migratable flag. * src/libvirt-domain.c (virDomainGetXMLDesc): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The libvirt-security list agreed that this did not need an embargo because it is low-risk; but I'm on the road this week, so while this patch for master can go in now, I won't complete the backport to all the affected stable branches (everything since v1.0.0) or do the Libvirt Security Notice writeup until Monday. src/libvirt-domain.c | 3 ++- src/remote/remote_protocol.x | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7dc3146..2b0defc 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -2607,7 +2607,8 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virCheckDomainReturn(domain, NULL); conn = domain->conn; - if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { + if ((conn->flags & VIR_CONNECT_RO) && + (flags & (VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_MIGRATABLE))) { virReportError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainGetXMLDesc with secure flag")); goto error; diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index db12cda..ebf4530 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3255,6 +3255,7 @@ enum remote_procedure { * @generate: both * @acl: domain:read * @acl: domain:read_secure:VIR_DOMAIN_XML_SECURE + * @acl: domain:read_secure:VIR_DOMAIN_XML_MIGRATABLE */ REMOTE_PROC_DOMAIN_GET_XML_DESC = 14, -- 1.9.3

1 1

[libvirt] [PATCH 0/3] Fix build without NUMA
by Michal Privoznik 06 Nov '14

06 Nov '14

Even though these patches would qualify as build breaker fixes, I don't think they are that critical to be pushed without somebody else's taking a look on them. Michal Privoznik (3): virnuma: Add some more comments private.syms: Export virDomainNumatuneSpecifiedMaxNode qemuxml2argvmock: Mock virNumaNodesetIsAvailable src/libvirt_private.syms | 1 + src/util/virnuma.c | 14 +++++++------- tests/qemuxml2argvmock.c | 9 +++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) -- 2.0.4

3 7

[libvirt] [PATCH 0/3] Libvirt memory & NUMA fixes
by Prerna Saxena 05 Nov '14

05 Nov '14

This patch set addresses a bunch of memory & NUMA fixes. Series Description: =========== Patch 1/3 : Use consistent data type to represent memory elements in various XML attributes. This ensures all memory elements are always represented as 'unsigned long long'. Patch 2/3 : This adds a 'unit' attribute alongwith the 'memory' attribute of a NUMA cell. This enables users to easily describe how much memory needs to be allocated to each NUMA cell for a guest domain. Patch 3/3 : This augments test cases to add the 'unit' tag. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 7

[libvirt] [PATCHv2 0/2] network: bandwidth tuning in session mode revert patch
by Erik Skultety 05 Nov '14

05 Nov '14

Erik Skultety (2): qemu: revert patch - bandwidth tuning in session mode Iface: disallow network tuning in session mode globally src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_driver.c | 9 --------- src/util/virnetdevbandwidth.c | 8 ++++++++ tests/Makefile.am | 11 ++++++++++- tests/virnetdevbandwidthtest.c | 14 +++++++++++++- 5 files changed, 31 insertions(+), 22 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] UpdateDevice: Allow startupPolicy update
by Michal Privoznik 05 Nov '14

05 Nov '14

Users might want to update startupPolicy via the virDomainUpdateDeviceFlags API too. This patch implements the feature on config layer. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6acaea8..6fc15c0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7437,6 +7437,7 @@ qemuDomainUpdateDeviceConfig(virQEMUCapsPtr qemuCaps, if (disk->src->format) orig->src->format = disk->src->format; disk->src->path = NULL; + orig->startupPolicy = disk->startupPolicy; break; case VIR_DOMAIN_DEVICE_NET: -- 2.0.4

2 2

[libvirt] Local qemu migration
by Marc-André Lureau 05 Nov '14

05 Nov '14

Hi, Attempting to migration from session to system qemu fails because of the following checks in qemuMigrationCookieXMLParse(): if (STREQ(mig->remoteHostname, mig->localHostname)) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempt to migrate guest to the same host %s"), mig->remoteHostname); goto error; } .... if (memcmp(mig->remoteHostuuid, mig->localHostuuid, VIR_UUID_BUFLEN) == 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Attempt to migrate guest to the same host %s"), tmp); goto error; Is there a technical limitation for this error? If not, could it be overriden with an additional flag? cheers -- Marc-André Lureau

4 6

[libvirt] [PATCH] remote: Fix memory leak in remoteConnectGetAllDomainStats
by Peter Krempa 05 Nov '14

05 Nov '14

The remote call actually doesn't free the arguments array so we leak memory in case a domain list is specified. As the remote domain list array consists only of stolen pointers from the actual domain objects it's sufficient just to free the array. Valgrind message: ==1081452== 64 bytes in 1 blocks are definitely lost in loss record 632 of 726 ==1081452== at 0x4C296D0: calloc (vg_replace_malloc.c:618) ==1081452== by 0x4EA5CB4: virAllocN (viralloc.c:191) ==1081452== by 0x505D21E: remoteConnectGetAllDomainStats (remote_driver.c:7785) ==1081452== by 0x50081AA: virDomainListGetStats (libvirt-domain.c:11080) ==1081452== by 0x155249: cmdDomstats (virsh-domain-monitor.c:2147) ==1081452== by 0x12FB73: vshCommandRun (virsh.c:1935) ==1081452== by 0x133FEB: main (virsh.c:3719) --- src/remote/remote_driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 65c04d9..d111e10 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7846,6 +7846,7 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, VIR_FREE(elem); } virDomainStatsRecordListFree(tmpret); + VIR_FREE(args.doms.doms_val); xdr_free((xdrproc_t)xdr_remote_connect_get_all_domain_stats_ret, (char *) &ret); -- 2.1.0

2 1

[libvirt] [sandbox PATCH 0/2] v1.1 bugfix: support dhcp network interfaces
by Gene Czarcinski 05 Nov '14

05 Nov '14

Resubmitted to add "sandbox PATCH" to Subject v1.1 adds some documentation changes. Support for a network such as -N dhcp,source=default was not working in that dhclient was not being started. Although I am not sure what the real problem is, the solution is to use g_spawn_sync() instead of g_spawn_async() to start /sbin/dhclient. The second patch addes "-v" to the dhclient arguments to improve debugging info. The dhclient into will be in /var/log/messages the Secure Contrainer host system and not in the container itself. Gene Czarcinski (2): v1.1 for dhclient use g_spawn_sync() v1.1 add -v to dhclient parameter arguments libvirt-sandbox/libvirt-sandbox-init-common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 1.9.3

2 3

[libvirt] [libvirt-sandbox][PATCH 0/4] Couple of fixes to compile again
by Michal Privoznik 05 Nov '14

05 Nov '14

It's been a while that I tried to build libvirt-sandbox. And guess what, it doesn't compile cleanly so here are some patches to fix the issues I met. Michal Privoznik (4): virt-selinux.m4: Define SELINUX variables Makefile: link SELINUX into libvirt-sandbox-1.0.so m4: sync macros with libvirt libvirt-sandbox-config.c: Fix comment libvirt-sandbox/Makefile.am | 4 +- libvirt-sandbox/libvirt-sandbox-config.c | 2 +- m4/manywarnings.m4 | 217 ++++++++++++++++++++----------- m4/virt-compile-warnings.m4 | 216 ++++++++++++++++++++++-------- m4/virt-selinux.m4 | 6 +- m4/warnings.m4 | 82 +++++++++--- 6 files changed, 369 insertions(+), 158 deletions(-) -- 2.0.4

2 6

[libvirt] [PATCH] Require at least one console for LXC domain
by Ján Tomko 05 Nov '14

05 Nov '14

A domain without a console quietly dies soon after start, because we try to set /dev/null as a controlling TTY 2014-10-30 15:10:59.705+0000: 1: error : lxcContainerSetupFDs:283 : ioctl(TIOCSTTY) failed: Inappropriate ioctl for device Report an error early instead of trying to start it. https://bugzilla.redhat.com/show_bug.cgi?id=1155410 --- src/lxc/lxc_container.c | 6 ++++-- src/lxc/lxc_process.c | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f02b959..8aba3ba 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2093,8 +2093,10 @@ static int lxcContainerChild(void *data) if (virAsprintf(&ttyPath, "%s/%s.devpts/%s", LXC_STATE_DIR, vmDef->name, tty) < 0) goto cleanup; - } else if (VIR_STRDUP(ttyPath, "/dev/null") < 0) { - goto cleanup; + } else { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("At least one tty is required")); + goto cleanup; } VIR_DEBUG("Container TTY path: %s", ttyPath); diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index ed30c37..6c83fdb 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1144,6 +1144,12 @@ int virLXCProcessStart(virConnectPtr conn, vm->def, NULL) < 0) goto cleanup; + if (vm->def->nconsoles == 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("At least one PTY console is required")); + goto cleanup; + } + for (i = 0; i < vm->def->nconsoles; i++) { char *ttyPath; if (vm->def->consoles[i]->source.type != VIR_DOMAIN_CHR_TYPE_PTY) { -- 2.0.4

3 5

[libvirt] [v5][Patch 0/4] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 05 Nov '14

05 Nov '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. In this iteration, I have followed Dan's suggestion on using existing cpu mode format to describe powerPC compatibility mode. Hope this can finally make it for 1.2.10 ! Series Summary: ========== Patch 1/4 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/4 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/4 : Improve PVR handling to fall back to cpu generation. Patch 4/4 : Add documentation describing compat mode usage for PowerPC guests. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. Existing xml semantics of 'host-model' are interpreted differently on PowerPc architecture to signify this type. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. * Patch 4 : Documentation is added to explain functionality introduced by Patch 2. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html v3 : http://www.mail-archive.com/libvir-list@redhat.com/msg104010.html v4: http://www.mail-archive.com/libvir-list@redhat.com/msg104067.html Changes since v4: ================ * Patches 1,3 already ack'ed by Michal, and have been posted unchanged. * In Patch 2,Discarded fallback=compat, and implemented Dan's suggestion to overload cpu mode "host-model". Now, on PowerPc, a VM with this XML schema will automatically be a compat-mode VM: <cpu mode='host-model'> <model>power7</model> </cpu> * Introduced a new patch '4' to add documentation that explains this. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 9

[libvirt] Release of libvirt-python-1.2.10
by Daniel Veillard 05 Nov '14

05 Nov '14

I also tagged and pushed a new version of libvirt-python, it is available at: ftp://libvirt.org/libvirt/python it handle the new header split in libvirt-1.2.10 and fixes a number of issues: Documentation: d Change the comment in getPyNodeCPUCount method reflecting correct called methods (Pradipta Kr. Banerjee) Bug Fixes: b virDomainBlockCopy: initialize flags to 0 (Pavel Hrdina) b flags cannot get right value for blockCopy function (Pavel Hrdina) b Fix rest of unsigned integer handling (Peter Krempa) b Fix parsing of 'flags' argument for bulk stats functions (Luyao Huang) b Fix function name when parsing arguments in libvirt_virNodeAllocPages (Peter Krempa) Improvements: i fix libvirt headers list (Dmitry Guryanov) i Improve error output when use getTime with a nonzero flags. (Luyao Huang) i setup.py: fix rpm build to return 1 on error (Pavel Hrdina) i sanitytest: define long for python version >= 3 (Martin Kletzander) i sanitytest: count with the fact that large enums can be long (Martin Kletzander) i sanitytest: check for exported enums (Martin Kletzander) Thanks everybody who contributed to this release ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH] domain: Improve error output for virDomainListGetStats
by Luyao Huang 04 Nov '14

04 Nov '14

When pass flags --domain and --list-* to cmdDomstats, a unsupport error will output from qemuConnectGetAllDomainStats. error: unsupported flags (0x1) in function qemuConnectGetAllDomainStats >From manual of virsh: The approaches can't be combined. Improve error to: error: --domain and --list-* flags are mutually exclusive Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/libvirt-domain.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 7dc3146..6ae6dd2 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11053,6 +11053,19 @@ virDomainListGetStats(virDomainPtr *doms, goto cleanup; } + if (flags & (VIR_CONNECT_LIST_DOMAINS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_INACTIVE | + VIR_CONNECT_LIST_DOMAINS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_TRANSIENT | + VIR_CONNECT_LIST_DOMAINS_RUNNING | + VIR_CONNECT_LIST_DOMAINS_SHUTOFF | + VIR_CONNECT_LIST_DOMAINS_PAUSED | + VIR_CONNECT_LIST_DOMAINS_OTHER)) { + virReportInvalidArg(flags, "%s", + _("--domain and --list-* flags are mutually exclusive")); + goto cleanup; + } + conn = doms[0]->conn; virCheckConnectReturn(conn, -1); -- 1.8.3.1

3 4

[libvirt] [v2 PATCH] qemu: Improve error output for virDomainListGetStats
by Luyao Huang 04 Nov '14

04 Nov '14

A unsupport error will output from qemuConnectGetAllDomainStats. Add a check for the flags in qemuConnectGetAllDomainStats and improve the error in the current implementation.From manual of virsh: The approaches can't be combined. Improve error to: error: --domain and --list-* flags are mutually exclusive Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6acaea8..60c3882 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18487,13 +18487,18 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, unsigned int privflags = 0; unsigned int domflags = 0; - if (ndoms) - virCheckFlags(VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); - else - virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | - VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | - VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | - VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); + if (ndoms && (flags & (VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE))) { + virReportInvalidArg(flags, "%s", + _("--domain and --list-* flags are mutually exclusive")); + return -1; + } + + virCheckFlags(VIR_CONNECT_LIST_DOMAINS_FILTERS_ACTIVE | + VIR_CONNECT_LIST_DOMAINS_FILTERS_PERSISTENT | + VIR_CONNECT_LIST_DOMAINS_FILTERS_STATE | + VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, -1); if (virConnectGetAllDomainStatsEnsureACL(conn) < 0) return -1; -- 1.8.3.1

1 0

[libvirt] internal error: Cannot find suitable CPU model for given data
by Matias Kreder 04 Nov '14

04 Nov '14

Hello, I am having troubles with libvirt on Fedora 21 alpha. On virt-manager: Unable to complete install: 'internal error: Cannot find suitable CPU model for given data' Traceback (most recent call last): File "/usr/share/virt-manager/virtManager/asyncjob.py", line 89, in cb_wrapper callback(asyncjob, *args, **kwargs) File "/usr/share/virt-manager/virtManager/create.py", line 1854, in do_install guest.start_install(meter=meter) File "/usr/share/virt-manager/virtinst/guest.py", line 411, in start_install noboot) File "/usr/share/virt-manager/virtinst/guest.py", line 475, in _create_guest dom = self.conn.createLinux(start_xml or final_xml, 0) File "/usr/lib64/python2.7/site-packages/libvirt.py", line 3361, in createLinux if ret is None:raise libvirtError('virDomainCreateLinux() failed', conn=self) libvirtError: internal error: Cannot find suitable CPU model for given data On "systemctl status libvirtd" I can see: Nov 04 10:23:41 lappie.mkeder.com libvirtd[3822]: Preferred CPU model Westmere not allowed by hypervisor; closest supported model will be used Nov 04 10:23:41 lappie.mkeder.com libvirtd[3822]: internal error: Cannot find suitable CPU model for given data I can't create the VM using any CPU configuration on virt-manager. Intel VT is enabled on the BIOS. This is a Lenovo Thinkpad t410 that I got yesterday. CPU is Intel(R) Core(TM) i5 CPU M 520 [root@lappie matias]# virsh -r capabilities | grep model <model>Westmere</model> I haven't tried Fedora 20 on it but I might re-install it soon. Just wanted to give my feedback for Fedora 21. [root@lappie matias]# rpm -q libvirt-daemon libvirt-daemon-1.2.9-4.fc21.x86_64 [root@lappie matias]# rpm -q virt-manager virt-manager-1.1.0-3.git310f6527.fc21.noarch Doing a google search it seems that some people had the same problem a few months ago and they solved but by updating. Seems to be some sort of problem between libvirt and qemu-kvm. Regards Matias

1 0

[libvirt] [PATCH] qemu: fix up NBD Server can not be stopped properly
by weiwei li 04 Nov '14

04 Nov '14

In qemuMigrationFinish mig->nbd can not be initialized by qemuMigrationEatCookie without a flag QEMU_MIGRATION_COOKIE_NBD. That cause qemuMigrationStopNBDServer return and the NBD server can not be stopped properly. Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/qemu/qemu_migration.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 13239eb..9cb2a06 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4822,7 +4822,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, VIR_FREE(priv->job.completed); cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | - QEMU_MIGRATION_COOKIE_STATS; + QEMU_MIGRATION_COOKIE_STATS | + QEMU_MIGRATION_COOKIE_NBD; if (flags & VIR_MIGRATE_PERSIST_DEST) cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; -- 1.7.1

2 1

[libvirt] [PATCH] util: fix releasing pidfile in cleanup
by Martin Kletzander 04 Nov '14

04 Nov '14

Coverity found out the very obvious problem in the code. That is that virPidFileReleasePath() was called only if virPidFileAcquirePath() returned 0. But virPidFileAcquirePath() doesn't return only 0 on success, but the FD that needs to be closed. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/util/virpidfile.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 098458f..a77a326 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -592,9 +592,8 @@ virPidFileForceCleanupPath(const char *path) if (virPidFileReadPath(path, &pid) < 0) return -1; - if (virPidFileAcquirePath(path, false, 0) == 0) { - virPidFileReleasePath(path, fd); - } else { + fd = virPidFileAcquirePath(path, false, 0); + if (fd < 0) { virResetLastError(); /* Only kill the process if the pid is valid one. 0 means @@ -607,5 +606,8 @@ virPidFileForceCleanupPath(const char *path) return -1; } + if (fd) + virPidFileReleasePath(path, fd); + return 0; } -- 2.1.3

2 1

[libvirt] [PATCH v5 0/3] add nodeset check in numatune
by Chen Fan 04 Nov '14

04 Nov '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): bitmap: add virBitmapLastSetBit for finding the last bit position of bitmap numatune: add check for numatune nodeset range virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy src/conf/numatune_conf.c | 28 ++++++++++++ src/conf/numatune_conf.h | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 4 ++ src/util/virbitmap.c | 45 ++++++++++++++++++ src/util/virbitmap.h | 3 ++ src/util/virnuma.c | 53 +++++++++++++++++----- src/util/virnuma.h | 1 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 35 ++++++++++++++ tests/qemuxml2argvmock.c | 9 ++++ tests/qemuxml2argvtest.c | 2 + tests/virbitmaptest.c | 13 +++++- 12 files changed, 184 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

2 4

[libvirt] [PATCH v4 0/3] add nodeset check in numatune
by Chen Fan 04 Nov '14

04 Nov '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): bitmap: add virBitmapLastSetBit for finding the last bit position of bitmap numatune: add check for numatune nodeset range virnuma: use virNumaNodesetIsAvailable checking nodeset in virNumaSetupMemoryPolicy src/conf/numatune_conf.c | 28 ++++++++++ src/conf/numatune_conf.h | 1 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 4 ++ src/util/virbitmap.c | 45 ++++++++++++++++ src/util/virbitmap.h | 3 ++ src/util/virnuma.c | 61 +++++++++++++++------- src/util/virnuma.h | 1 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 36 +++++++++++++ tests/qemuxml2argvmock.c | 9 ++++ tests/qemuxml2argvtest.c | 1 + tests/virbitmaptest.c | 13 ++++- 12 files changed, 184 insertions(+), 20 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

3 13

[libvirt] [PATCH 2/2] qemu: migration: Ignore null ptr in qemuMigrationStopNBDServer
by weiwei li 04 Nov '14

04 Nov '14

qemuMigrationCookiePtr mig->nbd may be null when MigrationCookie do not have nbd information ,but nbd port did allocated before and must be released here, so ignore mig->nbd null ptr and just warn. Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> --- src/qemu/qemu_migration.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0ad8054..134b041 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1584,7 +1584,7 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver, qemuDomainObjPrivatePtr priv = vm->privateData; if (!mig->nbd) - return; + VIR_WARN("mig->nbd is null"); if (qemuDomainObjEnterMonitorAsync(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < 0) -- 1.7.1

2 4

[libvirt] [PATCH] vbox: Prevent from registering storage driver with NULL
by Taowei Luo 03 Nov '14

03 Nov '14

Since 5892944fc853 the virRegisterStorageDriver may be called with a NULL storageDriver if it failed on vboxGetStorageDriver. So make sure the storageDriver is not NULL before register. --- src/vbox/vbox_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index c64d2d6..b2e35e9 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -74,7 +74,7 @@ int vboxStorageRegister(void) if (VBoxCGlueInit(&uVersion) == 0) storageDriver = vboxGetStorageDriver(uVersion); - if (virRegisterStorageDriver(storageDriver) < 0) + if (storageDriver && virRegisterStorageDriver(storageDriver) < 0) return -1; return 0; } -- 1.7.9.5

2 1

[libvirt] [PATCH] examples: add systemtap script to ease lock debugging
by Martin Kletzander 03 Nov '14

03 Nov '14

As discussed before, this simple script should help with debugging deadlocks, although there are still some caveats. RWLocks are not handled by this and if your deadlock if very racy, it may not lock up when running with this script due to the slowdown. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- examples/systemtap/lock-debug.stp | 118 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 examples/systemtap/lock-debug.stp diff --git a/examples/systemtap/lock-debug.stp b/examples/systemtap/lock-debug.stp new file mode 100644 index 0000000..8f06340 --- /dev/null +++ b/examples/systemtap/lock-debug.stp @@ -0,0 +1,118 @@ +#!/usr/bin/stap --ldd -d /usr/sbin/libvirtd -c libvirtd +# +# Usage with installed libvirt daemon: +# stap --ldd -d /usr/sbin/libvirtd -c libvirtd \ +# lock-debug.stp /usr/lib/libvirt.so +# +# If made executable; simple './lock-debug.stp' should work too. +# +# TODOs: +# +# Document usage with uninstalled daemon and libs. Assuming CWD is toplevel +# source git directory, it should be only slight modification to the following: +# +# ./run stap --ldd -c daemon/libvirtd -d daemon/libvirtd +# examples/systemtap/lock-debug.stp src/.libs/libvirt.so +# +# Debug RWLock mechanisms as well. +# +# Author: Martin Kletzander <mkletzan(a)redhat.com> + + +global mx_tolock +global mx_locked + + +function filter() +{ + if (pid() != target()) + return 1 + + return 0 +} + +probe library = process( %( $# > 0 %? @1 %: "/usr/lib/libvirt.so" %) ) +{ + if (filter()) next +} + +probe lock = library.function("virMutexLock") +{ + lockname = usymdata($m) +} + +probe unlock = library.function("virMutexUnlock") +{ + lockname = usymdata($m) +} + +probe begin +{ + %( $# > 1 %? println("error: Too many parameters"); exit(); + %: print("Started, press ^C when the proccess hangs\n"); %) +} + +probe lock.call +{ + mx_tolock[lockname, tid()] = sprint_usyms(ubacktrace()) +} + +probe lock.return +{ + if ([lockname, tid()] in mx_tolock) { + mx_locked[lockname, tid()] = mx_tolock[lockname, tid()] + delete mx_tolock[lockname, tid()] + } else { + printf("internal error: lock acquired unwillingly?\n") + } +} + +probe unlock.call +{ + found = 0 + + foreach ([lock, tid] in mx_locked) { + if (lock != lockname) + continue + if (tid != tid()) { + printf("Warning: lock released on different thread that locked it.\n") + printf("Lock trace:\n%s\n", mx_locked[lock, tid]) + printf("Unlock trace:\n%s\n", sprint_usyms(ubacktrace())) + } + + found = tid + break + } + + if (found && [lockname, found] in mx_locked) + delete mx_locked[lockname, found] +} + +probe end +{ + tmp = 0 + + printf("\n=============\n") + + foreach (bt1 = [lock1, tid1] in mx_tolock) { + deadlock = 0 + + foreach (bt2 = [lock2, tid2] in mx_tolock) { + if (lock1 == lock2) { + if (!tmp++) + printf("The following locks cannot be acquired:\n") + + if (!deadlock++) + printf("Lock %s was locked in thread %d with this trace:\n%s\n", + lock1, tid1, bt1) + + printf("and is waiting to be locked by thread %d here:\n%s\n", + tid2, bt2) + } + } + if (deadlock) + printf("---\n") + } + if (!tmp) + printf("No deadlocks found, sorry.\n") +} -- 2.1.2

2 1

[libvirt] NBD TLS support in QEMU
by Stefan Hajnoczi 03 Nov '14

03 Nov '14

Hi, QEMU offers both NBD client and server functionality. The NBD protocol runs unencrypted, which is a problem when the client and server communicate over an untrusted network. The particular use case that prompted this mail is storage migration in OpenStack. The goal is to encrypt the NBD connection between source and destination hosts during storage migration. I think we can integrate TLS into the NBD protocol as an optional flag. A quick web search does not reveal existing open source SSL/TLS NBD implementations. I do see a VMware NBDSSL protocol but there is no specification so I guess it is proprietary. The NBD protocol starts with a negotiation phase. This would be the appropriate place to indicate that TLS will be used. After client and server complete TLS setup the connection can continue as normal. Besides QEMU, the userspace NBD tools (http://nbd.sf.net/) can also be extended to support TLS. In this case the kernel needs a localhost socket and userspace handles TLS. Thoughts? Stefan

14 44

[libvirt] [PATCH] mingw: fix build failure
by Pavel Hrdina 03 Nov '14

03 Nov '14

This macro seems to be defined only on linux/unix and it fails during mingw build. Its value is '16' (taken from net/if.h) so define it if it's not defined. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- For now just define it for mingw but we should review all daemon related code and not build it for mingw at all to save is those kind of failures. src/util/virnetdev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6da3371..3831009 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -52,6 +52,10 @@ # include <net/if_dl.h> #endue +#offender's IFNAMSIZ +# define IFNAMSIZ 16 +#endif + #define VIR_FROM_THIS VIR_FROM_NONE VIR_LOG_INIT("util.netdev"); -- 2.0.4

3 3

[libvirt] [PATCH v2 0/2] qemu: avoid rare race when undefining domain
by Martin Kletzander 03 Nov '14

03 Nov '14

This is a v2 of: https://www.redhat.com/archives/libvir-list/2014-October/msg01052.html This time it's going to be fixed in QEMU only, using a job and hack around virDomainObjListRemove(). Also, in this version, the error message will use UUID instead of the domain name, because it gets reported in different API, but it still makes sense, fortunately. Martin Kletzander (2): DO NOT APPLY UPSTREAM: Reproducer helper qemu: avoid rare race when undefining domain src/conf/domain_conf.c | 3 +++ src/qemu/qemu_domain.c | 9 +++++++++ 2 files changed, 12 insertions(+) -- 2.1.2

2 4

[libvirt] [PATCH] vbox: remove unused code that causes build failures
by Martin Kletzander 03 Nov '14

03 Nov '14

Since 87dea4fcffb2d1b120e7841adc0e3d8ea97ed777 vboxGetDrivers() is not used for getting the vbox network driver. The only call the code does is using NULL as the @networkDriver_ret param , but the code still used vbox[0-9][0-9]NetworkDriver that didn't exist anymore. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vbox/vbox_driver.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 7d7214a..4d13fbf 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -74,10 +74,8 @@ extern virStorageDriver vbox43_4StorageDriver; #if !defined(WITH_DRIVER_MODULES) || defined(VBOX_STORAGE_DRIVER) static void vboxGetDrivers(virDriverPtr *driver_ret, - virNetworkDriverPtr *networkDriver_ret, virStorageDriverPtr *storageDriver_ret) { - virNetworkDriverPtr networkDriver; virStorageDriverPtr storageDriver; uint32_t uVersion; @@ -87,7 +85,6 @@ vboxGetDrivers(virDriverPtr *driver_ret, * if the user requests a vbox:// URI which we know will * never work */ - networkDriver = &vbox22NetworkDriver; storageDriver = &vbox22StorageDriver; /* Init the glue and get the API version. */ @@ -104,43 +101,33 @@ vboxGetDrivers(virDriverPtr *driver_ret, */ if (uVersion >= 2001052 && uVersion < 2002051) { VIR_DEBUG("VirtualBox API version: 2.2"); - networkDriver = &vbox22NetworkDriver; storageDriver = &vbox22StorageDriver; } else if (uVersion >= 2002051 && uVersion < 3000051) { VIR_DEBUG("VirtualBox API version: 3.0"); - networkDriver = &vbox30NetworkDriver; storageDriver = &vbox30StorageDriver; } else if (uVersion >= 3000051 && uVersion < 3001051) { VIR_DEBUG("VirtualBox API version: 3.1"); - networkDriver = &vbox31NetworkDriver; storageDriver = &vbox31StorageDriver; } else if (uVersion >= 3001051 && uVersion < 3002051) { VIR_DEBUG("VirtualBox API version: 3.2"); - networkDriver = &vbox32NetworkDriver; storageDriver = &vbox32StorageDriver; } else if (uVersion >= 3002051 && uVersion < 4000051) { VIR_DEBUG("VirtualBox API version: 4.0"); - networkDriver = &vbox40NetworkDriver; storageDriver = &vbox40StorageDriver; } else if (uVersion >= 4000051 && uVersion < 4001051) { VIR_DEBUG("VirtualBox API version: 4.1"); - networkDriver = &vbox41NetworkDriver; storageDriver = &vbox41StorageDriver; } else if (uVersion >= 4001051 && uVersion < 4002020) { VIR_DEBUG("VirtualBox API version: 4.2"); - networkDriver = &vbox42NetworkDriver; storageDriver = &vbox42StorageDriver; } else if (uVersion >= 4002020 && uVersion < 4002051) { VIR_DEBUG("VirtualBox API version: 4.2.20 or higher"); - networkDriver = &vbox42_20NetworkDriver; storageDriver = &vbox42_20StorageDriver; } else if (uVersion >= 4002051 && uVersion < 4003004) { VIR_DEBUG("VirtualBox API version: 4.3"); - networkDriver = &vbox43NetworkDriver; storageDriver = &vbox43StorageDriver; } else if (uVersion >= 4003004 && uVersion < 4003051) { VIR_DEBUG("VirtualBox API version: 4.3.4 or higher"); - networkDriver = &vbox43_4NetworkDriver; storageDriver = &vbox43_4StorageDriver; } else { VIR_DEBUG("Unsupported VirtualBox API version: %u", uVersion); @@ -151,8 +138,6 @@ vboxGetDrivers(virDriverPtr *driver_ret, if (driver_ret) *driver_ret = NULL; - if (networkDriver_ret) - *networkDriver_ret = networkDriver; if (storageDriver_ret) *storageDriver_ret = storageDriver; } @@ -178,7 +163,7 @@ int vboxStorageRegister(void) { virStorageDriverPtr storageDriver; - vboxGetDrivers(NULL, NULL, &storageDriver); + vboxGetDrivers(NULL, &storageDriver); if (virRegisterStorageDriver(storageDriver) < 0) return -1; -- 2.1.2

3 3

[libvirt] Release of libvirt-1.2.10
by Daniel Veillard 03 Nov '14

03 Nov '14

As planned a new release is out, just in time for the OpenStack Summit. It is tagged in git and available as signed rpms and tarballs at the usual place: ftp://libvirt.org/libvirt/ This is a slightly smaler than usual release, around 200 commits, probably due top the KVM forum last month :-) Notable improvements pushed for the vbox driver, some changes too for the libxl one, and a big refectoring of the driver internals though that should not be user visible. And as usual a large amount of bug fixes and improvements: Features: - vbox: various drivers improvements (Taowei Luo) - libxl: various drivers improvements (Stefan Bader) - Internal driver refactoring (Daniel P. Berrange) Documentation - virsh: Adjust the text in man page regarding qemu-attach (John Ferlan) - HACKING: Regenerate after recent change (Peter Krempa) - fix an improper git browsable address (Chen Hanxiao) - Mention repository locations in contributor guidelines (Martin Kletzander) - apps: Update references to virt-p2v and virt-v2v. (Richard W.M. Jones) - libvirt: Document UNDEFINE_NVRAM in UndefineFlags doc (Cole Robinson) - conf: fix a wrong comment in virSocketAddrNumericFamily() (Chen Fan) - virsh: man: Fix description of --live/--config usage (Peter Krempa) - qemu: add short document on qemu event handlers (Laine Stump) - fix a typo in drvlxc (Chen Hanxiao) Portability: - mingw: fix build failure (Pavel Hrdina) - domain: fix parsing of memory tunables on 32-bit machines (Eric Blake) - virnetdev: stub virNetDev{Add,Del}Multi on FreeBSD (Roman Bogorodskiy) - Renamed internal __mon_yday into mon_yday to avoid conflicts (Cédric Bosdonnat) - Fix build-time pkg-config files in VPATH (Jiri Denemark) - Fix build with older libcurl (Ján Tomko) - vbox: remove unused code that causes build failures (Martin Kletzander) - Makefile: Fix build without driver modules (Michal Privoznik) - build: fix build on non-Linux (Eric Blake) - qemu: monitor: Avoid shadowing variable "devname" on FreeBSD. Again. (Peter Krempa) Bug Fixes: - hotplug: fix char device detach (Pavel Hrdina) - vbox_storage: fix coverity issue with overwriting value (Pavel Hrdina) - Relax duplicate SCSI host pool checking (Ján Tomko) - qemu: Release nbd port from migrationPorts instead of remotePorts (weiwei li) - libxl: fix double-free of libxl_domain_build_info (Jim Fehlig) - Reject live update of offloading options (Ján Tomko) - conf: forbid negative values in virDomainParseScaledValue (Martin Kletzander) - virsh: Fix memory leak in cmdNetworkDHCPLeases (Luyao Huang) - virutil: fix virGetSCSIHostNumber stub return type (Roman Bogorodskiy) - virnetdev: Resolve Coverity RESOURCE_LEAK (John Ferlan) - virnetdev: Resolve Coverity FORWARD_NULL (John Ferlan) - virnetdev: Resolve Coverity DEADCODE (John Ferlan) - storage: Fix crash when parsing backing store URI with schema (Peter Krempa) - src/Makefile.am: Add forgotten backslash (Michal Privoznik) - storage_conf: Resolve libvirtd crash matching scsi_host (John Ferlan) - qemu-attach: Assign device aliases (John Ferlan) - hotplug: Check for alias in net detach (John Ferlan) - hotplug: Check for alias in chrdev detach (John Ferlan) - hotplug: Check for alias in hostdev detach (John Ferlan) - hotplug: Check for alias in disk detach (John Ferlan) - hotplug: Check for alias in controller detach (John Ferlan) - remote: fix jump depends on uninitialised value (Jincheng Miao) - qemu: forbid snapshot-delete --children-only on external snapshot (Eric Blake) - util: eliminate "use after free" in callers of virNetDevLinkDump (Laine Stump) - vbox: network: make sure driver is not NULL in virRegisterNetworkDriver (Shanzhi Yu) - hyperv: avoid query memleaks on failure (Eric Blake) - qemu: Disallow NUMA/network tuning for session mode (Erik Skultety) - qemu: restore: Fix restoring of VM when the restore hook returns empty XML (Peter Krempa) - Fix cast errors with clang (Roman Bogorodskiy) - qemu: unref cfg after TerminateMachine has been called (Martin Kletzander) - qemu: x86_64 is good enough for i686 (Lubomir Rintel) - qemu: move setting emulatorpin ahead of monitor showing up (Zhou yimin) - tests: fix incorrect caps for shmem-invalid-size, shmem-small-size (Maxime Leroy) - conf: tests: fix virDomainNetDefFormat for vhost-user in client mode (Maxime Leroy) - libxl: add missing 'break' from commit 1298daca (Jim Fehlig) - conf: fix an memory leak in virSocketAddrIsNumericLocalhost() (Chen Fan) - virsh: domain: Use global constant for XML file size limit (Peter Krempa) - Fix leftover typo '&' -> '&&' (Martin Kletzander) - qemu: save domain status after set domain's numa parameters (Shanzhi Yu) - qemu: call qemuDomainObjBeginJob/qemuDomainObjEndJob in qemuDomainSetInterfaceParameters (Shanzhi Yu) - qemu: save domain status after set the blkio parameters (Shanzhi Yu) - security_selinux: Don't relabel /dev/net/tun (Michal Privoznik) - qemu: Remove possible NULL deref in debug output (John Ferlan) - qemu: Remove need for virConnectPtr in hotunplug detach host, net (John Ferlan) - qemu: Fix hot unplug of SCSI_HOST device (John Ferlan) - util: Prepare URI formatting for libxml2 >= 2.9.2 (Martin Kletzander) - qemu: Don't compare CPU against host for TCG (Cole Robinson) - qemu: Fix updating balloon period in live XML (Erik Skultety) - qemu: Fix updating bandwidth limits in live XML (Erik Skultety) - qemu: json: Fix missing break in error reporting function (Peter Krempa) Improvements: - Match scsi_host pools by parent address first (Ján Tomko) - libxl: Support user-specified <emulator> (Jim Fehlig) - Spell TIOCSCTTY right in the error message (Ján Tomko) - Teach virt-aa-helper to use TEMPLATE.qemu if the domain is kvm or kqemu (Cédric Bosdonnat) - qemu: better error message when block job can't succeed (Eric Blake) - test: Add test to verify helpers used for backing file name parsing (Peter Krempa) - maint: add syntax check to prohibit static zero init (Eric Blake) - maint: avoid static zero init in drivers (Eric Blake) - maint: avoid static zero init in helpers (Eric Blake) - maint: avoid static zero init in tests (Eric Blake) - maint: avoid static zero init in tools (Eric Blake) - maint: avoid static zero init in core files (Eric Blake) - audit: use bool for audit log choice (Eric Blake) - virutil: Introduce virGetSCSIHostNameByParentaddr (John Ferlan) - virutil: Introduce virGetSCSIHostNumber (John Ferlan) - vbox: Rewrite vboxStorageVolGetPath (Taowei Luo) - vbox: Rewrite vboxStorageVolGetXMLDesc (Taowei Luo) - vbox: Rewrite vboxStorageVolGetInfo (Taowei Luo) - vbox: Rewrite vboxStorageVolDelete (Taowei Luo) - vbox: Make IMediumAttachment work with vbox2.2 and 3.0 (Taowei Luo) - vbox: Rewrite vboxStorageVolCreateXML (Taowei Luo) - vbox: Make CreateHardDisk support all vbox versions (Taowei Luo) - vbox: Rewrite vboxStorageVolLookupByPath (Taowei Luo) - vbox: Make FindMedium support old vbox versions (Taowei Luo) - vbox: Rewrite vboxStorageVolLookupByKey (Taowei Luo) - vbox: Rewrite vboxStorageVolLookupByName (Taowei Luo) - vbox: Rewrite vboxStoragePoolListVolumes (Taowei Luo) - vbox: Rewrite vboxStoragePoolNumOfVolumes (Taowei Luo) - vbox: Rewrite vbox-independent functions (Taowei Luo) - vbox: move common codes to vbox_common.h (Taowei Luo) - vbox: Remove VBOX_OBJECT_CHECK macro (Taowei Luo) - vbox: Fix copyright mistake (Taowei Luo) - virsh: Improve the job type reported of virsh cmd blockcommit (Shanzhi Yu) - qemu_agent: Produce more readable error messages (Michal Privoznik) - qemu: change macvtap multicast list in response to NIC_RX_FILTER_CHANGED (Tony Krowiak) - util: Functions to update host network device's multicast filter (Tony Krowiak) - tests: Add SELINUX_LIBS to fix viridentitytest linker bug (Julio Faracco) - Add new driver-*.h files to DRIVER_SOURCES (Daniel P. Berrange) - Fix indentation of sysinfo data (Daniel P. Berrange) - Fix preprocessor indentation in libvirt.h.in (Daniel P. Berrange) - Move virConnect related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virDomain related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virEvent related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virStoragePool/Vol related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virStream related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virSecret related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virNodeDevice related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virNWFilter related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virInterface related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virNetwork related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virDomainSnapshot related APIs out of libvirt.h.in (Daniel P. Berrange) - Move virConnect/virNode related APIs out of libvirt.c (Daniel P. Berrange) - Move virDomain related APIs out of libvirt.c (Daniel P. Berrange) - Make virTypedParameterValidateSet non-static (Daniel P. Berrange) - Move virStorage{Pool,Vol} related APIs out of libvirt.c (Daniel P. Berrange) - Move virStream related APIs out of libvirt.c (Daniel P. Berrange) - Move virSecret related APIs out of libvirt.c (Daniel P. Berrange) - Move virNodeDevice related APIs out of libvirt.c (Daniel P. Berrange) - Move virNWFilter related APIs out of libvirt.c (Daniel P. Berrange) - Move virInterface related APIs out of libvirt.c (Daniel P. Berrange) - Move virNetwork related APIs out of libvirt.c (Daniel P. Berrange) - Move virDomainSnapshot related APIs out of libvirt.c (Daniel P. Berrange) - Split driver.h into multiple parts (Daniel P. Berrange) - Rename virDriver to virHypervisorDriver (Daniel P. Berrange) - qemu: migration: Make check for empty hook XML robust (Peter Krempa) - util: string: Add helper to check whether string is empty (Peter Krempa) - Add support for /run/initctl (Rick Harris) - qemu: Convert qemuDomainUpdateDeviceConfig to typecasted enum (Peter Krempa) - qemu: Convert qemuDomainDetachDeviceConfig to typecasted enum (Peter Krempa) - qemu: Convert qemuDomainAttachDeviceConfig to typecasted enum (Peter Krempa) - qemu: Convert qemuDomainUpdateDeviceLive to typecasted enum (Peter Krempa) - qemu: Convert qemuDomainDetachDeviceLive to typecasted enum (Peter Krempa) - conf: Move definition of virDomainParseMemory (Peter Krempa) - Implement empty post parse callbacks for all drivers (Peter Krempa) - qemu: monitor: Add functions for object hot-add/remove (Peter Krempa) - util: json: Add option to skip adding a JSON object if it is NULL (Peter Krempa) - util: json: Improve handling and docs for adding JSON objects (Peter Krempa) - util: json: Split out code to create json value objects (Peter Krempa) - qemu: hotplug: Use typecasted switch statement when plugging new devices (Peter Krempa) - conf: Add compile time check that devices were checked for ABI stability (Peter Krempa) - conf: shmem: Add ABI stability check (Peter Krempa) - conf: Improve adding of new address types (Peter Krempa) - conf: Check whether migration_address is localhost (Chen Fan) - conf: add check if migration_host is a localhost address (Chen Fan) - migration: add migration_host support for IPv6 address without brackets (Chen Fan) - Introduce virStringStripIPv6Brackets (Ján Tomko) - conf: improve the comments for "xmlopt" (Wang Rui) - libxl: Add function to determine device model type (Jim Fehlig) - Xen: Defer setting default vram value to Xen drivers (Jim Fehlig) - libxl: Copy user-specified keymap to libxl build info struct (Jim Fehlig) - esx: Implement virDomainScreenshot using libcurl stream driver (Matthias Bolte) - esx: Add libcurl based stream driver (Matthias Bolte) - qemu: change macvtap device MAC address in response to NIC_RX_FILTER_CHANGED (Laine Stump) - qemu: setup infrastructure to handle NIC_RX_FILTER_CHANGED event (Laine Stump) - qemu: qemuMonitorQueryRxFilter - retrieve guest netdev rx-filter (Laine Stump) - util: define virNetDevRxFilter and basic utility functions (Laine Stump) - network: set interface actual trustGuestRxFilters from network/portgroup (Laine Stump) - conf: add trustGuestRxFilters attribute to network and domain interface (Laine Stump) - maint: update .mailmap (Eric Blake) - Include .libs in libdir in source tree pkg-config files (Ján Tomko) - minor shmem clean-ups (Martin Kletzander) - qemu: Build command line for ivshmem device (Martin Kletzander) - qemu: add capability probing for ivshmem device (Maxime Leroy) - docs, conf, schema: add support for shmem device (Martin Kletzander) - qemu: support nospace reason in io error event (Eric Blake) - qemu_command: Split qemuBuildCpuArgStr (Cole Robinson) - configure: improve misleading libnl3-devel missing error message (Shanzhi Yu) - qemu: Improve domainSetTime error info report (Shanzhi Yu) - vbox: Rewrite vboxNetworkGetXMLDesc (Taowei) - vbox: Rewrite vboxNetworkCreate (Taowei) - vbox: Rewrite vboxNetworkUndefineDestroy (Taowei) - vbox: Rewrite vboxNetworkDefineCreateXML (Taowei) - vbox: Rewrite vboxNetworkLookupByName (Taowei) - vbox: Rewrite vboxNetworkLookupByUUID (Taowei) - vbox: Rewrite vboxConnectListDefinedNetworks (Taowei) - vbox: Rewrite vboxConnectNumOfDefinedNetworks (Taowei) - vbox: Rewrite vboxConnectListNetworks (Taowei) - vbox: Rewrite vboxConnectNumOfNetworks (Taowei) - vbox: Rewrite vboxNetworkClose (Taowei) - vbox: Rewrite vboxNetworkOpen (Taowei) - vbox: Interfaces for register per parties (Taowei) - Add virCgroupTerminateMachine stub (Ján Tomko) - Make editor used for 'virsh edit' configurable (Guido Günther) - qemu: use systemd's TerminateMachine to kill all processes (Guido Günther) - maint: Prohibit "devname" by a syntax check rules (Peter Krempa) - qemu: bulk stats: add block allocation information (Francesco Romani) - qemu: monitor: Add helper function to fill physical/virtual image size (Peter Krempa) Cleanups: - vbox: Remove unused things in vbox_tmpl.c (Taowei Luo) - Cleanup maintainers list (Jiri Denemark) So thanks everybody for your help with this release be it with reports ideas, patches, reviews or documentation ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [libvirt-java] [PATCH 00/65]
by Claudio Bley 02 Nov '14

02 Nov '14

Hi. Here are a few patches that piled up in my local branch. Some of them I already submitted to this list, but there has been no reponse to them. Included are a few trivial fixes as well as memory leak fixes and additions to the public API. There had been some minor interest in my first version of domain event support in the Java wrapper[1], which I have reworked almost entirely. If nobody objects, say, within the next two weeks or so, I'll go ahead and push the whole series as was suggested to me by Daniel P. Berrange on this list[2]. I've made sure that all JUnit tests pass after every commit with JNA versions 3.4.1, 3.4.2, 3.5.0, 3.5.1, 3.5.2 and 4.0.0. I'd really appreciate your comments or suggestions. Thanks! [1]: https://www.redhat.com/archives/libvir-list/2013-January/msg01236.html [2]: https://www.redhat.com/archives/libvir-list/2014-January/msg01091.html Claudio Bley (65): Fix warnings about using raw types Fix warnings about accessing static methods Fix typos in Error.java test: fix typo in testConnection() test: ensure that exceptions are thrown when expected Make comments proper javadoc comments for enum constants Ignore editor backup files Depend on JNA versions 3.4.1 to 4.0.0 jna: load virt-0 or virt library depending on the platform Fix wrapping of native size_t data type Use virFree in order to release memory acquired from libvirt tests: remove obsolete test driver Make Device.listCapabilities return only valid array elements test: ensure the Device.listCapabilities method works Start refactoring of error handling Remove processError from Device class Remove processError from Domain class Remove processError from DomainSnapshot class Remove processError from Interface class Remove processError method from Network class Remove processError method from NetworkFilter class Remove processError method from Secret class Remove processError method from StoragePool class Remove processError method from StorageVol class Remove processError method from Stream class Remove processError method from Connect class Call processError only when virInitialize signalled an error Remove ErrorHandler.processError(Libvirt) method Implement equals and hashCode methods for Connect and Domain Fix Domain.getSchedulerParameters / getSchedulerType Fix memleak in Domain.snapshotListNames Fix memleak in StoragePool.listVolumes Fix memleak in DomainSnapshot.getXMLDesc Fix memleak in StorageVol.getPath Fix memleak in StorageVol.getXMLDesc jna: Wrap the virEvent(Add,Remove)Timeout libvirt functions Implement Connect.isAlive Implement Connect.setKeepAlive Introduce event loop support Add constants for enum virDomainEventID Prepare to define proper domain event callback support Add constructIncRef factory method to Domain class events: handle registration for IOError events events: handle registration for Reboot events events: handle registration of domain lifecycle events test: add unit test for domain lifecycle events events: handle registration for PMWakeup events events: add support for PMSuspend events Implement connection close callback support Implement Connect.getSysinfo Implement Domain.blockPeek Implement Domain.memoryPeek Implement Secret.getUsageType Implement Domain.isUpdated Implement Domain.reset Implement Domain.PMwakeup Implement Domain.sendKey Implement interface ByteChannel for Stream class Implement Domain.screenshot test: add testDomainScreenshot JUnit test Add helper for handling bit-flags Connect: add constructors using java.net.URI params Replace Connect.getLibVirVersion method with Library.getVersion Replace static connectionVersion method with getLibVersion Deprecate Connect.getHypervisorVersion .gitignore | 2 + pom.xml.in | 2 +- src/main/java/org/libvirt/BitFlags.java | 18 + src/main/java/org/libvirt/Connect.java | 731 +++++++++++++++++--- src/main/java/org/libvirt/Device.java | 57 +- src/main/java/org/libvirt/Domain.java | 672 +++++++++++------- src/main/java/org/libvirt/DomainSnapshot.java | 29 +- src/main/java/org/libvirt/Error.java | 409 +++++++---- src/main/java/org/libvirt/ErrorHandler.java | 54 +- src/main/java/org/libvirt/Interface.java | 43 +- src/main/java/org/libvirt/KeycodeSet.java | 46 ++ src/main/java/org/libvirt/Library.java | 134 +++- src/main/java/org/libvirt/MemoryAddressMode.java | 19 + src/main/java/org/libvirt/Network.java | 61 +- src/main/java/org/libvirt/NetworkFilter.java | 43 +- src/main/java/org/libvirt/Secret.java | 72 +- src/main/java/org/libvirt/SecretUsageType.java | 23 + src/main/java/org/libvirt/StoragePool.java | 106 ++- src/main/java/org/libvirt/StorageVol.java | 68 +- src/main/java/org/libvirt/Stream.java | 232 +++++-- src/main/java/org/libvirt/SuspendTarget.java | 15 + src/main/java/org/libvirt/event/CrashedDetail.java | 15 + src/main/java/org/libvirt/event/DefinedDetail.java | 17 + src/main/java/org/libvirt/event/DetailInfo.java | 5 + src/main/java/org/libvirt/event/DomainEvent.java | 71 ++ .../java/org/libvirt/event/DomainEventDetail.java | 7 + .../java/org/libvirt/event/DomainEventType.java | 60 ++ src/main/java/org/libvirt/event/EventListener.java | 7 + src/main/java/org/libvirt/event/IOErrorAction.java | 39 ++ .../java/org/libvirt/event/IOErrorListener.java | 21 + .../java/org/libvirt/event/LifecycleListener.java | 24 + .../java/org/libvirt/event/PMSuspendListener.java | 17 + .../java/org/libvirt/event/PMSuspendReason.java | 5 + .../java/org/libvirt/event/PMSuspendedDetail.java | 15 + .../java/org/libvirt/event/PMWakeupListener.java | 17 + .../java/org/libvirt/event/PMWakeupReason.java | 5 + .../java/org/libvirt/event/RebootListener.java | 15 + src/main/java/org/libvirt/event/ResumedDetail.java | 20 + .../java/org/libvirt/event/ShutdownDetail.java | 12 + src/main/java/org/libvirt/event/StartedDetail.java | 30 + src/main/java/org/libvirt/event/StoppedDetail.java | 40 ++ .../java/org/libvirt/event/SuspendedDetail.java | 40 ++ .../java/org/libvirt/event/UndefinedDetail.java | 7 + src/main/java/org/libvirt/jna/Libvirt.java | 121 +++- src/main/java/org/libvirt/jna/SizeT.java | 19 + .../java/org/libvirt/jna/SizeTByReference.java | 50 ++ src/main/java/org/libvirt/jna/virConnectAuth.java | 4 +- .../java/org/libvirt/jna/virConnectCredential.java | 4 +- .../java/org/libvirt/jna/virDomainBlockInfo.java | 4 +- .../java/org/libvirt/jna/virDomainBlockStats.java | 4 +- src/main/java/org/libvirt/jna/virDomainInfo.java | 4 +- .../org/libvirt/jna/virDomainInterfaceStats.java | 4 +- .../java/org/libvirt/jna/virDomainJobInfo.java | 4 +- .../java/org/libvirt/jna/virDomainMemoryStats.java | 4 +- src/main/java/org/libvirt/jna/virError.java | 4 +- src/main/java/org/libvirt/jna/virNodeInfo.java | 4 +- .../java/org/libvirt/jna/virSchedParameter.java | 4 +- .../java/org/libvirt/jna/virStoragePoolInfo.java | 4 +- .../java/org/libvirt/jna/virStorageVolInfo.java | 4 +- src/main/java/org/libvirt/jna/virVcpuInfo.java | 4 +- src/test/java/org/libvirt/TestJavaBindings.java | 139 +++- src/test/java/org/libvirt/TestLibvirtGlobals.java | 4 + src/test/java/test.java | 280 -------- 63 files changed, 2807 insertions(+), 1187 deletions(-) create mode 100644 src/main/java/org/libvirt/BitFlags.java create mode 100644 src/main/java/org/libvirt/KeycodeSet.java create mode 100644 src/main/java/org/libvirt/MemoryAddressMode.java create mode 100644 src/main/java/org/libvirt/SecretUsageType.java create mode 100644 src/main/java/org/libvirt/SuspendTarget.java create mode 100644 src/main/java/org/libvirt/event/CrashedDetail.java create mode 100644 src/main/java/org/libvirt/event/DefinedDetail.java create mode 100644 src/main/java/org/libvirt/event/DetailInfo.java create mode 100644 src/main/java/org/libvirt/event/DomainEvent.java create mode 100644 src/main/java/org/libvirt/event/DomainEventDetail.java create mode 100644 src/main/java/org/libvirt/event/DomainEventType.java create mode 100644 src/main/java/org/libvirt/event/EventListener.java create mode 100644 src/main/java/org/libvirt/event/IOErrorAction.java create mode 100644 src/main/java/org/libvirt/event/IOErrorListener.java create mode 100644 src/main/java/org/libvirt/event/LifecycleListener.java create mode 100644 src/main/java/org/libvirt/event/PMSuspendListener.java create mode 100644 src/main/java/org/libvirt/event/PMSuspendReason.java create mode 100644 src/main/java/org/libvirt/event/PMSuspendedDetail.java create mode 100644 src/main/java/org/libvirt/event/PMWakeupListener.java create mode 100644 src/main/java/org/libvirt/event/PMWakeupReason.java create mode 100644 src/main/java/org/libvirt/event/RebootListener.java create mode 100644 src/main/java/org/libvirt/event/ResumedDetail.java create mode 100644 src/main/java/org/libvirt/event/ShutdownDetail.java create mode 100644 src/main/java/org/libvirt/event/StartedDetail.java create mode 100644 src/main/java/org/libvirt/event/StoppedDetail.java create mode 100644 src/main/java/org/libvirt/event/SuspendedDetail.java create mode 100644 src/main/java/org/libvirt/event/UndefinedDetail.java create mode 100644 src/main/java/org/libvirt/jna/SizeT.java create mode 100644 src/main/java/org/libvirt/jna/SizeTByReference.java delete mode 100644 src/test/java/test.java -- 1.7.9.5

6 190

[libvirt] [PATCHv7 0/7] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 01 Nov '14

01 Nov '14

Drvbhyve hardcodes bhyveload(8) as the host bootloader for guests. bhyveload(8) loader only supports FreeBSD guests. This patch series adds <bootloader> and <bootloader_args> handling to bhyve_command, so libvirt can boot non-FreeBSD guests in Bhyve. Additionally, support for grub-bhyve(1)'s --cons-dev argument is added so that interactive GRUB menus can be manipulated with the domain-configured serial device. See patch logs for further details. Thanks, Conrad Changes in v7: - Detect grub-bhyve support for --cons-dev automatically; only pass the domain-configured serial device if supported. - Add '-nocons' version of the grub-serial unit tests to confirm we construct the loader Cmd correctly if the capability is missing. Conrad Meyer (7): bhyve: Support /domain/bootloader configuration for non-FreeBSD guests. bhyvexml2argv: Add loader argv tests. domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve bhyvexml2argv: Add tests for domain-configured bootloader, args bhyve: Probe grub-bhyve for --cons-dev capability bhyve: Add console support for grub-bhyve bootloader bhyvexml2argv: Add test for grub console support docs/drvbhyve.html.in | 100 ++++++++++- docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 17 +- src/bhyve/bhyve_capabilities.c | 37 ++++ src/bhyve/bhyve_capabilities.h | 3 + src/bhyve/bhyve_command.c | 189 +++++++++++++++++++-- src/bhyve/bhyve_command.h | 5 +- src/bhyve/bhyve_driver.c | 16 +- src/bhyve/bhyve_driver.h | 2 + src/bhyve/bhyve_process.c | 38 ++++- src/bhyve/bhyve_utils.h | 2 + .../bhyvexml2argv-acpiapic.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.args | 3 + .../bhyvexml2argv-bhyveload-explicitargs.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-console.ldargs | 1 + .../bhyvexml2argv-custom-loader.args | 3 + .../bhyvexml2argv-custom-loader.ldargs | 1 + .../bhyvexml2argv-custom-loader.xml | 24 +++ .../bhyvexml2argv-disk-cdrom-grub.args | 3 + .../bhyvexml2argv-disk-cdrom-grub.devmap | 1 + .../bhyvexml2argv-disk-cdrom-grub.ldargs | 2 + .../bhyvexml2argv-disk-cdrom-grub.xml | 23 +++ .../bhyvexml2argv-disk-cdrom.ldargs | 1 + .../bhyvexml2argv-disk-virtio.ldargs | 1 + .../bhyvexml2argv-grub-defaults.args | 3 + .../bhyvexml2argv-grub-defaults.devmap | 1 + .../bhyvexml2argv-grub-defaults.ldargs | 2 + .../bhyvexml2argv-grub-defaults.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs | 1 + .../bhyvexml2argv-serial-grub-nocons.args | 4 + .../bhyvexml2argv-serial-grub-nocons.devmap | 1 + .../bhyvexml2argv-serial-grub-nocons.ldargs | 2 + .../bhyvexml2argv-serial-grub-nocons.xml | 26 +++ .../bhyvexml2argv-serial-grub.args | 4 + .../bhyvexml2argv-serial-grub.devmap | 1 + .../bhyvexml2argv-serial-grub.ldargs | 2 + .../bhyvexml2argv-serial-grub.xml | 26 +++ .../bhyvexml2argvdata/bhyvexml2argv-serial.ldargs | 1 + tests/bhyvexml2argvtest.c | 71 +++++++- 41 files changed, 631 insertions(+), 39 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs -- 1.9.3

1 8

[libvirt] [PATCH] Use UPDATE_CPU when saving domain status
by Ján Tomko 01 Nov '14

01 Nov '14

We only format cpu model for MODE_CUSTOM in domain status XML, but we always format features if they are present. This is a problem if we have a domain using MODE_HOST_PASSTHROUGH that has been managedsaved, then restored, since it now has a feature list but no model in /var/run/libvirt/qemu. Use UPDATE_CPU even for the status XML to prevent libvirt from losing track of the domain. Also accept a list of features for HOST_PASSTHROUGH even without a model specified, to catch domains started with older libvirtd. (We already accept the list of features with a model specified, even though they have no effect for HOST_PASSTHROUGH) https://bugzilla.redhat.com/show_bug.cgi?id=1030793 https://bugzilla.redhat.com/show_bug.cgi?id=1151885 --- src/conf/cpu_conf.c | 2 +- src/conf/domain_conf.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 9b7fbb0..96e1c38 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -625,7 +625,7 @@ virCPUDefFormatBuf(virBufferPtr buf, (def->mode == VIR_CPU_MODE_CUSTOM && def->model))); if (!def->model && - def->mode != VIR_CPU_MODE_HOST_MODEL && + def->mode == VIR_CPU_MODE_CUSTOM && def->nfeatures) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Non-empty feature list specified without CPU model")); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a351382..414161c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19621,6 +19621,7 @@ virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, virDomainObjPtr obj) { unsigned int flags = (VIR_DOMAIN_XML_SECURE | + VIR_DOMAIN_XML_UPDATE_CPU | VIR_DOMAIN_XML_INTERNAL_STATUS | VIR_DOMAIN_XML_INTERNAL_ACTUAL_NET | VIR_DOMAIN_XML_INTERNAL_PCI_ORIG_STATES | -- 2.0.4

2 1

[libvirt] [PATCH][1.2.10] Relax duplicate SCSI host pool checking
by Ján Tomko 01 Nov '14

01 Nov '14

Since commit 3f99d64 no new scsi_host pools can be defined if one of the already defined scsi_host pools does not refer to an accessible scsi_host adapter. Relax the check by skipping over these inaccessible pools when checking for duplicates. If both of them are defined by their parent, only compare their address and unique_id with the re-introduced matchSCSIAdapterParent function. --- This would be nice to get into 1.2.10, as the commit mentioned above has not yet been released. src/conf/storage_conf.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 19c452b..afd6cd4 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -2094,6 +2094,28 @@ getSCSIHostNumber(virStoragePoolSourceAdapter adapter, VIR_FREE(name); return ret; } +static bool +matchSCSIAdapterParent(virStoragePoolObjPtr pool, + virStoragePoolDefPtr def) +{ + virDevicePCIAddressPtr pooladdr = + &pool->def->source.adapter.data.scsi_host.parentaddr; + virDevicePCIAddressPtr defaddr = + &def->source.adapter.data.scsi_host.parentaddr; + int pool_unique_id = + pool->def->source.adapter.data.scsi_host.unique_id; + int def_unique_id = + def->source.adapter.data.scsi_host.unique_id; + if (pooladdr->domain == defaddr->domain && + pooladdr->bus == defaddr->bus && + pooladdr->slot == defaddr->slot && + pooladdr->function == defaddr->function && + pool_unique_id == def_unique_id) { + return true; + } + return false; +} + int virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, @@ -2143,10 +2165,17 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST) { unsigned int pool_hostnum, def_hostnum; + if (pool->def->source.adapter.data.scsi_host.has_parent && + def->source.adapter.data.scsi_host.has_parent && + matchSCSIAdapterParent(pool, def)) { + matchpool = pool; + break; + } + if (getSCSIHostNumber(pool->def->source.adapter, &pool_hostnum) < 0 || getSCSIHostNumber(def->source.adapter, &def_hostnum) < 0) - goto error; + break; if (pool_hostnum == def_hostnum) matchpool = pool; } @@ -2188,10 +2217,6 @@ virStoragePoolSourceFindDuplicate(virStoragePoolObjListPtr pools, ret = -1; } return ret; - - error: - virStoragePoolObjUnlock(pool); - return -1; } void -- 2.0.4

2 2

[libvirt] [PATCH v2] domain: fix parsing of memory tunables on 32-bit machines
by Eric Blake 31 Oct '14

31 Oct '14

Commit 6c9a8a4 (Oct 2014) exposed a long-standing issue on 32-bit machines: code related to virDomainSetMemoryParameters has always been documented as using a 64-bit limit, but it was implemented by calling virDomainParseMemory which enforced an 'unsigned long' limit. Since VIR_DOMAIN_MEMORY_PARAM_UNLIMITED capped to a long is -1, but virDomainParseScaledValue no longer accepts negative values, an attempt to use 2^53-1 as a hard memory limit started failing the testsuite. However, the problem with capping things artificially low has existed for much longer - ever since commits 4888f0fb and 2e22f23 (Mar 2012) switched internal tracking from 'unsigned long' to 'unsigned long long' (prior to that time, the cap was a side-effect of the choice of types). We _have_ to cap the balloon memory values, (no thanks to baked in 'unsigned long' of API such as virDomainSetMaxMemory or virDomainGetInfo with no counterpart API that guarantees 64-bit access to those numbers) but memory parameters have never needed the artificial limit. At any rate, the solution is to make the parser function gain a parameter, and only do the reduced 32-bit cap for the values that are constrained due to API. * src/conf/domain_conf.h (_virDomainMemtune): Add comments. * src/conf/domain_conf.c (virDomainParseMemory): Add parameter. (virDomainDefParseXML): Adjust callers. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/conf/domain_conf.c | 25 ++++++++++++++----------- src/conf/domain_conf.h | 14 ++++++++------ 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39befb0..c594325 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6373,19 +6373,22 @@ virDomainParseScaledValue(const char *xpath, /* Parse a memory element located at XPATH within CTXT, and store the - * result into MEM. If REQUIRED, then the value must exist; - * otherwise, the value is optional. The value is in blocks of 1024. - * Return 0 on success, -1 on failure after issuing error. */ + * result into MEM, in blocks of 1024. If REQUIRED, then the value + * must exist; otherwise, the value is optional. The value must not + * exceed VIR_DOMAIN_MEMORY_PARAM_UNLIMITED once scaled; additionally, + * if CAPPED is true, the value must fit within an unsigned long (only + * matters on 32-bit platforms). Return 0 on success, -1 on failure + * after issuing error. */ static int virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, - unsigned long long *mem, bool required) + unsigned long long *mem, bool required, bool capped) { int ret = -1; unsigned long long bytes, max; /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit * machines, our bound is off_t (2^63). */ - if (sizeof(unsigned long) < sizeof(long long)) + if (capped && sizeof(unsigned long) < sizeof(long long)) max = 1024ull * ULONG_MAX; else max = LLONG_MAX; @@ -12215,11 +12218,11 @@ virDomainDefParseXML(xmlDocPtr xml, /* Extract domain memory */ if (virDomainParseMemory("./memory[1]", ctxt, - &def->mem.max_balloon, true) < 0) + &def->mem.max_balloon, true, true) < 0) goto error; if (virDomainParseMemory("./currentMemory[1]", ctxt, - &def->mem.cur_balloon, false) < 0) + &def->mem.cur_balloon, false, true) < 0) goto error; /* and info about it */ @@ -12339,19 +12342,19 @@ virDomainDefParseXML(xmlDocPtr xml, /* Extract other memory tunables */ if (virDomainParseMemory("./memtune/hard_limit[1]", ctxt, - &def->mem.hard_limit, false) < 0) + &def->mem.hard_limit, false, false) < 0) goto error; if (virDomainParseMemory("./memtune/soft_limit[1]", ctxt, - &def->mem.soft_limit, false) < 0) + &def->mem.soft_limit, false, false) < 0) goto error; if (virDomainParseMemory("./memtune/min_guarantee[1]", ctxt, - &def->mem.min_guarantee, false) < 0) + &def->mem.min_guarantee, false, false) < 0) goto error; if (virDomainParseMemory("./memtune/swap_hard_limit[1]", ctxt, - &def->mem.swap_hard_limit, false) < 0) + &def->mem.swap_hard_limit, false, false) < 0) goto error; n = virXPathULong("string(./vcpu[1])", ctxt, &count); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9908d88..fbb3b2f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1966,8 +1966,10 @@ typedef struct _virDomainMemtune virDomainMemtune; typedef virDomainMemtune *virDomainMemtunePtr; struct _virDomainMemtune { - unsigned long long max_balloon; /* in kibibytes */ - unsigned long long cur_balloon; /* in kibibytes */ + unsigned long long max_balloon; /* in kibibytes, capped at ulong thanks + to virDomainGetMaxMemory */ + unsigned long long cur_balloon; /* in kibibytes, capped at ulong thanks + to virDomainGetInfo */ virDomainHugePagePtr hugepages; size_t nhugepages; @@ -1975,10 +1977,10 @@ struct _virDomainMemtune { bool nosharepages; bool locked; int dump_core; /* enum virTristateSwitch */ - unsigned long long hard_limit; /* in kibibytes */ - unsigned long long soft_limit; /* in kibibytes */ - unsigned long long min_guarantee; /* in kibibytes */ - unsigned long long swap_hard_limit; /* in kibibytes */ + unsigned long long hard_limit; /* in kibibytes, limit at off_t bytes */ + unsigned long long soft_limit; /* in kibibytes, limit at off_t bytes */ + unsigned long long min_guarantee; /* in kibibytes, limit at off_t bytes */ + unsigned long long swap_hard_limit; /* in kibibytes, limit at off_t bytes */ }; typedef struct _virDomainPowerManagement virDomainPowerManagement; -- 1.9.3

2 2

[libvirt] [PATCH 0/2] Fix two coverity issues
by Pavel Hrdina 31 Oct '14

31 Oct '14

Both are false positive but its nice to make coverity happy. Pavel Hrdina (2): vbox_storage: fix coverity issue with overwriting value hotplug: fix char device detach src/qemu/qemu_hotplug.c | 12 ++++++++---- src/vbox/vbox_storage.c | 36 ++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 24 deletions(-) -- 2.0.4

2 7

[libvirt] [PATCH 1/2] qemu: migration:Release nbd port from migrationPorts instead of remotePorts
by weiwei li 31 Oct '14

31 Oct '14

commit 3e1e16aa8d4238241a1806cb9bdb3b9ad60db777(Use a port from the migration range for NBD as well) change ndb port allocation from remotePorts to migrationPorts, but does not change the port releasing process, which makes an error when migration seveal times(above 64). Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> --- src/qemu/qemu_migration.c | 8 ++++---- src/qemu/qemu_process.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ca70e35..0ad8054 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1351,7 +1351,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, unsigned short port = 0; char *diskAlias = NULL; size_t i; - + VIR_DEBUG("DEBUG: in qemuMigrationStartNBDServer"); for (i = 0; i < vm->def->ndisks; i++) { virDomainDiskDefPtr disk = vm->def->disks[i]; @@ -1389,7 +1389,7 @@ qemuMigrationStartNBDServer(virQEMUDriverPtr driver, cleanup: VIR_FREE(diskAlias); if (ret < 0) - virPortAllocatorRelease(driver->remotePorts, port); + virPortAllocatorRelease(driver->migrationPorts, port); return ret; } @@ -1595,7 +1595,7 @@ qemuMigrationStopNBDServer(virQEMUDriverPtr driver, qemuDomainObjExitMonitor(driver, vm); - virPortAllocatorRelease(driver->remotePorts, priv->nbdPort); + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; } @@ -2813,7 +2813,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, VIR_FORCE_CLOSE(dataFD[1]); if (vm) { if (ret < 0) { - virPortAllocatorRelease(driver->remotePorts, priv->nbdPort); + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; } if (ret >= 0 || vm->persistent) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ef258cf..ba8ba82 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4839,7 +4839,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, } } - virPortAllocatorRelease(driver->remotePorts, priv->nbdPort); + virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort); priv->nbdPort = 0; if (priv->agent) { -- 1.7.1

4 4

[libvirt] [PATCH 0/3] Avoid rare race with virDomainUndefine()
by Martin Kletzander 31 Oct '14

31 Oct '14

First patch just fixes 'virsh list' for a rare case that is similar to the one fixed in the third patch. Second patch is just a helper for reproducing the race. This was found in qemu driver but is fixed on upper level, so it should be more general. Martin Kletzander (3): virsh: don't list unknown domains DO NOT APPLY UPSTREAM: Reproducer helper Avoid rare race when undefining domain src/conf/domain_conf.c | 26 +++++++++++++++++++++++--- src/conf/domain_conf.h | 1 + tools/virsh-domain-monitor.c | 5 +++++ 3 files changed, 29 insertions(+), 3 deletions(-) -- 2.1.2

3 9

[libvirt] [PATCH] Do not probe for power mgmt capabilities in lxc emulator
by Ján Tomko 31 Oct '14

31 Oct '14

It fails after 30 seconds with this error: error : virDBusCall:1429 : error from service: CanSuspend: Did not receive a reply. Possible causes include: the remote application did not send a reply, the message bus security policy blocked the reply, the reply timeout expired, or the network connection was broken. Only probe for the power mgmt capabilities when driver is non-NULL. This speeds up domain startup by 30 seconds. https://bugzilla.redhat.com/show_bug.cgi?id=1159227 --- src/lxc/lxc_conf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 17df7a8..e713ff8 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -82,7 +82,9 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver) VIR_WARN("Failed to query host NUMA topology, disabling NUMA capabilities"); } - if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) + /* Only probe for power management capabilities in the driver, + * not in the emulator */ + if (driver && virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) VIR_WARN("Failed to get host power management capabilities"); if (virGetHostUUID(caps->host.host_uuid)) { -- 2.0.4

3 2

[libvirt] [PATCH] qemu: make advice from numad available when building commandline
by Martin Kletzander 31 Oct '14

31 Oct '14

Particularly in qemuBuildNumaArgStr(), there was a need for the advice due to memory backing, which needs to know the nodeset it will be pinned to. With newer qemu this caused the following error when starting domain: error: internal error: Advice from numad is needed in case of automatic numa placement even when starting perfectly valid domain, e.g.: ... <vcpu placement='auto'>4</vcpu> <numatune> <memory mode='strict' placement='auto'/> </numatune> <cpu> <numa> <cell id='0' cpus='0' memory='524288'/> <cell id='1' cpus='1' memory='524288'/> </numa> </cpu> ... Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1138545 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 10 ++++++---- src/qemu/qemu_command.h | 3 ++- src/qemu/qemu_driver.c | 3 ++- src/qemu/qemu_process.c | 3 ++- tests/qemuxml2argvtest.c | 3 ++- tests/qemuxmlnstest.c | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2e5af4f..207e2b0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6636,7 +6636,8 @@ static int qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, const virDomainDef *def, virCommandPtr cmd, - virQEMUCapsPtr qemuCaps) + virQEMUCapsPtr qemuCaps, + virBitmapPtr nodeset) { size_t i, j; virBuffer buf = VIR_BUFFER_INITIALIZER; @@ -6796,7 +6797,7 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg, virBufferAsprintf(&buf, ",size=%dM,id=ram-node%zu", cellmem, i); - if (virDomainNumatuneMaybeFormatNodeset(def->numatune, NULL, + if (virDomainNumatuneMaybeFormatNodeset(def->numatune, nodeset, &nodemask, i) < 0) goto cleanup; @@ -7764,7 +7765,8 @@ qemuBuildCommandLine(virConnectPtr conn, virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool standalone, - bool enableFips) + bool enableFips, + virBitmapPtr nodeset) { virErrorPtr originalError = NULL; size_t i, j; @@ -7992,7 +7994,7 @@ qemuBuildCommandLine(virConnectPtr conn, } if (def->cpu && def->cpu->ncells) - if (qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps) < 0) + if (qemuBuildNumaArgStr(cfg, def, cmd, qemuCaps, nodeset) < 0) goto error; if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_UUID)) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index aa40c9e..f7d3c2d 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -79,7 +79,8 @@ virCommandPtr qemuBuildCommandLine(virConnectPtr conn, virNetDevVPortProfileOp vmop, qemuBuildCommandLineCallbacksPtr callbacks, bool forXMLToArgv, - bool enableFips) + bool enableFips, + virBitmapPtr nodeset) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(11); /* Generate '-device' string for chardev device */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 373daab..5ac638a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6472,7 +6472,8 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &buildCommandLineCallbacks, true, - qemuCheckFips()))) + qemuCheckFips(), + NULL))) goto cleanup; ret = virCommandToString(cmd); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index ef258cf..6cbd608 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4362,7 +4362,8 @@ int qemuProcessStart(virConnectPtr conn, priv->monJSON, priv->qemuCaps, migrateFrom, stdin_fd, snapshot, vmop, &buildCommandLineCallbacks, false, - qemuCheckFips()))) + qemuCheckFips(), + nodemask))) goto cleanup; /* now that we know it is about to start call the hook if present */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0e9fab9..9b8e3e2 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -362,7 +362,8 @@ static int testCompareXMLToArgvFiles(const char *xml, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &testCallbacks, false, - (flags & FLAG_FIPS)))) { + (flags & FLAG_FIPS), + NULL))) { if (!virtTestOOMActive() && (flags & FLAG_EXPECT_FAILURE)) { ret = 0; diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index b3a608c..2f37a26 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -119,7 +119,7 @@ static int testCompareXMLToArgvFiles(const char *xml, vmdef, &monitor_chr, json, extraFlags, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, - &testCallbacks, false, false))) + &testCallbacks, false, false, NULL))) goto fail; if (!virtTestOOMActive()) { -- 2.1.2

2 2

[libvirt] [PATCH 0/2] Improve error messages about blkio values
by Martin Kletzander 31 Oct '14

31 Oct '14

There was one message used for all parsing errors in the blkio code. This series fixes it in both qemu and lxc drivers where the code is used. Martin Kletzander (2): qemu: improve error message for invalid blkiotune settings lxc: improve error message for invalid blkiotune settings src/lxc/lxc_driver.c | 29 +++++++++++++++++++---------- src/qemu/qemu_driver.c | 29 +++++++++++++++++++---------- 2 files changed, 38 insertions(+), 20 deletions(-) -- 2.1.2

3 5

[libvirt] Entering freeze and release of cadidate release 1 of 1.2.10
by Daniel Veillard 31 Oct '14

31 Oct '14

As planned beginning of this week, I just tagged 1.2.10-rc1 in git and pushed signed tarballs and rpms to the usual place: ftp://libvirt.org/libvirt/ The plan would be to get the rc2 out this friday, and push the release on monday if everything looks okay. In my own tests, my guest lost network connectivity, I'm not sure if it is a temporary problem on my side or something more serious in the current code, so please give it a try and report, thanks, Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 3

[libvirt] [PATCH v3 0/3] add nodeset check in numatune
by Chen Fan 31 Oct '14

31 Oct '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): numatune: add check for numatune nodeset range lxc controller: add check for numatune virnuma: remove redundant check for numanode src/conf/numatune_conf.c | 28 +++++++++++++ src/conf/numatune_conf.h | 1 + src/libvirt_private.syms | 2 + src/lxc/lxc_controller.c | 1 + src/qemu/qemu_command.c | 3 ++ src/qemu/qemu_command.h | 1 + src/util/virbitmap.c | 49 ++++++++++++++++++++++ src/util/virbitmap.h | 3 ++ src/util/virnuma.c | 48 ++++++++++++++------- src/util/virnuma.h | 2 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 35 ++++++++++++++++ tests/qemuxml2argvmock.c | 9 ++++ tests/qemuxml2argvtest.c | 1 + tests/virbitmaptest.c | 26 +++++++++++- 14 files changed, 193 insertions(+), 16 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

3 9

[libvirt] virsh migrate
by Chateigner Nicolas 30 Oct '14

30 Oct '14

Hi, I would like to use this command to backup my virtual machine on my secondary server virsh migrate --live --suspend --copy-storage-inc virtual_machine qemu+ssh://root@secondary_server/system But we don't have option to disable shut off the virtual machine on the source server. Would you add an option to offer this functionality ? Best regards Nicolas Chateigner <http://www.inserm.fr>

1 0

[libvirt] virStorageFileGetMetadata bug?
by Serge Hallyn 30 Oct '14

30 Oct '14

Hi, I'm looking into why virt-aa-helper isn't adding allow rules for backing stores nested deeper than 1. So if I do qemu-img create -f qcow2 l1.img 10G qemu-img create -f qcow2 -b l1.img l2.img and use l2.img in a domain, then virt-aa-helper will add allow rules for the domain to access both l1.img and l2.img. But if I qemu-img create -f qcow2 -b l2.img l3.img and use l3.img in the domain, then l3.img will not get an allow rule. Looking at src/security/virt-aa-helper.c:get_files(), it is doing: if (!disk->src->backingStore) { bool probe = ctl->allowDiskFormatProbing; virStorageFileGetMetadata(disk->src, -1, -1, probe, false); } if (virDomainDiskDefForeachPath(disk, true, add_file_path, &buf) < 0) goto cleanup; and virStorageFileGetMetadata in turn calls virStorageFileGetMetadataRecurse(). So it seems like l3.img *should* be geting hit in virDomainDiskDefForeachPath, but it's not. Am I misunderstanding something in how these helpers should be used? thanks, -serge

2 2

[libvirt] [PATCH] conf: use proper maximum for parsing memory values
by Martin Kletzander 30 Oct '14

30 Oct '14

The value is stored in unsigned long long, so ULLONG_MAX is the proper upper limit to use. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Even though this is a build-breaker (for 32bit systems memtune-unlimited fails to parse), I'm not pushing it as one because it feels odd that such change wouldn't break anything else. src/conf/domain_conf.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a351382..beb3d26 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6388,16 +6388,10 @@ virDomainParseMemory(const char *xpath, xmlXPathContextPtr ctxt, unsigned long long *mem, bool required) { int ret = -1; - unsigned long long bytes, max; - - /* On 32-bit machines, our bound is 0xffffffff * KiB. On 64-bit - * machines, our bound is off_t (2^63). */ - if (sizeof(unsigned long) < sizeof(long long)) - max = 1024ull * ULONG_MAX; - else - max = LLONG_MAX; + unsigned long long bytes; - ret = virDomainParseScaledValue(xpath, ctxt, &bytes, 1024, max, required); + ret = virDomainParseScaledValue(xpath, ctxt, &bytes, 1024, + ULLONG_MAX, required); if (ret < 0) goto cleanup; -- 2.1.2

2 5

[libvirt] [PATCH 0/2] network: bandwidth tuning in session mode revert patch
by Erik Skultety 30 Oct '14

30 Oct '14

As Laine noted correctly, we should be testing for privileges on a global scale, when trying to set bandwidth parameters. Therefore I moved the check from qemu_driver.c and qemu_command.c into virnetdevbandwidth.c Erik Skultety (2): qemu: revert patch - bandwidth tuning in session mode Iface: disallow network tuning in session mode globally src/libvirt_private.syms | 4 ++++ src/qemu/qemu_command.c | 11 ----------- src/qemu/qemu_driver.c | 6 ------ src/util/virnetdevbandwidth.c | 31 ++++++++++++++++++++++++------- src/util/virnetdevbandwidthpriv.h | 36 ++++++++++++++++++++++++++++++++++++ tests/virnetdevbandwidthtest.c | 5 +++-- 6 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 src/util/virnetdevbandwidthpriv.h -- 1.9.3

2 4

[libvirt] ceps-based backing stores
by Lyssa P. Livingston 30 Oct '14

30 Oct '14

I have a file with an ceph-based backing store. I run this command: nova boot vm-clone where vm-clone is the rbd-backed file. It generates this command: qemu-img create -f qcow2 -b rbd:rbdpool/disk/instance-00000002.0.disk:conf=/etc/ceph/ceph.conf:id=admin -F raw /mnt/novadisk/nova/instances/3efa8a7b-75a8-4695-8fdd-659185c46b7d/disk and I am getting this error: error: internal error: backing store parser is not implemented for protocol rbd I was under the impression that qemu could work with ceph-based backing stores, so is there something I should run first, or files that I should patch, or ... ??? I am running libvirt 1.2.9. Thanks for any assistance you can provide. Lyssa

2 2

[libvirt] [PATCH V2 0/2] libxl: user-specified domain config improvements
by Jim Fehlig 30 Oct '14

30 Oct '14

V2 of a small series to improve libxl driver's support for user-specified config https://www.redhat.com/archives/libvir-list/2014-September/msg01243.html Patches 1-4 of that series have been pushed. In patch 5, Michal suggested checking that the user-specified emulator is executable. Patch 1 of this series is a respin of patch 5 that includes Michal's suggestion. Patch 2 fixes an issue found while testing. Jim Fehlig (2): libxl: Support user-specified <emulator> libxl: fix double-free of libxl_domain_build_info src/libxl/libxl_conf.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) -- 1.8.4.5

2 5

[libvirt] [PATCH] Spell TIOCSCTTY right in the error message
by Ján Tomko 30 Oct '14

30 Oct '14

--- src/lxc/lxc_container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed as trivial. diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2af2674..f02b959 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -281,7 +281,7 @@ static int lxcContainerSetupFDs(int *ttyfd, if (ioctl(*ttyfd, TIOCSCTTY, NULL) < 0) { virReportSystemError(errno, "%s", - _("ioctl(TIOCSTTY) failed")); + _("ioctl(TIOCSCTTY) failed")); goto cleanup; } -- 2.0.4

1 0

[libvirt] [PATCH v2 1/2] util: Introduce virPidFileForceCleanupPath
by Martin Kletzander 30 Oct '14

30 Oct '14

This function is used to cleanup a pidfile doing whatever it takes, even killing the owning process. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- v2: - Don't use "/proc", but simply just try to acquire the pidfile. - https://www.redhat.com/archives/libvir-list/2014-October/msg00320.html src/libvirt_private.syms | 1 + src/util/virpidfile.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/util/virpidfile.h | 2 ++ 3 files changed, 45 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d6265ac..30d100d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1810,6 +1810,7 @@ virPidFileBuildPath; virPidFileConstructPath; virPidFileDelete; virPidFileDeletePath; +virPidFileForceCleanupPath; virPidFileRead; virPidFileReadIfAlive; virPidFileReadPath; diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a3b8846..a64a1cf 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -37,6 +37,7 @@ #include "c-ctype.h" #include "areadlink.h" #include "virstring.h" +#include "virprocess.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -567,3 +568,44 @@ virPidFileConstructPath(bool privileged, VIR_FREE(rundir); return ret; } + + +/** + * virPidFileForceCleanupPath: + * + * Check if the pidfile is left around and clean it up whatever it + * takes. This doesn't raise an error. This function must not be + * called multiple times with the same path, be it in threads or + * processes. + * + * Returns 0 if the pidfile was successfully cleaned up, -1 otherwise. + */ +int +virPidFileForceCleanupPath(const char *path) +{ + pid_t pid = 0; + int fd = -1; + + if (!virFileExists(path)) + return 0; + + if (virPidFileReadPath(path, &pid) < 0) + return -1; + + if (virPidFileAcquirePath(path, false, 0) == 0) { + virPidFileReleasePath(path, fd); + } else { + virResetLastError(); + + /* Only kill the process if the pid is valid one. 0 means + * there is somebody else doing the same pidfile cleanup + * machinery. */ + if (pid) + virProcessKillPainfully(pid, true); + + if (virPidFileDeletePath(path) < 0) + return -1; + } + + return 0; +} diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index ca1dbff..eb6516c 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -74,4 +74,6 @@ int virPidFileConstructPath(bool privileged, const char *progname, char **pidfile); +int virPidFileForceCleanupPath(const char *path) ATTRIBUTE_NONNULL(1); + #endif /* __VIR_PIDFILE_H__ */ -- 2.1.2

2 5

[libvirt] [PATCH] Reject live update of offloading options
by Ján Tomko 30 Oct '14

30 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1155441 --- src/qemu/qemu_hotplug.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 33241fb..d3bf392 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1981,7 +1981,18 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, olddev->driver.virtio.txmode != newdev->driver.virtio.txmode || olddev->driver.virtio.ioeventfd != newdev->driver.virtio.ioeventfd || olddev->driver.virtio.event_idx != newdev->driver.virtio.event_idx || - olddev->driver.virtio.queues != newdev->driver.virtio.queues)) { + olddev->driver.virtio.queues != newdev->driver.virtio.queues || + olddev->driver.virtio.host.csum != newdev->driver.virtio.host.csum || + olddev->driver.virtio.host.gso != newdev->driver.virtio.host.gso || + olddev->driver.virtio.host.tso4 != newdev->driver.virtio.host.tso4 || + olddev->driver.virtio.host.tso6 != newdev->driver.virtio.host.tso6 || + olddev->driver.virtio.host.ecn != newdev->driver.virtio.host.ecn || + olddev->driver.virtio.host.ufo != newdev->driver.virtio.host.ufo || + olddev->driver.virtio.guest.csum != newdev->driver.virtio.guest.csum || + olddev->driver.virtio.guest.tso4 != newdev->driver.virtio.guest.tso4 || + olddev->driver.virtio.guest.tso6 != newdev->driver.virtio.guest.tso6 || + olddev->driver.virtio.guest.ecn != newdev->driver.virtio.guest.ecn || + olddev->driver.virtio.guest.ufo != newdev->driver.virtio.guest.ufo)) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver attributes")); goto cleanup; -- 2.0.4

2 1

[libvirt] [PATCH 00/19] vbox: Rewrite the storage driver
by Taowei Luo 30 Oct '14

30 Oct '14

This is the last part of rewriting vbox driver. The approache is almost the same as the previous. Some code problems such as copyright and irregular macros are fixed in this series. Taowei Luo (19): vbox: Fix copyright mistake vbox: Remove VBOX_OBJECT_CHECK macro vbox: move common codes to vbox_common.h vbox: Rewrite vbox-independent functions vbox: Rewrite vboxStoragePoolNumOfVolumes vbox: Rewrite vboxStoragePoolListVolumes vbox: Rewrite vboxStorageVolLookupByName vbox: Rewrite vboxStorageVolLookupByKey vbox: Make FindMedium support old vbox versions vbox: Rewrite vboxStorageVolLookupByPath vbox: Make CreateHardDisk support all vbox versions vbox: Rewrite vboxStorageVolCreateXML vbox: Make IMediumAttachment work with vbox2.2 and 3.0 vbox: Rewrite vboxStorageVolDelete vbox: Rewrite vboxStorageVolGetInfo vbox: Rewrite vboxStorageVolGetXMLDesc vbox: Rewrite vboxStorageVolGetPath vbox: New storage driver vbox: Remove unused things in vbox_tmpl.c po/POTFILES.in | 1 + src/Makefile.am | 11 +- src/vbox/vbox_common.c | 416 +++++++++------ src/vbox/vbox_common.h | 117 +++- src/vbox/vbox_driver.c | 99 +--- src/vbox/vbox_get_driver.h | 3 +- src/vbox/vbox_network.c | 30 +- src/vbox/vbox_storage.c | 959 +++++++++++++++++++++++++++++++++ src/vbox/vbox_tmpl.c | 1186 ++++++----------------------------------- src/vbox/vbox_uniformed_api.h | 30 +- 10 files changed, 1555 insertions(+), 1297 deletions(-) create mode 100644 src/vbox/vbox_storage.c -- 1.7.9.5

3 21

[libvirt] [PATCH v6 0/6] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 30 Oct '14

30 Oct '14

Drvbhyve hardcodes bhyveload(8) as the host bootloader for guests. bhyveload(8) loader only supports FreeBSD guests. This patch series adds <bootloader> and <bootloader_args> handling to bhyve_command, so libvirt can boot non-FreeBSD guests in Bhyve. Additionally, support for grub-bhyve(1)'s --cons-dev argument is added so that interactive GRUB menus can be manipulated with the domain-configured serial device. See patch logs for further details. Thanks, Conrad Changes in v6: - Simplified domain schema changes; just add bootloader section to HVM-type OS, and make the bootloader tag optional. - Update drvbhyve.html.in copy to explicitly state that interactive bootloaders are unsupported. - Move GRUB device.map file creation out of BuildLoadCmd; instead emit device.map as a string. - Add devicemap contents tests to bhyvexml2argv. Conrad Meyer (6): bhyve: Support /domain/bootloader configuration for non-FreeBSD guests. bhyvexml2argv: Add loader argv tests. domaincommon.rng: Add 'bootloader' to os=hvm schema for Bhyve bhyvexml2argv: Add tests for domain-configured bootloader, args bhyve: Add console support for grub-bhyve bootloader bhyvexml2argv: Add test for grub console support docs/drvbhyve.html.in | 100 ++++++++++- docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 17 +- src/bhyve/bhyve_command.c | 186 +++++++++++++++++++-- src/bhyve/bhyve_command.h | 5 +- src/bhyve/bhyve_driver.c | 3 +- src/bhyve/bhyve_process.c | 38 ++++- .../bhyvexml2argv-acpiapic.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.args | 3 + .../bhyvexml2argv-bhyveload-explicitargs.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-console.ldargs | 1 + .../bhyvexml2argv-custom-loader.args | 3 + .../bhyvexml2argv-custom-loader.ldargs | 1 + .../bhyvexml2argv-custom-loader.xml | 24 +++ .../bhyvexml2argv-disk-cdrom-grub.args | 3 + .../bhyvexml2argv-disk-cdrom-grub.devmap | 1 + .../bhyvexml2argv-disk-cdrom-grub.ldargs | 2 + .../bhyvexml2argv-disk-cdrom-grub.xml | 23 +++ .../bhyvexml2argv-disk-cdrom.ldargs | 1 + .../bhyvexml2argv-disk-virtio.ldargs | 1 + .../bhyvexml2argv-grub-defaults.args | 3 + .../bhyvexml2argv-grub-defaults.devmap | 1 + .../bhyvexml2argv-grub-defaults.ldargs | 2 + .../bhyvexml2argv-grub-defaults.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs | 1 + .../bhyvexml2argv-serial-grub.args | 4 + .../bhyvexml2argv-serial-grub.devmap | 1 + .../bhyvexml2argv-serial-grub.ldargs | 2 + .../bhyvexml2argv-serial-grub.xml | 26 +++ .../bhyvexml2argvdata/bhyvexml2argv-serial.ldargs | 1 + tests/bhyvexml2argvtest.c | 65 ++++++- 33 files changed, 532 insertions(+), 39 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.devmap create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs -- 1.9.3

2 8

[libvirt] [PATCH] Teach virt-aa-helper to use TEMPLATE.qemu if the domain is kvm or kqemu
by Cédric Bosdonnat 30 Oct '14

30 Oct '14

Without this patch, kvm and kqemu domains confined with apparmor can't start due to virt-aa-helper not finding TEMPLATE.kvm or TEMPLATE.kqemu. This patch points all kvm-related drivers to TEMPLATE.qemu. --- src/security/virt-aa-helper.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 9afc8db..6b95fdb 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -341,15 +341,25 @@ create_profile(const char *profile, const char *profile_name, int tlen, plen; int fd; int rc = -1; + const char *driver_name = NULL; if (virFileExists(profile)) { vah_error(NULL, 0, _("profile exists")); goto end; } + switch (virtType) { + case VIR_DOMAIN_VIRT_QEMU: + case VIR_DOMAIN_VIRT_KQEMU: + case VIR_DOMAIN_VIRT_KVM: + driver_name = "qemu"; + break; + default: + driver_name = virDomainVirtTypeToString(virtType); + } if (virAsprintfQuiet(&template, "%s/TEMPLATE.%s", APPARMOR_DIR "/libvirt", - virDomainVirtTypeToString(virtType)) < 0) { + driver_name) < 0) { vah_error(NULL, 0, _("template name exceeds maximum length")); goto end; } -- 1.8.4.5

3 3

[libvirt] [PATCH] vbox: don't register NULL driver
by Martin Kletzander 30 Oct '14

30 Oct '14

We were missing check for the fact that the storage driver was found and in case there is no vbox storage driver available, daemon raised the following error each start: error : virRegisterStorageDriver:592 : driver in virRegisterStorageDriver must not be NULL Fixing this makes the condition unified with networkDriver registration in vbox as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/vbox/vbox_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index c64d2d6..b2e35e9 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -74,7 +74,7 @@ int vboxStorageRegister(void) if (VBoxCGlueInit(&uVersion) == 0) storageDriver = vboxGetStorageDriver(uVersion); - if (virRegisterStorageDriver(storageDriver) < 0) + if (storageDriver && virRegisterStorageDriver(storageDriver) < 0) return -1; return 0; } -- 2.1.2

2 1

[libvirt] [PATCH] conf: forbid negative values in virDomainParseScaledValue
by Martin Kletzander 30 Oct '14

30 Oct '14

It makes sense for none of the callers to have negative value as an output and, fortunately, if anyone tried defining domain with negative memory or any other value parsed by virDomainParseScaledValue(), the resulting value was 0. That means we can error out during parsing as it won't break anything. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1155843 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- "it won't break anything" -- famous last words? src/conf/domain_conf.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39befb0..a351382 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6334,28 +6334,34 @@ virDomainParseScaledValue(const char *xpath, { char *xpath_full = NULL; char *unit = NULL; + char *bytes_str = NULL; int ret = -1; unsigned long long bytes; *val = 0; if (virAsprintf(&xpath_full, "string(%s)", xpath) < 0) goto cleanup; - ret = virXPathULongLong(xpath_full, ctxt, &bytes); - if (ret < 0) { - if (ret == -2) - virReportError(VIR_ERR_XML_ERROR, - _("could not parse element %s"), - xpath); - else if (required) + + bytes_str = virXPathString(xpath_full, ctxt); + if (!bytes_str) { + if (!required) { + ret = 0; + } else { virReportError(VIR_ERR_XML_ERROR, _("missing element %s"), xpath); - else - ret = 0; + } goto cleanup; } VIR_FREE(xpath_full); + if (virStrToLong_ullp(bytes_str, NULL, 10, &bytes) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid value '%s' for element '%s'"), + bytes_str, xpath); + goto cleanup; + } + if (virAsprintf(&xpath_full, "string(%s/@unit)", xpath) < 0) goto cleanup; unit = virXPathString(xpath_full, ctxt); @@ -6366,6 +6372,7 @@ virDomainParseScaledValue(const char *xpath, *val = bytes; ret = 1; cleanup: + VIR_FREE(bytes_str); VIR_FREE(xpath_full); VIR_FREE(unit); return ret; -- 2.1.2

2 2

[libvirt] [PATCH] Fix memory leak in cmdNetworkDHCPLeases
by Luyao Huang 30 Oct '14

30 Oct '14

After use cidr_format in function virAsprintf and vshPrintExtra, need free cidr_format. Fix the following memory leak from valgrind, like: 18 bytes in 1 blocks are definitely lost in loss record 41 of 192 at 0x4C29BBD: malloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x85CE36F: __vasprintf_chk (vasprintf_chk.c:80) by 0x4EE52D5: UnknownInlinedFun (stdio2.h:210) by 0x4EE52D5: virVasprintfInternal (virstring.c:459) by 0x4EE53CA: virAsprintfInternal (virstring.c:480) by 0x14FE96: cmdNetworkDHCPLeases (virsh-network.c:1378) by 0x13006B: vshCommandRun (virsh.c:1915) by 0x12A9E1: main (virsh.c:3699) Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- tools/virsh-network.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 90392d3..8ff6fd8 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1381,6 +1381,8 @@ cmdNetworkDHCPLeases(vshControl *ctl, const vshCmd *cmd) expirytime, EMPTYSTR(lease->mac), EMPTYSTR(typestr), cidr_format, EMPTYSTR(lease->hostname), EMPTYSTR(lease->clientid)); + + VIR_FREE(cidr_format); } ret = true; -- 1.8.3.1

3 3

[libvirt] [PATCH 1/2] virnetdev: stub virNetDev{Add, Del}Multi on FreeBSD
by Roman Bogorodskiy 30 Oct '14

30 Oct '14

Currently, build fails on FreeBSD because its struct ifreq does not have ifr_hwaddr member. In order to fix that, check if this member is present, otherwise fall back to the stub version of the virNetDev{Add,Del}Multi functions. --- configure.ac | 3 ++- src/util/virnetdev.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f7b02ff..31c5fa2 100644 --- a/configure.ac +++ b/configure.ac @@ -2694,7 +2694,8 @@ AC_SUBST([ws_plugindir]) # Check for Linux vs. BSD ifreq members AC_CHECK_MEMBERS([struct ifreq.ifr_newname, struct ifreq.ifr_ifindex, - struct ifreq.ifr_index], + struct ifreq.ifr_index, + struct ifreq.ifr_hwaddr], [], [], [#include <sys/socket.h> #include <net/if.h> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 127bfb2..ac82a74 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1971,7 +1971,8 @@ virNetDevGetLinkInfo(const char *ifname, #endif /* defined(__linux__) */ -#if defined(SIOCADDMULTI) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCADDMULTI) && defined(HAVE_STRUCT_IFREQ) && \ + defined(HAVE_STRUCT_IFREQ_IFR_HWADDR) /** * virNetDevAddMulti: * @ifname: interface name to which to add multicast MAC address @@ -2019,7 +2020,8 @@ int virNetDevAddMulti(const char *ifname ATTRIBUTE_UNUSED, } #endif -#if defined(SIOCDELMULTI) && defined(HAVE_STRUCT_IFREQ) +#if defined(SIOCDELMULTI) && defined(HAVE_STRUCT_IFREQ) && \ + defined(HAVE_STRUCT_IFREQ_IFR_HWADDR) /** * virNetDevDelMulti: * @ifname: interface name from which to delete the multicast MAC address -- 2.0.2

2 5

[libvirt] [PATCH v2 0/3] virnetdev: Resolve some Coverity issues
by John Ferlan 30 Oct '14

30 Oct '14

A reposting of a patch into 3 separate patches for each of the Coverity issues found from commit id 'cc0e8c24'. The changes were already ACK'd, but I figured I'd repost anyway. v1: http://www.redhat.com/archives/libvir-list/2014-October/msg01012.html John Ferlan (3): virnetdev: Resolve Coverity DEADCODE virnetdev: Resolve Coverity FORWARD_NULL virnetdev: Resolve Coverity RESOURCE_LEAK src/util/virnetdev.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH] virnetdev: Resolve some Coverity issues
by John Ferlan 29 Oct '14

29 Oct '14

Coverity discovered a few issues with recent changes in this module from commit id 'cc0e8c24'. This patches fixes those. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/util/virnetdev.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 127bfb2..8bd1af4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -59,15 +59,20 @@ VIR_LOG_INIT("util.netdev"); #define PROC_NET_DEV_MCAST "/proc/net/dev_mcast" #define MAX_MCAST_SIZE 50*14336 #define VIR_MCAST_NAME_LEN (IFNAMSIZ + 1) -#define VIR_MCAST_INDEX_TOKEN_IDX 0 -#define VIR_MCAST_NAME_TOKEN_IDX 1 -#define VIR_MCAST_USERS_TOKEN_IDX 2 -#define VIR_MCAST_GLOBAL_TOKEN_IDX 3 -#define VIR_MCAST_ADDR_TOKEN_IDX 4 #define VIR_MCAST_NUM_TOKENS 5 #define VIR_MCAST_TOKEN_DELIMS " \n" #define VIR_MCAST_ADDR_LEN (VIR_MAC_HEXLEN + 1) +typedef enum { + VIR_MCAST_TYPE_INDEX_TOKEN, + VIR_MCAST_TYPE_NAME_TOKEN, + VIR_MCAST_TYPE_USERS_TOKEN, + VIR_MCAST_TYPE_GLOBAL_TOKEN, + VIR_MCAST_TYPE_ADDR_TOKEN, + + VIR_MCAST_TYPE_LAST +} virMCastType; + typedef struct _virNetDevMcastEntry virNetDevMcastEntry; typedef virNetDevMcastEntry *virNetDevMcastEntryPtr; struct _virNetDevMcastEntry { @@ -2076,7 +2081,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) char *saveptr; char *endptr; - for (ifindex = 0, next = buf; ifindex < VIR_MCAST_NUM_TOKENS; ifindex++, + for (ifindex = 0, next = buf; ifindex < VIR_MCAST_TYPE_LAST; ifindex++, next = NULL) { token = strtok_r(next, VIR_MCAST_TOKEN_DELIMS, &saveptr); @@ -2087,8 +2092,8 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) return -1; } - switch (ifindex) { - case VIR_MCAST_INDEX_TOKEN_IDX: + switch ((virMCastType)ifindex) { + case VIR_MCAST_TYPE_INDEX_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse interface index from '%s'"), @@ -2098,7 +2103,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->index = num; break; - case VIR_MCAST_NAME_TOKEN_IDX: + case VIR_MCAST_TYPE_NAME_TOKEN: if (virStrncpy(mcast->name, token, strlen(token), VIR_MCAST_NAME_LEN) == NULL) { virReportSystemError(EINVAL, @@ -2107,7 +2112,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) return -1; } break; - case VIR_MCAST_USERS_TOKEN_IDX: + case VIR_MCAST_TYPE_USERS_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse users from '%s'"), @@ -2117,7 +2122,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->users = num; break; - case VIR_MCAST_GLOBAL_TOKEN_IDX: + case VIR_MCAST_TYPE_GLOBAL_TOKEN: if (virStrToLong_i(token, &endptr, 10, &num) < 0) { virReportSystemError(EINVAL, _("Failed to parse users from '%s'"), @@ -2127,7 +2132,7 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) } mcast->global = num; break; - case VIR_MCAST_ADDR_TOKEN_IDX: + case VIR_MCAST_TYPE_ADDR_TOKEN: if (virMacAddrParseHex((const char*)token, &mcast->macaddr) < 0) { virReportSystemError(EINVAL, @@ -2135,7 +2140,9 @@ static int virNetDevParseMcast(char *buf, virNetDevMcastEntryPtr mcast) buf); } break; - default: + + /* coverity[dead_error_begin] */ + case VIR_MCAST_TYPE_LAST: break; } } @@ -2194,9 +2201,7 @@ static int virNetDevGetMcastList(const char *ifname, ret = 0; cleanup: - if (ret < 0) - virNetDevMcastListClear(mcast); - + VIR_FREE(buf); VIR_FREE(entry); return ret; -- 1.9.3

2 2

[libvirt] [PATCHv2 0/2] Extend NIC_RX_FILTER_CHANGED event handler to process multicast list
by akrowiak＠linux.vnet.ibm.com 29 Oct '14

29 Oct '14

From: Tony Krowiak <akrowiak(a)linux.vnet.ibm.com> This patch set extends the handler for qemu's NIC_RX_FILTER_CHANGED event. It adds code to compare the old and new multicast MAC address lists and programs the macvtap filters to match the guest. Changes from V1: Responded to review comments from Laine Stump and Eric Blake Tony Krowiak (2): util: Functions to update host network device's multicast filter qemu: change macvtap multicast list in response to NIC_RX_FILTER_CHANGED

5 8

[libvirt] [PATCH] qemu: better error message when block job can't succeed
by Eric Blake 29 Oct '14

29 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1140981 reports that the qemu-kvm shipped as part of RHEL 7.0 intentionally cripples block jobs by removing the 'block-stream' QMP command, but that our probe for whether block jobs work was merely whether 'block-job-cancel' exists. Meanwhile, older qemu spelled the two commands block_stream and block_job_cancel. We know of no qemu build that has block-stream while lacking block-job-cancel, so it is easiest to change our witness to the command that starts a job rather than ends one. On RHEL, this results in changing the message from an ugly: error: Requested operation is not valid: Command 'block-stream' is not found to a nicer: error: unsupported configuration: block jobs not supported with this qemu binary * src/qemu/qemu_capabilities.h (QEMU_CAPS_BLOCKJOB_SYNC): Tweak comment. * src/qemu/qemu_capabilities.c (virQEMUCapsCommands): Look for stream rather than cancel when determining the flavor of block jobs supported. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6fcb5c7..b6c0f1b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1422,8 +1422,8 @@ struct virQEMUCapsStringFlags { struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "system_wakeup", QEMU_CAPS_WAKEUP }, { "transaction", QEMU_CAPS_TRANSACTION }, - { "block_job_cancel", QEMU_CAPS_BLOCKJOB_SYNC }, - { "block-job-cancel", QEMU_CAPS_BLOCKJOB_ASYNC }, + { "block_stream", QEMU_CAPS_BLOCKJOB_SYNC }, + { "block-stream", QEMU_CAPS_BLOCKJOB_ASYNC }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-kvm", QEMU_CAPS_KVM }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0214f30..c0e2172 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -127,8 +127,8 @@ typedef enum { QEMU_CAPS_SCSI_DISK_CHANNEL = 87, /* Is scsi-disk.channel available? */ QEMU_CAPS_SCSI_BLOCK = 88, /* -device scsi-block */ QEMU_CAPS_TRANSACTION = 89, /* transaction monitor command */ - QEMU_CAPS_BLOCKJOB_SYNC = 90, /* RHEL 6.2 block_job_cancel */ - QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* qemu 1.1 block-job-cancel */ + QEMU_CAPS_BLOCKJOB_SYNC = 90, /* old block_job_cancel, block_stream */ + QEMU_CAPS_BLOCKJOB_ASYNC = 91, /* new block-job-cancel, block-stream */ QEMU_CAPS_SCSI_CD = 92, /* -device scsi-cd */ QEMU_CAPS_IDE_CD = 93, /* -device ide-cd */ QEMU_CAPS_NO_USER_CONFIG = 94, /* -no-user-config */ -- 1.9.3

2 2

Re: [libvirt] Entering freeze and release of cadidate release 1 of 1.2.10
by Conrad Meyer 29 Oct '14

29 Oct '14

Hi all, The recent commit with SHA1 cc0e8c244d080f56392278e836cc378ba848e7aa, "util: Functions to update host network device's multicast filter," breaks the build on FreeBSD, so please address this before 1.2.10 release. Here is the output from Clang: CC util/libvirt_util_la-virnetdev.lo util/virnetdev.c:1995:9: error: no member named 'ifr_hwaddr' in 'struct ifreq' ifr.ifr_hwaddr.sa_family = AF_UNSPEC; ~~~ ^ util/virnetdev.c:1996:52: error: no member named 'ifr_hwaddr' in 'struct ifreq' virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); ~~~ ^ util/virnetdev.c:2043:9: error: no member named 'ifr_hwaddr' in 'struct ifreq' ifr.ifr_hwaddr.sa_family = AF_UNSPEC; ~~~ ^ util/virnetdev.c:2044:52: error: no member named 'ifr_hwaddr' in 'struct ifreq' virMacAddrGetRaw(macaddr, (unsigned char *)ifr.ifr_hwaddr.sa_data); ~~~ ^ 4 errors generated. Thanks, Conrad

3 3

[libvirt] [PATCH for 1.2.10 0/2] Fix crash when parsing backing chain URI with transport
by Peter Krempa 29 Oct '14

29 Oct '14

See patch 1 for explanation. Peter Krempa (2): storage: Fix crash when parsing backing store URI with schema test: Add test to verify helpers used for backing file name parsing src/util/virstoragefile.c | 10 +++++----- tests/virstoragetest.c | 31 +++++++++++++++++++++++++------ tests/virstringtest.c | 3 +++ tests/viruritest.c | 1 + 4 files changed, 34 insertions(+), 11 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH 0/7] static zero initialization
by Eric Blake 29 Oct '14

29 Oct '14

Based on a comment I just made while reviewing Dan's patches, we might as well adopt a consistent style of relying on the C guarantee that static variables are automatically zero-initialized without any effort on our part. Eric Blake (7): audit: use bool for audit log choice maint: avoid static zero init in core files maint: avoid static zero init in tools maint: avoid static zero init in tests maint: avoid static zero init in helpers maint: avoid static zero init in drivers maint: add syntax check to prohibit static zero init cfg.mk | 8 ++++++++ daemon/libvirtd.c | 2 +- src/conf/nwfilter_conf.c | 2 +- src/cpu/cpu_x86.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/libvirt.c | 18 +++++++++--------- src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 2 +- src/locking/lock_driver_lockd.c | 4 ++-- src/locking/lock_driver_sanlock.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/network/bridge_driver.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/openvz/openvz_util.c | 4 ++-- src/phyp/phyp_driver.c | 8 +++++--- src/qemu/qemu_driver.c | 5 +++-- src/remote/remote_driver.c | 2 +- src/rpc/virnetserver.c | 4 ++-- src/security/security_selinux.c | 2 +- src/test/test_driver.c | 2 +- src/uml/uml_driver.c | 2 +- src/util/viralloc.c | 10 +++++----- src/util/viraudit.c | 4 ++-- src/util/viraudit.h | 4 ++-- src/util/virdbus.c | 4 ++-- src/util/virevent.c | 14 +++++++------- src/util/virfile.c | 2 +- src/util/virlog.c | 16 ++++++++-------- src/util/virnetlink.c | 2 +- src/util/virprocess.c | 3 +-- src/util/virthread.h | 4 ++-- src/vbox/vbox_XPCOMCGlue.c | 4 ++-- src/vbox/vbox_tmpl.c | 2 +- src/xen/xen_driver.c | 4 ++-- src/xen/xen_hypervisor.c | 4 ++-- tests/eventtest.c | 6 +++--- tests/testutils.c | 12 ++++++------ tests/virhostdevtest.c | 2 +- tests/virportallocatortest.c | 2 +- tests/virscsitest.c | 2 +- tools/virsh-console.c | 5 +---- tools/virsh-domain.c | 2 +- tools/virsh.c | 4 ++-- tools/virt-host-validate-common.c | 4 ++-- 45 files changed, 102 insertions(+), 95 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH v2 0/3] Resolve libvirtd crash matching scsi_host
by John Ferlan 29 Oct '14

29 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1146837 Rewrite the v1 patch to take a different method to attack the problem. Expose the getHostNumber from scsi check/startup/refresh in the form of virGetSCSIHostNumber. Additionally, expose part of the getAdapterName code in the form of virGetSCSIHostNameByParentaddr. Then use the two functions to determine whether the incoming def matches any of the defined pool defs. v1 is here: http://www.redhat.com/archives/libvir-list/2014-September/msg01746.html John Ferlan (3): virutil: Introduce virGetSCSIHostNumber virutil: Introduce virGetSCSIHostNameByParentaddr storage_conf: Resolve libvirtd crash matching scsi_host src/conf/storage_conf.c | 69 ++++++++++++++---------- src/libvirt_private.syms | 2 + src/storage/storage_backend_scsi.c | 59 ++++----------------- src/util/virutil.c | 106 +++++++++++++++++++++++++++++++++++++ src/util/virutil.h | 10 ++++ 5 files changed, 170 insertions(+), 76 deletions(-) -- 1.9.3

3 13

[libvirt] [PowerPC PATCH 0/3 v4] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 29 Oct '14

29 Oct '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. Series Summary: ========== Patch 1/3 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/3 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/3 : Improve PVR handling to fall back to cpu generation. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. New xml semantics are introduced to signify this type. Corresponding documentation is also added. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html v3 : http://www.mail-archive.com/libvir-list@redhat.com/msg104010.html Changes since v3: i) Added documentation for describing 'compat' mode to formatdomain.html.in ( Thanks for pointing this out, Michal ) ii) Minor corrections ( Indentation fix; Added check for PPC64LE in virDomainVideoDefaultType ) Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 7

[libvirt] [PATCH] src/Makefile.am: Add forgotten backslash
by Michal Privoznik 29 Oct '14

29 Oct '14

As I've pushed 5892944f I haven't noticed one small nitpick. There was this backslash missing on the line 1231 in the enumeration of libraries to be added to vbox storage driver. This resulted in nondeterministic build which sometimes succeeded and sometimes failed. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5b81432..d8fe624 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1228,7 +1228,7 @@ libvirt_driver_vbox_storage_impl_la_CFLAGS = \ libvirt_driver_vbox_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_vbox_storage_impl_la_LIBADD = $(DLOPEN_LIBS) \ $(MSCOM_LIBS) \ - $(LIBXML_LIBS) + $(LIBXML_LIBS) \ libvirt_driver_vbox_impl.la libvirt_driver_vbox_storage_impl_la_SOURCES = $(VBOX_STORAGE_DRIVER_SOURCES) endif WITH_VBOX -- 2.0.4

2 1

[libvirt] [PATCH] util: fix libvirtd crash caused by virStorageNetHostTransportTypeFromString
by Shanzhi Yu 29 Oct '14

29 Oct '14

When split uri->scheme into two strings with "+", the second one will be "rdma://server/..", pass it to virStorageNetHostTransportTypeFromString will lead libvirtd crash. So a second virStringSplit call is needed. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1156288 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/util/virstoragefile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 960aa23..795c188 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2144,6 +2144,9 @@ virStorageSourceParseBackingURI(virStorageSourcePtr src, goto cleanup; } + if (!(scheme = virStringSplit(scheme[1], ":", 2))) + goto cleanup; + if (scheme[1] && (src->hosts->transport = virStorageNetHostTransportTypeFromString(scheme[1])) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 1.9.3

3 3

[libvirt] [PATCH v2 0/3] add nodeset check in numatune
by Chen Fan 29 Oct '14

29 Oct '14

when setting elements memnode and nodeset in attribute numatune more than the host nodes in XML file, VM boot should fail. so add check for that. Chen Fan (3): numatune: add check for numatune nodeset range lxc controller: add check for numatune virnuma: remove redundant check for numanode src/conf/numatune_conf.c | 21 ------- src/conf/numatune_conf.h | 19 ++++++ src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 3 +- src/qemu/qemu_command.c | 3 + src/qemu/qemu_command.h | 1 + src/util/virnuma.c | 70 +++++++++++++++++----- src/util/virnuma.h | 2 + ...rgv-numatune-static-nodeset-exceed-hostnode.xml | 35 +++++++++++ tests/qemuxml2argvmock.c | 9 +++ tests/qemuxml2argvtest.c | 1 + 11 files changed, 128 insertions(+), 37 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-numatune-static-nodeset-exceed-hostnode.xml -- 1.9.3

3 7

[libvirt] [PATCH 0/2] libssh2 connection fixes
by Cédric Bosdonnat 29 Oct '14

29 Oct '14

Hi guys, Here are 2 trivial patches to fixes issues connecting using libssh2. The first one fixes a -1 use with a size_t, and the second one discards callbacks with no prompt called by the SSH server. Cédric Bosdonnat (2): Fix test wanting a negative size_t Fix handling keyboard-interactive callbacks for libssh2 src/rpc/virnetsshsession.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 1.8.4.5

3 5

[libvirt] [PATCH 0/2] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 29 Oct '14

29 Oct '14

2 6

[libvirt] [PATCH v3 0/7] hotplug: Fix libvirtd crash on qemu-attached guest
by John Ferlan 29 Oct '14

29 Oct '14

v2 is here: http://www.redhat.com/archives/libvir-list/2014-September/msg01575.html As Michal pointed out in his review - other devices could have the same issue - so take care of each of them separately (I already knew the answer to my last question...) Totally different approach this time - rather than error out, follow the example I from the Controller Detach code which will generate an alias for the device (although it did miss one minor check to see if it was already set leading to a potential memory leak since the alias code would overwrite whatever was there). Note: In a way 1/7 was already ACK'd - I just hadn't separated it yet for a push and wanted to keep these closer together when/if they were pushed. Whether 7/7 is now necessary is debateable - I keep it only for completeness and environment setup in much the same way the start code handles aliases. John Ferlan (7): virsh: Adjust the text in man page regarding qemu-attach hotplug: Check for alias in controller detach hotplug: Check for alias in disk detach hotplug: Check for alias in hostdev detach hotplug: Check for alias in chrdev detach hotplug: Check for alias in net detach qemu-attach: Assign device aliases src/qemu/qemu_driver.c | 3 +++ src/qemu/qemu_hotplug.c | 28 +++++++++++++++++++++++++++- tools/virsh.pod | 5 +++-- 3 files changed, 33 insertions(+), 3 deletions(-) -- 1.9.3

2 11

[libvirt] [PATCH] remote: fix jump depends on uninitialised value
by Jincheng Miao 29 Oct '14

29 Oct '14

Currently remote driver only initializes partial fields of remote_connect_get_all_domain_stats_args. But xdr_array() will check the uninitialised field 'doms_val'. For safty reason, memset all fields of args is better. Fix the following error from valgrind, like: ==30515== 1 errors in context 1 of 3: ==30515== Conditional jump or move depends on uninitialised value(s) ==30515== at 0x85E9402: xdr_array (xdr_array.c:88) ==30515== by 0x4FD8FC9: xdr_remote_connect_get_all_domain_stats_args (remote_protocol.c:6473) ==30515== by 0x4FE72F2: virNetMessageEncodePayload (virnetmessage.c:350) ==30515== by 0x4FDD21C: virNetClientProgramCall (virnetclientprogram.c:326) ==30515== by 0x4FB4D01: callFull.isra.2 (remote_driver.c:6667) ==30515== by 0x4FCBD45: call (remote_driver.c:6689) ==30515== by 0x4FCBD45: remoteConnectGetAllDomainStats (remote_driver.c:7793) ==30515== by 0x4FA0E75: virConnectGetAllDomainStats (libvirt.c:21678) ==30515== by 0x147FD1: cmdDomstats (virsh-domain-monitor.c:2148) ==30515== by 0x13006B: vshCommandRun (virsh.c:1915) ==30515== by 0x12A9E1: main (virsh.c:3699) Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/remote/remote_driver.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 067f2d0..b8d90ed 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7779,6 +7779,8 @@ remoteConnectGetAllDomainStats(virConnectPtr conn, virDomainStatsRecordPtr elem = NULL; virDomainStatsRecordPtr *tmpret = NULL; + memset(&args, 0, sizeof(args)); + if (ndoms) { if (VIR_ALLOC_N(args.doms.doms_val, ndoms) < 0) goto cleanup; -- 1.7.1

2 1

[libvirt] [PATCH] virsh: Improve the job type reported of virsh cmd blockcommit
by Shanzhi Yu 29 Oct '14

29 Oct '14

When begin a blockcommit job(active) with virsh, it will report "Block Commit started"(it really donesn't matter much), but for more preciese it should report "Active Block Commit started" Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- tools/virsh-domain.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 94ae3d3..3416e31 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1723,9 +1723,15 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) goto cleanup; if (!blocking) { - vshPrint(ctl, "%s", _("Block Commit started")); - ret = true; - goto cleanup; + if (active) { + vshPrint(ctl, "%s", _("Active Block Commit started")); + ret = true; + goto cleanup; + } else { + vshPrint(ctl, "%s", _("Block Commit started")); + ret = true; + goto cleanup; + } } while (blocking) { -- 1.9.3

2 1

[libvirt] [PATCH 0/2] v1.1 bugfix: support dhcp network interfaces
by Gene Czarcinski 29 Oct '14

29 Oct '14

v1.1 adds some documentation changes. Support for a network such as -N dhcp,source=default was not working in that dhclient was not being started. Although I am not sure what the real problem is, the solution is to use g_spawn_sync() instead of g_spawn_async() to start /sbin/dhclient. The second patch addes "-v" to the dhclient arguments to improve debugging info. The dhclient into will be in /var/log/messages the Secure Contrainer host system and not in the container itself. Gene Czarcinski (2): v1.1 for dhclient use g_spawn_sync() v1.1 add -v to dhclient parameter arguments libvirt-sandbox/libvirt-sandbox-init-common.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 1.9.3

3 5

[libvirt] [PATCH] Renamed internal __mon_yday into __vir_mon_yday to avoid conflicts
by Cédric Bosdonnat 28 Oct '14

28 Oct '14

libc has another constant with the same name, which leads to redefinition error when building against static libvirt --- src/util/virtime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index acbec41..7b3ec44 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -105,7 +105,7 @@ int virTimeFieldsNowRaw(struct tm *fields) #define DIV(a, b) ((a) / (b) - ((a) % (b) < 0)) #define LEAPS_THRU_END_OF(y) (DIV (y, 4) - DIV (y, 100) + DIV (y, 400)) -const unsigned short int __mon_yday[2][13] = { +const unsigned short int __vir_mon_yday[2][13] = { /* Normal years. */ { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, /* Leap years. */ @@ -160,7 +160,7 @@ void virTimeFieldsThen(unsigned long long when, struct tm *fields) fields->tm_year = y - 1900; fields->tm_yday = days; - ip = __mon_yday[is_leap_year(y)]; + ip = __vir_mon_yday[is_leap_year(y)]; for (y = 11; days < (long int) ip[y]; --y) continue; days -= ip[y]; -- 1.8.4.5

3 2

[libvirt] [PATCH] qemu_agent: Produce more readable error messages
by Michal Privoznik 28 Oct '14

28 Oct '14

Not every error message from qemu-ga has to have the 'class' field filled out. For instance, I've seen this error message lately: qemuAgentCheckError:1047 : unable to execute QEMU agent command \ {"execute":"guest-set-time"}: \ {"error":{"desc":"Invalid parameter type, expected: integer"}} However, this got translated into rather generic error message: internal error: unable to execute QEMU agent command 'guest-set-time': unknown QEMU command error So we've dropped better error message in favor of a generic one. This is due to our code which expects 'class' which is not present here. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_agent.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index fe38f6d..9f673bf 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1009,14 +1009,12 @@ static const char * qemuAgentStringifyError(virJSONValuePtr error) { const char *klass = virJSONValueObjectGetString(error, "class"); - const char *detail = NULL; + const char *detail = virJSONValueObjectGetString(error, "desc"); /* The QMP 'desc' field is usually sufficient for our generic - * error reporting needs. + * error reporting needs. However, if not present, translate + * the class into something readable. */ - if (klass) - detail = virJSONValueObjectGetString(error, "desc"); - if (!detail) detail = qemuAgentStringifyErrorClass(klass); -- 2.0.4

2 2

[libvirt] [PATCH python v2] fix libvirt headers list
by Dmitry Guryanov 28 Oct '14

28 Oct '14

Since libvirt.h has been split out, generator.py should be fixed accordingly. So add full list of header files. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- Changes in v2: * fix list format generator.py | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/generator.py b/generator.py index 01ab441..c66c6d4 100755 --- a/generator.py +++ b/generator.py @@ -29,6 +29,21 @@ import xml.sax debug = 0 onlyOverrides = False +libvirt_headers = [ + "libvirt", + "libvirt-domain", + "libvirt-domain-snapshot", + "libvirt-event", + "libvirt-host", + "libvirt-interface", + "libvirt-network", + "libvirt-nodedev", + "libvirt-nwfilter", + "libvirt-secret", + "libvirt-storage", + "libvirt-stream", +] + def getparser(): # Attach parser to an unmarshalling object. return both objects. target = docParser() @@ -112,9 +127,7 @@ class docParser(xml.sax.handler.ContentHandler): self.function_return_field = attrs['field'] elif tag == 'enum': # enums come from header files, hence virterror.h - if (attrs['file'] == "libvirt" or - attrs['file'] == "virterror" or - attrs['file'] == "virerror"): + if attrs['file'] in libvirt_headers + ["virerror", "virterror"]: enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -127,11 +140,8 @@ class docParser(xml.sax.handler.ContentHandler): if tag == 'function': # fuctions come from source files, hence 'virerror.c' if self.function is not None: - if (self.function_module == "libvirt" or - self.function_module == "event" or - self.function_module == "virevent" or - self.function_module == "virerror" or - self.function_module == "virterror"): + if self.function_module in libvirt_headers + \ + ["event", "virevent", "virerror", "virterror"]: function(self.function, self.function_descr, self.function_return, self.function_args, self.function_file, self.function_module, -- 1.9.3

2 1

[libvirt] [PATCH python] fix libvirt headers list
by Dmitry Guryanov 28 Oct '14

28 Oct '14

Since libvirt.h has been splitted out, generator.py should be fixed accordingly. So add full list of header files. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- generator.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/generator.py b/generator.py index 01ab441..5ecbed5 100755 --- a/generator.py +++ b/generator.py @@ -29,6 +29,19 @@ import xml.sax debug = 0 onlyOverrides = False +libvirt_headers = ["libvirt", + "libvirt-domain", + "libvirt-domain-snapshot", + "libvirt-event", + "libvirt-host", + "libvirt-interface", + "libvirt-network", + "libvirt-nodedev", + "libvirt-nwfilter", + "libvirt-secret", + "libvirt-storage", + "libvirt-stream",] + def getparser(): # Attach parser to an unmarshalling object. return both objects. target = docParser() @@ -112,9 +125,7 @@ class docParser(xml.sax.handler.ContentHandler): self.function_return_field = attrs['field'] elif tag == 'enum': # enums come from header files, hence virterror.h - if (attrs['file'] == "libvirt" or - attrs['file'] == "virterror" or - attrs['file'] == "virerror"): + if attrs['file'] in libvirt_headers + ["virerror", "virterror"]: enum(attrs['type'],attrs['name'],attrs['value']) elif attrs['file'] == "libvirt-lxc": lxc_enum(attrs['type'],attrs['name'],attrs['value']) @@ -127,11 +138,8 @@ class docParser(xml.sax.handler.ContentHandler): if tag == 'function': # fuctions come from source files, hence 'virerror.c' if self.function is not None: - if (self.function_module == "libvirt" or - self.function_module == "event" or - self.function_module == "virevent" or - self.function_module == "virerror" or - self.function_module == "virterror"): + if self.function_module in libvirt_headers + \ + ["event", "virevent", "virerror", "virterror"]: function(self.function, self.function_descr, self.function_return, self.function_args, self.function_file, self.function_module, -- 1.9.3

2 3

[libvirt] [PATCH 00/11] RFC: refactor internal driver architecture
by Daniel P. Berrange 28 Oct '14

28 Oct '14

Currently we have a bit of a craz setup for activating drivers for virConnectPtr. We iterate over the primary hypervisor drivers until one matches and activates. This bit is fine. Then we do the same for the network, storage, interface, etc secondary drivers. This is where the fun starts. In the case of the stateless drivers that run outside of libvirtd, they always want the secondary drivers to match the primary driver. Unfortunately if they don't register any dummy secondary driver they'll get given the reomte driver instead. The probing of secondary drivers is really unhelpful here. In the case of stateful drivers that run inside of libvirtd, there is (almost) always only one driver instance that they want to work with. So at best the probing of secondary drivers is a waste of time. With the increasing feature set though we're getting tight dependancies from the hypervisor driver to the secondary driver. eg QEMU depends on the specific network driver we have because it calls various internal APIs it exposes. We also have circular dependancy problems during libvirtd startup: https://www.redhat.com/archives/libvir-list/2014-January/msg01143.html There the storage driver needs a virConnectPtr instance in order to talk to the secret driver. At the same time the storage driver must run before the hypervisor driver because the hypervisor driver needs to use it for autostart of VMs. This is a horrible mess. The solution I think is to remove the concept of probing for secondary drivers entirely. Instead I suggest creating a struct virDriver { ... } which contains a pointer to virHypervisorDriver, virNetworkDriver, virInterfaceDriver, etc. now virConnectPtr will only reference the single virDriverPtr and when we open a hypervisor driver, we immediately get a full set of APIs for everything. This way all the hypervisor drivers will always know exactly what secondary driver they are working with. We'll be able to remove all the xxxPrivateData elements from the virConnectPtr. The stateless drivers can just access the main privateData. The stateful drivers can avoid any use of privateData at all - just access their global static variable with the driverState. This won't quite solve the circular dependancy problem in that mail thread above. By removing the directly reliance on the virConnectPtr driver table though, we'll be able to update the code more easily so it can fetch secrets directly and thus the storage driver wont need to do virConnectOpen("qemu:///system"). The patches that follow illustrate the first part of cleaning up use of the xxxPrivateData fields. This isn't complete but I wanted to show the direction it would go before I spend the time todo the full job. Incidentally our code is buggy as hell when it comes to using the xxxPrivateData fields. The PHyp driver actually abuses the networkPrivateData field for all its APIs. Alot of code wil directly access the global state driver state already ignoring the privateData fields already. So they are really more pain than they are worth and leading to buggy code. Daniel P. Berrange (11): Clean up remote driver connection open code Update remote driver to always use privateData Update ESX driver to always use privateData Update Hyper-V driver to always use privateData Move phyp internal info out of the header file Remove abuse of networkPrivateData in phyp driver Update Parallels driver to always use privateData Update Test driver to always use privateData Remove use of storagePrivateData from storage driver Remove use of networkPrivateData from network driver Remove use of networkPrivateData from netcf driver src/esx/esx_device_monitor.c | 6 +- src/esx/esx_interface_driver.c | 16 +- src/esx/esx_network_driver.c | 20 +- src/esx/esx_nwfilter_driver.c | 6 +- src/esx/esx_secret_driver.c | 6 +- src/esx/esx_storage_backend_iscsi.c | 26 +- src/esx/esx_storage_backend_vmfs.c | 36 +-- src/esx/esx_storage_driver.c | 44 ++-- src/hyperv/hyperv_device_monitor.c | 6 +- src/hyperv/hyperv_interface_driver.c | 6 +- src/hyperv/hyperv_network_driver.c | 6 +- src/hyperv/hyperv_nwfilter_driver.c | 6 +- src/hyperv/hyperv_secret_driver.c | 6 +- src/hyperv/hyperv_storage_driver.c | 6 +- src/interface/interface_backend_netcf.c | 71 ++---- src/network/bridge_driver.c | 435 ++++++++++++++------------------ src/parallels/parallels_network.c | 2 - src/parallels/parallels_storage.c | 12 +- src/parallels/parallels_utils.h | 1 + src/phyp/phyp_driver.c | 225 ++++++++--------- src/phyp/phyp_driver.h | 53 ---- src/remote/remote_driver.c | 153 +++-------- src/rpc/gendispatch.pl | 28 +- src/storage/storage_driver.c | 194 +++++++------- src/test/test_driver.c | 24 +- 25 files changed, 537 insertions(+), 857 deletions(-) -- 2.1.0

3 24

[libvirt] [PATCHv5 0/6] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 28 Oct '14

28 Oct '14

Drvbhyve hardcodes bhyveload(8) as the host bootloader for guests. bhyveload(8) loader only supports FreeBSD guests. This patch series adds <bootloader> and <bootloader_args> handling to bhyve_command, so libvirt can boot non-FreeBSD guests in Bhyve. Additionally, support for grub-bhyve(1)'s --cons-dev argument is added so that interactive GRUB menus can be manipulated with the domain-configured serial device. See patch logs for further details. Thanks, Conrad Changelog for v5: - Added loader arguments tests to the bhyvexml2argvtest harness - Dropped po/pot file changes per Daniel - Added bootloader, bootloader_args to domain XML schema - Added xml2argv tests for new bhyve bootloader handling - Added xml2argv test for grub with console device Conrad Meyer (6): bhyve: Support /domain/bootloader configuration for non-FreeBSD guests. bhyvexml2argv: Add loader argv tests. domaincommon.rng: Add bootloader, bootloader_arg to os=hvm schema for Bhyve bhyvexml2argv: Add tests for domain-configured bootloader, args bhyve: Add console support for grub-bhyve bootloader bhyvexml2argv: Add test for grub console support docs/drvbhyve.html.in | 94 ++++++++- docs/formatdomain.html.in | 4 +- docs/schemas/domaincommon.rng | 41 ++-- src/bhyve/bhyve_command.c | 215 +++++++++++++++++++-- src/bhyve/bhyve_command.h | 5 +- src/bhyve/bhyve_domain.c | 5 + src/bhyve/bhyve_domain.h | 1 + src/bhyve/bhyve_driver.c | 2 +- src/bhyve/bhyve_process.c | 13 +- .../bhyvexml2argv-acpiapic.ldargs | 1 + tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.args | 3 + .../bhyvexml2argv-bhyveload-explicitargs.ldargs | 1 + .../bhyvexml2argv-bhyveload-explicitargs.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-console.ldargs | 1 + .../bhyvexml2argv-custom-loader.args | 3 + .../bhyvexml2argv-custom-loader.ldargs | 1 + .../bhyvexml2argv-custom-loader.xml | 24 +++ .../bhyvexml2argv-disk-cdrom-grub.args | 3 + .../bhyvexml2argv-disk-cdrom-grub.ldargs | 2 + .../bhyvexml2argv-disk-cdrom-grub.xml | 23 +++ .../bhyvexml2argv-disk-cdrom.ldargs | 1 + .../bhyvexml2argv-disk-virtio.ldargs | 1 + .../bhyvexml2argv-grub-defaults.args | 3 + .../bhyvexml2argv-grub-defaults.ldargs | 2 + .../bhyvexml2argv-grub-defaults.xml | 23 +++ .../bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs | 1 + .../bhyvexml2argv-serial-grub.args | 4 + .../bhyvexml2argv-serial-grub.ldargs | 2 + .../bhyvexml2argv-serial-grub.xml | 26 +++ .../bhyvexml2argvdata/bhyvexml2argv-serial.ldargs | 1 + tests/bhyvexml2argvtest.c | 41 +++- 32 files changed, 527 insertions(+), 44 deletions(-) create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml create mode 100644 tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs -- 1.9.3

3 22

[libvirt] [PATCH] uitl: use "if and only if" instead of "iff" in some comments
by Shanzhi Yu 28 Oct '14

28 Oct '14

>From wiki "In writing, phrases commonly used, with debatable propriety. In logic formulae, logical symbols are used instead of these phrases" In some comments, we use "if and only if", so instead the logical sysbols with phrases in case someone mistaking it as a wrong spelling of "if" Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/util/virhash.c | 2 +- src/util/virstring.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/virhash.c b/src/util/virhash.c index e3c1880..e3bf1d3 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -65,7 +65,7 @@ struct _virHashTable { uint32_t seed; size_t size; size_t nbElems; - /* True iff we are iterating over hash entries. */ + /* True if and only if we are iterating over hash entries. */ bool iterating; /* Pointer to the current entry during iteration. */ virHashEntryPtr current; diff --git a/src/util/virstring.c b/src/util/virstring.c index 3dad9dd..974005d 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -519,7 +519,7 @@ virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) return NULL; ret = strncpy(dest, src, n); - /* strncpy NULL terminates iff the last character is \0. Therefore + /* strncpy NULL terminates if and only if the last character is \0. Therefore * force the last byte to be \0 */ dest[n] = '\0'; -- 1.9.3

2 2

[libvirt] [PATCH v2] qemu: better error message when block job can't succeed
by Eric Blake 28 Oct '14

28 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=1140981 reports that the qemu-kvm shipped as part of RHEL 7.0 intentionally cripples block jobs by removing the 'block-stream' QMP command, but that our probe for whether block jobs work was merely whether 'block-job-cancel' exists. As the crippling did not remove job cancellation, we end up trying the qemu command and printing an ugly message: error: Requested operation is not valid: Command 'block-stream' is not found even though our code base was already prepared to print a nice message that jobs are unsupported: error: unsupported configuration: block jobs not supported with this qemu binary Doing one more QMP probe lets us match the reality of crippled qemu. Yes, we really have to cater to two spellings of the command, due to older upstream qemu. * src/qemu/qemu_capabilities.h (QEMU_CAPS_BLOCK_STREAM): New probe. * src/qemu/qemu_capabilities.c (virQEMUCapsProbeQMPCommands): Kill block jobs with nice error message if qemu is crippled. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_capabilities.c | 11 +++++++++++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 12 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6fcb5c7..53cf05f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -271,6 +271,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "iothread", "migrate-rdma", "ivshmem", + "block-stream", ); @@ -1424,6 +1425,8 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "transaction", QEMU_CAPS_TRANSACTION }, { "block_job_cancel", QEMU_CAPS_BLOCKJOB_SYNC }, { "block-job-cancel", QEMU_CAPS_BLOCKJOB_ASYNC }, + { "block_stream", QEMU_CAPS_BLOCK_STREAM }, + { "block-stream", QEMU_CAPS_BLOCK_STREAM }, { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-kvm", QEMU_CAPS_KVM }, @@ -2195,6 +2198,14 @@ virQEMUCapsProbeQMPCommands(virQEMUCapsPtr qemuCaps, ncommands, commands); virQEMUCapsFreeStringList(ncommands, commands); + /* Some RHEL builds of qemu-kvm have 'block-job-cancel' but no way + * to start a block job; in that case, our error messages are + * nicer if we pretend there is no blockjob support at all. */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_STREAM)) { + virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKJOB_ASYNC); + virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKJOB_SYNC); + } + /* QMP add-fd was introduced in 1.2, but did not support * management control of set numbering, and did not have a * counterpart -add-fd command line option. We require the diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0214f30..6486b5b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -218,6 +218,7 @@ typedef enum { QEMU_CAPS_OBJECT_IOTHREAD = 176, /* -object iothread */ QEMU_CAPS_MIGRATE_RDMA = 177, /* have rdma migration */ QEMU_CAPS_DEVICE_IVSHMEM = 178, /* -device ivshmem */ + QEMU_CAPS_BLOCK_STREAM = 179, /* block-stream exists */ QEMU_CAPS_LAST, /* this must always be the last item */ } virQEMUCapsFlags; -- 1.9.3

1 1

[libvirt] [PATCH 0/3] lxc: Implement emulator pin APIs to set/get cpuset
by Wang Rui 28 Oct '14

28 Oct '14

We can specify cpuset for a container defined with the xml like <vcpu placement='static' cpuset='0-3'> to achieve cpu isolation. It works when container is started. But there is no implements we can use to either change or get cpuset. The following patches implement the lxc driver methods for virDomainPinEmulator and virDomainGetEmulatorPinInfo. Also support container startup with emulator affinity info in xml. After these patches, we can set and get libvirt_lxc cpuset. Yue Wenyuan (3): lxc: Implement pin emulator for container startup lxc: Implement emulator pin API in lxc driver lxc: Implement geting emulator pin info API in lxc driver src/lxc/lxc_cgroup.c | 88 ++++++++++++++++++++ src/lxc/lxc_cgroup.h | 7 ++ src/lxc/lxc_controller.c | 4 + src/lxc/lxc_driver.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 305 insertions(+) -- 1.7.12.4

3 9

[libvirt] [PATCH v2 00/12] parallels: rewrite driver with parallels SDK
by Dmitry Guryanov 28 Oct '14

28 Oct '14

This patch series replaces all code, which used prlctl command to interact with parallels cloud server with calls to parallels sdk functions. The model of this driver remain almost the same - in creates a list of virDomainObj objects on connect and then functions, which returns different information get info from this list. Changes in v2: * Rebase to latest libvirt sources * Use only "parallels" prefix for functions in parallelsDriver, so that make check will pass * Update privconn->domains in case we change something from current connection. Alexander Burluka (4): parallels: get domain info with SDK parallels: handle events from parallels server parallels: added function virDomainIsActive() parallels: Add domainCreateWithFlags() function. Dmitry Guryanov (8): parallels: move IS_CT macro to parallels_utils.h parallels: move parallelsDomNotFoundError to parallels_utils.h parallels: reimplement functions, which change domain state parallels: rewrite parallelsApplyConfig with SDK parallels: create VMs and containers with sdk parallels: refactor parallelsDomainDefineXML parallels: add cdroms support parallels: implement domainUndefine and domainUndefineFlags src/parallels/parallels_driver.c | 2456 ++++++++------------------------------ src/parallels/parallels_sdk.c | 2451 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 25 + src/parallels/parallels_utils.h | 11 + 4 files changed, 2957 insertions(+), 1986 deletions(-) -- 1.9.3

1 12

[libvirt] [PATCH 00/12] parallels: use SDK in parallels_driver.c
by Dmitry Guryanov 28 Oct '14

28 Oct '14

This patch series replaces all code, which used prlctl command to interact with parallels cloud server with calls to parallels sdk functions. The model of this driver remain almost the same - in creates a list of virDomainObj objects on connect and then functions, which returns different information get info from this list. But functions, which modify domains (change state, define or undefine domain) don't modify this list directly. On connect driver subscribes to event from PCS and modify the list from that events handler. So cached list of domains will be always up-to-date either after modifications from currect connection or after modifications by another tools (like prlctl) or libvirt connections. Alexander Burluka (4): parallels: get domain info with SDK parallels: handle events from parallels server parallels: added function virDomainIsActive() parallels: Add domainCreateWithFlags() function. Dmitry Guryanov (8): parallels: move IS_CT macro to parallels_utils.h parallels: move parallelsDomNotFoundError to parallels_utils.h parallels: reimplement functions, which change domain state parallels: rewrite parallelsApplyConfig with SDK parallels: create VMs and containers with sdk parallels: fix parallelsDomainDefineXML parallels: add cdroms support parallels: implement domainUndefine and domainUndefineFlags src/parallels/parallels_driver.c | 2448 +++++++------------------------------ src/parallels/parallels_sdk.c | 2456 ++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_sdk.h | 19 + src/parallels/parallels_utils.h | 11 + 4 files changed, 2939 insertions(+), 1995 deletions(-) -- 1.9.3

1 13

[libvirt] [PowerPC Patch v3] Libvirt CPU enhancements for Power KVM
by Prerna Saxena 28 Oct '14

28 Oct '14

This patch series is a collection of enhancements for PowerPC CPUs on PowerKVM. Series Summary: ========== Patch 1/3 : Introduce a new architecture 'ppc64le' for libvirt. Patch 2/3 : Add libvirt support for VMs running in 'compat' mode on Power KVM. Patch 3/3 : Optimize PVR comparison for PowerPC CPUs. Detail: ==== * PowerPC has traditionally been a Big-endian architecture. However, with PowerPC ISA version 2.07, it can run in Little-endian mode as well. IBM Power8 processors, compliant with ISA 2.07 allow launching VMs in little-endian mode. This is signified by 'ppc64le' architecture. Patch 1 adds this support to libvirt, to allow running VMs based on ppc64le architecture. * Patch 2,3 tweak libvirt to correctly model PowerPC CPUs based on recent PowerKVM implementation. PowerKVM permits VMs with vcpus in the following allowed modes : i) Host native mode: where the vcpu seen in the VM belongs to the same processor generation as the host. Example: A POWER7 host, conforming to PowerISA version 2.06, will run VMs with "power7" vcpus. ii) Binary Compatibility ("compat") mode: PowerISA allows processors to run VMs in binary compatibility ("compat") mode supporting an older version of ISA. As an example: In compatibility mode, a POWER7 host can run a "power6" VM, conforming to power ISA v2.05. Similarly, a POWER8 host can run a "power7" VM conforming to PowerISA v2.06. QEMU has recently added support to explicitly denote a VM running in compatibility mode through commits 6d9412ea & 8dfa3a5e85. Henceforth, VMs of type (i) will be invoked with the QEMU invocation "-cpu host", while VMs of type (ii) will be invoked using "-cpu host, compat=power6". Now, an explicit cpu selection using "-cpu POWER6" is not valid. Instead, the recommended practice is to use the matching compat mode, if the requested cpu type differs from the host. Patches 2-3 address various aspects of this change. * Patch 2 : Adds support for generating the correct command line for QEMU. New xml semantics are introduced to signify this type. * Patch 3 : PowerKVM vCPUs differ uniquely across generations ( such as power6, power7, power8). Each generation signifies a new PowerISA version that exhibits features unique to that generation. The higher order 16 bits of PVR denote the processor generation and the lower order 16 bits denote the cpu chip (sub)version. For all practical purposes of launching a VM, we care about the generation the vCPU will belong to, and not specifically the chip version. In fact, PowerKVM does not seek out specification of a unique chip version(such as POWER7_v2.3) for running a vCPU. This patch updates the libvirt PVR check to reflect this relationship. Changelog: ========= v1 : https://www.redhat.com/archives/libvir-list/2014-June/msg01338.html v2 : http://www.redhat.com/archives/libvir-list/2014-October/msg00351.html Changes since v2: i) CPU compat mode is now introduced under CPU mode 'host-model' as against the original proposal of using cpu mode'custom'. (Thanks for the tip, Dan.) ii) Patch 4/4 that renamed models in cpu_map.xml is dropped. Instead, CPU generations are added to cpu_map.xml as new listings. The PVR check in patch 3 of this series takes care of making the right match happen for compat mode. Regards, -- Prerna Saxena Linux Technology Centre, IBM Systems and Technology Lab, Bangalore, India

2 8

[libvirt] [python v2 PATCH] Add dict check for setTime and allow pass one valid parameter
by Luyao Huang 28 Oct '14

28 Oct '14

When pass None to time, it will set guest time to 0. When pass an empty dictionary, it will report error. Allow a one-element dictionary which contains 'seconds' or 'nseconds', setting JUST seconds will do the sane thing of passing 0 for nseconds, instead of erroring out. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- libvirt-override-virDomain.py | 2 ++ libvirt-override.c | 26 +++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index a50ec0d..d788657 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -69,6 +69,8 @@ def setTime(self, time=None, flags=0): """Set guest time to the given value. @time is a dict conatining 'seconds' field for seconds and 'nseconds' field for nanosecons """ + if time is None: + time = {'nseconds': 0, 'seconds': 0L} ret = libvirtmod.virDomainSetTime(self._o, time, flags) if ret == -1: raise libvirtError ('virDomainSetTime() failed', dom=self) return ret diff --git a/libvirt-override.c b/libvirt-override.c index a53b46f..5c016f9 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7798,8 +7798,28 @@ libvirt_virDomainSetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); py_dict_size = PyDict_Size(py_dict); + + if (py_dict_size == 1) { + PyObject *pyobj_seconds, *pyobj_nseconds; + + if ((pyobj_seconds = PyDict_GetItemString(py_dict, "seconds")) && + (libvirt_longlongUnwrap(pyobj_seconds, &seconds) < 0)) { + PyErr_Format(PyExc_LookupError, "malformed 'seconds'"); + goto cleanup; + } - if (py_dict_size == 2) { + if ((pyobj_nseconds = PyDict_GetItemString(py_dict, "nseconds")) && + (libvirt_uintUnwrap(pyobj_nseconds, &nseconds) < 0)) { + PyErr_Format(PyExc_LookupError, "malformed 'nseconds'"); + goto cleanup; + } + + if (!pyobj_nseconds && !pyobj_seconds) { + PyErr_Format(PyExc_LookupError, "Dictionary must contain " + "'seconds' or 'nseconds'"); + goto cleanup; + } + } else if (py_dict_size == 2) { PyObject *pyobj_seconds, *pyobj_nseconds; if (!(pyobj_seconds = PyDict_GetItemString(py_dict, "seconds")) || @@ -7813,9 +7833,9 @@ libvirt_virDomainSetTime(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyErr_Format(PyExc_LookupError, "malformed or missing 'nseconds'"); goto cleanup; } - } else if (py_dict_size > 0) { + } else if (py_dict_size >= 0) { PyErr_Format(PyExc_LookupError, "Dictionary must contain " - "'seconds' and 'nseconds'"); + "'seconds' or 'nseconds'"); goto cleanup; } -- 1.8.3.1

3 2

[libvirt] [PATCH 0/5] Guest filesystem information API
by Tomoki Sekiyama 27 Oct '14

27 Oct '14

Hi, This series implements a new virDomainGetFSInfo API, that returns a list of mounted filesystems information in the guest, collected via the guest agent. The returned info contains mountpoints and disk device alias named in libvirt, so we can know which mountpoints should be frozen by virDomainFSFreeze to take snapshots of a part of disks. --- Tomoki Sekiyama (5): Implement public API for virDomainGetFSInfo remote: Implement the remote protocol for virDomainGetFSInfo qemu: Implement the qemu driver for virDomainGetFSInfo qemu: add test for qemuAgentGetFSInfo virsh: expose virDomainGetFSInfo daemon/remote.c | 117 +++++++++++++++++++++ include/libvirt/libvirt.h.in | 21 ++++ src/conf/domain_conf.c | 71 +++++++++++++ src/conf/domain_conf.h | 6 + src/driver.h | 6 + src/libvirt.c | 68 ++++++++++++ src/libvirt_private.syms | 1 src/libvirt_public.syms | 6 + src/qemu/qemu_agent.c | 165 ++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 2 src/qemu/qemu_driver.c | 48 +++++++++ src/remote/remote_driver.c | 87 ++++++++++++++++ src/remote/remote_protocol.x | 32 ++++++ src/remote_protocol-structs | 21 ++++ src/rpc/gendispatch.pl | 1 tests/Makefile.am | 1 tests/qemuagentdata/qemuagent-fsinfo.xml | 27 +++++ tests/qemuagenttest.c | 118 +++++++++++++++++++++ tools/virsh-domain.c | 70 +++++++++++++ 19 files changed, 867 insertions(+), 1 deletion(-) create mode 100644 tests/qemuagentdata/qemuagent-fsinfo.xml -- Tomoki Sekiyama

2 12

[libvirt] [PATCH] qemu: forbid snapshot-delete --children-only on external snapshot
by Eric Blake 27 Oct '14

27 Oct '14

https://bugzilla.redhat.com/show_bug.cgi?id=956506 documents that given a domain where an internal snapshot parent has an external snapshot child, we lacked a safety check when trying to use the --children-only option to snapshot-delete: $ virsh start dom $ virsh snapshot-create-as dom internal $ virsh snapshot-create-as dom external --disk-only $ virsh snapshot-delete dom external error: Failed to delete snapshot external error: unsupported configuration: deletion of 1 external disk snapshots not supported yet $ virsh snapshot-delete dom internal --children error: Failed to delete snapshot internal error: unsupported configuration: deletion of 1 external disk snapshots not supported yet $ virsh snapshot-delete dom internal --children-only Domain snapshot internal children deleted While I'd still like to see patches that actually do proper external snapshot deletion, we should at least fix the inconsistency in the meantime. With this patch: $ virsh snapshot-delete dom internal --children-only error: Failed to delete snapshot internal error: unsupported configuration: deletion of 1 external disk snapshots not supported yet * src/qemu/qemu_driver.c (qemuDomainSnapshotDelete): Fix condition. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cd8d3c7..5eccacc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14812,7 +14812,8 @@ qemuDomainSnapshotDelete(virDomainSnapshotPtr snapshot, if (!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY) && virDomainSnapshotIsExternal(snap)) external++; - if (flags & VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN) + if (flags & (VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | + VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN_ONLY)) virDomainSnapshotForEachDescendant(snap, qemuDomainSnapshotCountExternal, &external); -- 1.9.3

2 2

[libvirt] [PATCH v5 0/7] qemu: Introduce support for new the block_set_io_throttle parameters add in the version 1.7 of qemu.
by Matthias Gatto 27 Oct '14

27 Oct '14

This series of patches add support for bps_max, bps_rd_max, bps_wr_max, bps_max, bps_rd_max, bps_wr_max, and iops_size in the functions qemuDomainSetBlockIoTune and qemuDomainGetBlockIoTune. The last patch add support for these parameters to the virsh blkdeviotune command. v2: spellfix v3: Merge patch 1/9,2/9,5/9 together. Change the capability detection.(patch 2/7 and 3/7). Try to make the usage of QEMU_NB_BLOCK_IO_TUNE_PARAM_MAX more explicit(patch 3/7). v4: Rebase on HEAD. Update qemu_driver to comply with Pavel's patchs.(patch 3/6) Remove the qemu_monitor_text modification.(remove old patch 5/7) v5: Split patch 1/6 in two. Add documentation for the new xml options (patch 2/7) Change (void) to ATTRIBUTE_UNUSED (patch 4/7) Capability detection of supportMaxOptions move before usage of supportMaxOptions Matthias Gatto (7): qemu: Add define for the news throttle options qemu: Modify the structure _virDomainBlockIoTuneInfo. qemu: Add the capability to detect if the qemu binary have the capability to use bps_max and friends qemu: Add bps_max and friends qemu driver qemu: Add bps_max and friends QMP suport qemu: add bps_max and friends to qemu command generation virsh: Add bps_max and friends to virsh docs/formatdomain.html.in | 25 ++++ docs/schemas/domaincommon.rng | 43 +++++++ include/libvirt/libvirt.h.in | 110 ++++++++++++++++ src/conf/domain_conf.c | 110 +++++++++++++++- src/conf/domain_conf.h | 7 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 57 +++++++- src/qemu/qemu_driver.c | 186 ++++++++++++++++++++++++++- src/qemu/qemu_monitor.c | 10 +- src/qemu/qemu_monitor.h | 6 +- src/qemu/qemu_monitor_json.c | 64 +++++++-- src/qemu/qemu_monitor_json.h | 6 +- tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemumonitorjsontest.c | 6 +- tools/virsh-domain.c | 119 +++++++++++++++++ tools/virsh.pod | 10 ++ 17 files changed, 730 insertions(+), 33 deletions(-) -- 1.8.3.1

2 14

[libvirt] [libvirt-tck PATCH] Fix PCI device hotplug tests
by Jim Fehlig 27 Oct '14

27 Oct '14

This patch fixes a few issues noted while enabling the TCK PCI device hotplug tests. First, the call to node device dettach function misses parameters, resulting in the following failure Failed test 'detached device from host OS' at /usr/share/libvirt-tck/tests/domain/250-pci-host-hotplug.t line 90. died: Usage: Sys::Virt::NodeDevice::dettach(dev, driversv, flags=0) at /usr/share/libvirt-tck/tests/domain/250-pci-host-hotplug.t line 90. Trivally fixed by adding the missing parameters when calling node device dettach function. Second, it appears qemu needs to reach some state of initialization before host device attach/detach works properly. Currently, the test fails when detaching the device from the guest, resetting it, and reattaching it to the host Failed test 'reset the host PCI device' at /usr/share/libvirt-tck/tests/domain/250-pci-host-hotplug.t line 110. died: Sys::Virt::Error (libvirt error code: 1, message: internal error: Not resetting active device 0000:03:00.1) Failed test 'reattached device to host OS' at /usr/share/libvirt-tck/tests/domain/250-pci-host-hotplug.t line 111. died: Sys::Virt::Error (libvirt error code: 55, message: Requested operation is not valid: PCI device 0000:03:00.1 is still in use by driver QEMU, domain tck) I've found that sleeping for a bit after creating the guest allows the tests to pass. While here, also fix a small typo from copy and paste of disk tests. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- scripts/domain/250-pci-host-hotplug.t | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/domain/250-pci-host-hotplug.t b/scripts/domain/250-pci-host-hotplug.t index 4579477..e128de7 100644 --- a/scripts/domain/250-pci-host-hotplug.t +++ b/scripts/domain/250-pci-host-hotplug.t @@ -52,6 +52,8 @@ my $xml = $tck->generic_domain(name => "tck")->as_xml; diag "Creating a new transient domain"; my $dom; ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); +diag "Waiting 10 seconds for guest to initialize"; +sleep(10); my ($domain, $bus, $slot, $function) = $tck->get_host_pci_device(); @@ -86,7 +88,7 @@ SKIP: { ok(defined $nodedev, "found PCI device $domain:$bus:$slot.$function on host"); - lives_ok(sub { $nodedev->dettach() }, "detached device from host OS"); + lives_ok(sub { $nodedev->dettach(undef, 0) }, "detached device from host OS"); lives_ok(sub { $nodedev->reset() }, "reset the host PCI device"); my $devxml = @@ -112,6 +114,6 @@ SKIP: { my $finalxml = $dom->get_xml_description; - is($initialxml, $finalxml, "final XML has removed the disk") + is($initialxml, $finalxml, "final XML has removed the PCI device") } -- 1.8.4.5

3 6

[libvirt] [PATCH 01/21] Added missing virBufferFreeAndReset on the query buffer to free some memory
by Yves Vinter 27 Oct '14

27 Oct '14

From: yvinter <yves.vinter(a)bull.net> --- src/hyperv/hyperv_driver.c | 13 +++++++++++++ src/hyperv/hyperv_wmi.c | 15 +++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index aed9307..372ff39 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -201,6 +201,7 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, unsigned int flags VIR_FREE(username); VIR_FREE(password); hypervFreeObject(priv, (hypervObject *)computerSystem); + virBufferFreeAndReset(&query); return result; } @@ -254,6 +255,7 @@ hypervConnectGetHostname(virConnectPtr conn) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); + virBufferFreeAndReset(&query); return hostname; } @@ -352,6 +354,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); hypervFreeObject(priv, (hypervObject *)processorList); + virBufferFreeAndReset(&query); return result; } @@ -396,6 +399,7 @@ hypervConnectListDomains(virConnectPtr conn, int *ids, int maxids) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); + virBufferFreeAndReset(&query); return success ? count : -1; } @@ -432,6 +436,7 @@ hypervConnectNumOfDomains(virConnectPtr conn) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); + virBufferFreeAndReset(&query); return success ? count : -1; } @@ -464,6 +469,7 @@ hypervDomainLookupByID(virConnectPtr conn, int id) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); + virBufferFreeAndReset(&query); return domain; } @@ -500,6 +506,7 @@ hypervDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); + virBufferFreeAndReset(&query); return domain; } @@ -533,6 +540,7 @@ hypervDomainLookupByName(virConnectPtr conn, const char *name) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystem); + virBufferFreeAndReset(&query); return domain; } @@ -748,6 +756,7 @@ hypervDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); hypervFreeObject(priv, (hypervObject *)processorSettingData); hypervFreeObject(priv, (hypervObject *)memorySettingData); + virBufferFreeAndReset(&query); return result; } @@ -915,6 +924,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) hypervFreeObject(priv, (hypervObject *)virtualSystemSettingData); hypervFreeObject(priv, (hypervObject *)processorSettingData); hypervFreeObject(priv, (hypervObject *)memorySettingData); + virBufferFreeAndReset(&query); return xml; } @@ -971,6 +981,7 @@ hypervConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxn } hypervFreeObject(priv, (hypervObject *)computerSystemList); + virBufferFreeAndReset(&query); return count; } @@ -1007,6 +1018,7 @@ hypervConnectNumOfDefinedDomains(virConnectPtr conn) cleanup: hypervFreeObject(priv, (hypervObject *)computerSystemList); + virBufferFreeAndReset(&query); return success ? count : -1; } @@ -1346,6 +1358,7 @@ hypervConnectListAllDomains(virConnectPtr conn, } hypervFreeObject(priv, (hypervObject *)computerSystemList); + virBufferFreeAndReset(&query); return ret; } diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index acb705c..d93abd9 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -526,6 +526,7 @@ hypervInvokeMsvmComputerSystemRequestStateChange(virDomainPtr domain, VIR_FREE(returnValue); VIR_FREE(instanceID); hypervFreeObject(priv, (hypervObject *)concreteJob); + virBufferFreeAndReset(&query); return result; } @@ -646,13 +647,14 @@ int hypervMsvmComputerSystemFromDomain(virDomainPtr domain, Msvm_ComputerSystem **computerSystem) { + int result = -1; hypervPrivate *priv = domain->conn->privateData; char uuid_string[VIR_UUID_STRING_BUFLEN]; virBuffer query = VIR_BUFFER_INITIALIZER; if (computerSystem == NULL || *computerSystem != NULL) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); - return -1; + goto cleanup; } virUUIDFormat(domain->uuid, uuid_string); @@ -663,16 +665,21 @@ hypervMsvmComputerSystemFromDomain(virDomainPtr domain, virBufferAsprintf(&query, "and Name = \"%s\"", uuid_string); if (hypervGetMsvmComputerSystemList(priv, &query, computerSystem) < 0) { - return -1; + goto cleanup; } if (*computerSystem == NULL) { virReportError(VIR_ERR_NO_DOMAIN, _("No domain with UUID %s"), uuid_string); - return -1; + goto cleanup; } - return 0; + result = 0; + + cleanup: + virBufferFreeAndReset(&query); + + return result; } -- 1.9.1

2 34

[libvirt] [PATCHv3 0/2] Add non-FreeBSD guest support to Bhyve driver.
by Conrad Meyer 27 Oct '14

27 Oct '14

3 8