August 2016 - Devel - libvirt List Archives

[libvirt] [PATCH] wireshark: Drop glib dependency
by Michal Privoznik 01 Aug '16

01 Aug '16

The only function that we currently use from glib is g_sprintf(). That's a very big gun for such small target. Not only that, but we've silently relied on wireshark dragging in the glib. Replace the g_sprintf() with plain sprinf() so that we can drop the glib dependency. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tools/wireshark/src/packet-libvirt.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/packet-libvirt.c index 569a0a1..9eadf4f 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -27,8 +27,6 @@ #include <wireshark/epan/proto.h> #include <wireshark/epan/packet.h> #include <wireshark/epan/dissectors/packet-tcp.h> -#include <glib.h> -#include <glib/gprintf.h> #ifdef HAVE_RPC_TYPES_H # include <rpc/types.h> #endif @@ -113,7 +111,7 @@ format_xdr_bytes(guint8 *bytes, guint32 length) for (i = 0; i < length; i++) { /* We know that buf has enough size to contain 2 * length + '\0' characters. */ - g_sprintf(buf, "%02x", bytes[i]); + sprintf(buf, "%02x", bytes[i]); buf += 2; } return buf - length*2; -- 2.8.4

2 1

[libvirt] [PATCH] tests: qemu: Don't leak security manager object
by Peter Krempa 01 Aug '16

01 Aug '16

==2064442== 200 (88 direct, 112 indirect) bytes in 1 blocks are definitely lost in loss record 54 of 73 ==2064442== at 0x4C2E0F0: calloc (vg_replace_malloc.c:711) ==2064442== by 0x18E75B80: virAllocVar (viralloc.c:560) ==2064442== by 0x18EC43B0: virObjectNew (virobject.c:193) ==2064442== by 0x18EC476E: virObjectLockableNew (virobject.c:219) ==2064442== by 0x1906BC73: virSecurityManagerNewDriver (security_manager.c:93) ==2064442== by 0x1906C076: virSecurityManagerNewStack (security_manager.c:115) ==2064442== by 0x43CC39: qemuTestDriverInit (testutilsqemu.c:548) ==2064442== by 0x4337ED: mymain (qemumonitorjsontest.c:2440) ==2064442== by 0x43BABE: virTestMain (testutils.c:982) ==2064442== by 0x43A490: main (qemumonitorjsontest.c:2558) --- tests/testutilsqemu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 1cf72a9..133de29 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -475,6 +475,7 @@ void qemuTestDriverFree(virQEMUDriver *driver) virObjectUnref(driver->xmlopt); virObjectUnref(driver->caps); virObjectUnref(driver->config); + virObjectUnref(driver->securityManager); } int qemuTestCapsCacheInsert(virQEMUCapsCachePtr cache, const char *binary, -- 2.9.2

2 1

[libvirt] [PATCH] spec: Require perl-XML-XPath during build
by Martin Kletzander 01 Aug '16

01 Aug '16

Some time ago I went through the trouble to make support for perl module requirements in our bootstrap. Even though we require it in the bootstrap, it was not listed as a build requirement in the specfile. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index cc5d72209873..b182f4521453 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -269,6 +269,7 @@ BuildRequires: /usr/bin/pod2man %endif BuildRequires: git BuildRequires: perl +BuildRequires: perl-XML-XPath BuildRequires: python %if %{with_systemd} BuildRequires: systemd-units -- 2.9.2

3 4

[libvirt] [PATCH 0/2] qemu: caps: Sanitize storage of machine type related data
by Peter Krempa 01 Aug '16

01 Aug '16

Peter Krempa (2): qemu: capabilities: Drop unused function virQEMUCapsGetMachineTypes qemu: caps: Sanitize storage of machine type related data src/qemu/qemu_capabilities.c | 125 ++++++++++++++++--------------------------- src/qemu/qemu_capabilities.h | 2 - 2 files changed, 46 insertions(+), 81 deletions(-) -- 2.9.2

2 5

[libvirt] [PATCH] virsh: Report error when explicit connection fails
by Martin Kletzander 01 Aug '16

01 Aug '16

Commit 0c56d9431839 forgot to return false in the cmdConnect command after the clean up made there. Before (assuming you don't have uri alias for 'asdf'): $ virsh connect asdf error: failed to connect to the hypervisor $ echo $? 0 After (with the same assumption): $ virsh connect asdf error: failed to connect to the hypervisor error: no connection driver available for asdf $ echo $? 1 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1356461 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index f74698fa5f9a..d3fe06f19032 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -210,7 +210,7 @@ virshConnect(vshControl *ctl, const char *uri, bool readonly) * Reconnect after a disconnect from libvirtd * */ -static void +static int virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) { bool connected = false; @@ -237,6 +237,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) vshError(ctl, "%s", _("Failed to reconnect to the hypervisor")); else vshError(ctl, "%s", _("failed to connect to the hypervisor")); + return -1; } else { if (name) { VIR_FREE(ctl->connname); @@ -253,6 +254,7 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) priv->useGetInfo = false; priv->useSnapshotOld = false; priv->blockJobNoBytes = false; + return 0; } int virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, @@ -301,7 +303,8 @@ cmdConnect(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "name", &name) < 0) return false; - virshReconnect(ctl, name, ro, true); + if (virshReconnect(ctl, name, ro, true) < 0) + return false; return true; } @@ -333,11 +336,13 @@ virshConnectionHandler(vshControl *ctl) { virshControlPtr priv = ctl->privData; - if (!priv->conn || disconnected) - virshReconnect(ctl, NULL, false, false); + if ((!priv->conn || disconnected) && + virshReconnect(ctl, NULL, false, false) < 0) + return NULL; if (virshConnectionUsability(ctl, priv->conn)) return priv->conn; + return NULL; } @@ -444,14 +449,13 @@ virshInit(vshControl *ctl) return false; if (ctl->connname) { - virshReconnect(ctl, NULL, false, false); /* Connecting to a named connection must succeed, but we delay * connecting to the default connection until we need it * (since the first command might be 'connect' which allows a * non-default connection, or might be 'help' which needs no * connection). */ - if (!priv->conn) { + if (virshReconnect(ctl, NULL, false, false) < 0) { vshReportError(ctl); return false; } -- 2.9.2

2 1