- Devel - libvirt List Archives

[libvirt] [PATCH][libvirt-glib] glib-events: Allow zero timeouts for timer
by Michal Privoznik 01 Jun '12

01 Jun '12

In libvirt, it's perfectly possible and widely used to have disabled timers (timeout=-1) and fire them up 'randomly' with timeout=0. However, with current mapping into glib mainloop it's not possible and causing troubles. --- libvirt-glib/libvirt-glib-event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-glib/libvirt-glib-event.c b/libvirt-glib/libvirt-glib-event.c index 94f4de8..c3eb3c8 100644 --- a/libvirt-glib/libvirt-glib-event.c +++ b/libvirt-glib/libvirt-glib-event.c @@ -384,7 +384,7 @@ gvir_event_timeout_update(int timer, if (interval >= 0) { if (data->source) - goto cleanup; + g_source_remove(data->source); data->interval = interval; data->source = g_timeout_add(data->interval, -- 1.7.8.5

2 2

[libvirt] Authentication
by Jagannath Timma 31 May '12

31 May '12

Are there any plans to add support for the default authentication method of the server? """ http://libvirt.org/drvhyperv.html Authentication In order to perform any useful operation the driver needs to log into the Hyper-V server. Therefore, only virConnectOpenAuth can be used to connect to an Hyper-V server, virConnectOpen and virConnectOpenReadOnly don't work. To log into an Hyper-V server the driver will request credentials using the callback passed to the virConnectOpenAuth function. The driver passes the hostname as challenge parameter to the callback. Note: Currently only Basic authentication is supported by libvirt. This method is disabled by default on the Hyper-V server and can be enabled via the WinRM commandline tool. "" Regards, Jagannath

1 0

[libvirt] [PATCH] SNMP: include inactive domains in guest table
by Jonathan Daugherty 31 May '12

31 May '12

Hi, I've written a patch to include inactive domains in the guest table available via the libvirt-snmp subagent. This makes it possible to start domains via SNMP (a state transition which AFAICT was previously impossible, because inactive domains never appeared in the SNMP result). The code now collects the IDs of running domains along with the names of declared (but not running) domains and normalizes them into a list of domain pointers, which is then processed by the preexisting SNMP container row allocation code. The change was fairly straightforward, but certainly there might be Good Reasons it wasn't already implemented. As part of this change, the other (noteworthy) change I made was to move calls to virDomainFree() to the end of libvirtSnmpLoadGuests() since I have to free all of the used domain pointers there anyway. Some other issues which may need to be addressed: - This will be a breaking change for anyone who assumes that the old behavior is still in place (i.e., that the guest table only includes non-shutdown domains). However, it might not be *that* bad because the domain rows already included a 'state' that one could already filter on. - I don't know if there exists other code in libvirt-snmp that assumes inactive domains can't appear in the table. - I have not tested the inactive -> active state transition (because I don't want to enable writable SNMP OIDs on my server). Please let me know if there is anything further I need to do to make the patch acceptable. Thanks for libvirt-snmp! -- Jonathan Daugherty Software Engineer Galois, Inc.

3 4

[libvirt] [PATCH v2 0/2] Make virsh *edit more bearable
by Michal Privoznik 31 May '12

31 May '12

If there's an error in XML, all changes made by user are lost. Users (read /me) tends to get angry with this. Allow them to get back and re-edit. diff to v1: -Eric's review suggestions included Michal Privoznik (2): virsh: Switch from generated cmd*Edit commands to nongenerated virsh: Allow users to reedit rejected XML cfg.mk | 4 +- po/POTFILES.in | 1 + tools/Makefile.am | 40 +---- tools/console.c | 40 +++-- tools/console.h | 2 + tools/virsh-edit.c | 138 +++++++++++++++ tools/virsh.c | 483 ++++++++++++++++++++++------------------------------ 7 files changed, 371 insertions(+), 337 deletions(-) create mode 100644 tools/virsh-edit.c -- 1.7.8.5

2 5

[libvirt] [PATCH] tools: make virt-pki-validate work with acls and xattrs
by Martin Kletzander 31 May '12

31 May '12

This patch makes virt-pki-validate work with certificates that have acl or xattr set. Otherwise it failing due to wrong permissions. --- tools/virt-pki-validate.in | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 01825d1..4164758 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -170,7 +170,8 @@ then else echo Found client private key $LIBVIRTP/clientkey.pem OWN=`ls -l "$LIBVIRTP/clientkey.pem" | awk '{ print $3 }'` - MOD=`ls -l "$LIBVIRTP/clientkey.pem" | awk '{ print $1 }'` + # The substr($1, 1, 10) gets rid of acl and xattr markers + MOD=`ls -l "$LIBVIRTP/clientkey.pem" | awk '{ print substr($1, 1, 10) }'` if [ "$OWN" != "root" ] then echo The client private key should be owned by root @@ -222,7 +223,8 @@ then else echo Found server private key $LIBVIRTP/serverkey.pem OWN=`ls -l "$LIBVIRTP/serverkey.pem" | awk '{ print $3 }'` - MOD=`ls -l "$LIBVIRTP/serverkey.pem" | awk '{ print $1 }'` + # The substr($1, 1, 10) gets rid of acl and xattr markers + MOD=`ls -l "$LIBVIRTP/serverkey.pem" | awk '{ print substr($1, 1, 10) }'` if [ "$OWN" != "root" ] then echo The server private key should be owned by root -- 1.7.8.6

3 4

[libvirt] [PATCHv2 0/4] double close() fixes
by Eric Blake 31 May '12

31 May '12

Updated version of Wen's and my patches. In this version, I fixed review comments, split Wen's patch into 3, and tracked down when each bug was introduced. Eric Blake (2): command: avoid double close bugs fdstream: avoid double close bug Wen Congyang (2): command: check for fork error before closing fd qemu: avoid closing fd more than once src/fdstream.c | 7 +++---- src/qemu/qemu_migration.c | 4 +++- src/util/command.c | 24 ++++++++++-------------- 3 files changed, 16 insertions(+), 19 deletions(-) -- 1.7.7.6

1 5

[libvirt] [PATCH 1/3] avoid closing fd more than once in virFDStreamOpenFileInternal()
by Wen Congyang 31 May '12

31 May '12

When we assign fd and childfd to elements of fds[], we will close these fds more than once on error. So we should assign fds[] to -1 after we assign fd and childfd to elements of fds[]. We should also close childfd on error. --- src/fdstream.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index fca0f41..0de3b04 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -581,6 +581,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, struct stat sb; virCommandPtr cmd = NULL; int errfd = -1; + int childfd = -1; VIR_DEBUG("st=%p path=%s oflags=%x offset=%llu length=%llu mode=%o", st, path, oflags, offset, length, mode); @@ -619,7 +620,6 @@ virFDStreamOpenFileInternal(virStreamPtr st, if ((st->flags & VIR_STREAM_NONBLOCK) && (!S_ISCHR(sb.st_mode) && !S_ISFIFO(sb.st_mode))) { - int childfd; if ((oflags & O_ACCMODE) == O_RDWR) { streamsReportError(VIR_ERR_INTERNAL_ERROR, @@ -650,6 +650,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, fd = fds[1]; virCommandSetInputFD(cmd, childfd); } + fds[0] = fds[1] = -1; virCommandSetErrorFD(cmd, &errfd); if (virCommandRunAsync(cmd, NULL) < 0) @@ -668,6 +669,7 @@ error: VIR_FORCE_CLOSE(fds[0]); VIR_FORCE_CLOSE(fds[1]); VIR_FORCE_CLOSE(fd); + VIR_FORCE_CLOSE(childfd); VIR_FORCE_CLOSE(errfd); if (oflags & O_CREAT) unlink(path); -- 1.7.1

1 2

[libvirt] [PATCH] command: avoid double close bugs
by Eric Blake 31 May '12

31 May '12

KAMEZAWA Hiroyuki reported a nasty double-free bug when virCommand is used to convert a string into input to a child command. The problem is that the poll() loop of virCommandProcessIO would close() the write end of the pipe in order to let the child see EOF, then the caller virCommandRun() would also close the same fd number, with the second close possibly nuking an fd opened by some other thread in the meantime. This in turn can have all sorts of bad effects. This is based on his first attempt at a patch, at https://bugzilla.redhat.com/show_bug.cgi?id=823716 * src/util/command.c (_virCommand): Drop inpipe member. (virCommandProcessIO): Add argument, to avoid closing caller's fd without informing caller. (virCommandRun, virCommandNewArgs): Adjust clients. --- src/util/command.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index eaa9f16..bf219e4 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -83,7 +83,6 @@ struct _virCommand { char **errbuf; int infd; - int inpipe; int outfd; int errfd; int *outfdptr; @@ -788,7 +787,6 @@ virCommandNewArgs(const char *const*args) cmd->handshakeNotify[1] = -1; cmd->infd = cmd->outfd = cmd->errfd = -1; - cmd->inpipe = -1; cmd->pid = -1; virCommandAddArgSet(cmd, args); @@ -1676,7 +1674,7 @@ virCommandTranslateStatus(int status) * Manage input and output to the child process. */ static int -virCommandProcessIO(virCommandPtr cmd) +virCommandProcessIO(virCommandPtr cmd, int *inpipe) { int infd = -1, outfd = -1, errfd = -1; size_t inlen = 0, outlen = 0, errlen = 0; @@ -1687,7 +1685,7 @@ virCommandProcessIO(virCommandPtr cmd) * via pipe */ if (cmd->inbuf) { inlen = strlen(cmd->inbuf); - infd = cmd->inpipe; + infd = *inpipe; } /* With out/err buffer, the outfd/errfd have been filled with an @@ -1807,12 +1805,9 @@ virCommandProcessIO(virCommandPtr cmd) } } else { inoff += done; - if (inoff == inlen) { - int tmpfd ATTRIBUTE_UNUSED; - tmpfd = infd; - if (VIR_CLOSE(infd) < 0) - VIR_DEBUG("ignoring failed close on fd %d", tmpfd); - } + if (inoff == inlen && VIR_CLOSE(*inpipe) < 0) + VIR_DEBUG("ignoring failed close on fd %d", infd); + infd = -1; } } } @@ -1938,7 +1933,6 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) return -1; } cmd->infd = infd[0]; - cmd->inpipe = infd[1]; } /* If caller requested the same string for stdout and stderr, then @@ -1981,7 +1975,7 @@ virCommandRun(virCommandPtr cmd, int *exitstatus) } if (string_io) - ret = virCommandProcessIO(cmd); + ret = virCommandProcessIO(cmd, &infd[1]); if (virCommandWait(cmd, exitstatus) < 0) ret = -1; -- 1.7.7.6

2 11

[libvirt] error: this function is not supported by the connection driver : virConnectNumOfStoragePool
by Onkar 30 May '12

30 May '12

Hello, I configured libvirt like this ./configure --prefix=/ --exec-prefix=/usr/ --libdir=/usr/lib64/ --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-storage-dir --with-qemu --with-libvirtd --with-selinux --with-network --with-libblkid and then, make -j4 make install and then # virsh list --all Id Name State ---------------------------------------------------- - vm1 shut off # virsh pool-list --all error: Failed to list active pools error: this function is not supported by the connection driver: virConnectNumOfStoragePools getting this error , any clues on why is this error ? Regards, Onkar

1 0

[libvirt] [PATCH] build: include augeas-gentest.pl and libvirt_qemu_probes.h into dist file
by Wen Congyang 30 May '12

30 May '12

We generate *.aug from *.aug.in by augeas-gentest.pl, so this script should be included in dist file. We split QEMU dtrace probes into separate file, but we forget include libvirt_qemu_probes.h into dist file. --- src/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c8efa5b..c418897 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1120,6 +1120,7 @@ check-local: check-augeas check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock AUG_GENTEST = $(top_srcdir)/build-aux/augeas-gentest.pl +EXTRA_DIST += $(AUG_GENTEST) if WITH_QEMU qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in qemu/qemu.conf $(AUG_GENTEST) @@ -1289,7 +1290,8 @@ if WITH_REMOTE $(REMOTE_DRIVER_GENERATED): libvirt_probes.h endif WITH_REMOTE -BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp +BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp \ + libvirt_qemu_probes.h if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo -- 1.7.1

2 3

[libvirt] [PATCH] build: silence warning from autoconf
by Eric Blake 30 May '12

30 May '12

Autoconf 2.60 and later insist on using ${datarootdir}, rather than the derived ${datadir} (although the latter defaults to the former, it is possible to set configure arguments so that they differ): config.status: creating libvirt.pc config.status: WARNING: 'libvirt.pc.in' seems to ignore the --datarootdir setting This patch follows the autoconf manual's suggestions for how to support 2.59 (RHEL 5) and newer simultaneously. * libvirt.pc.in (datarootdir): Define, so ${datadir} will not ignore datarootdir when using newer autoconf. --- https://www.gnu.org/software/autoconf/manual/autoconf.html#Changed-Director… libvirt.pc.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/libvirt.pc.in b/libvirt.pc.in index 3d999a8..616575d 100644 --- a/libvirt.pc.in +++ b/libvirt.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +datarootdir=@datarootdir@ libvirt_api=@datadir@/libvirt/api/libvirt-api.xml libvirt_qemu_api=@datadir@/libvirt/api/libvirt-qemu-api.xml -- 1.7.7.6

2 9

[libvirt] [snmp PATCH 0/2] Cleanup for libvirt-snmp
by Martin Kletzander 30 May '12

30 May '12

This series cleans up the libvirt-snmp codebase with some visual (whitespaces) and semantic (memory leaks) cleanups. Martin Kletzander (2): cleanup: whitespaces removed from ends of lines Stop event thread on server stop autogen.sh | 4 +- docs/libvirtMib_subagent.pod | 4 +- src/LIBVIRT-MIB.txt | 4 +- src/libvirtGuestTable-README-FIRST.txt | 6 +- src/libvirtGuestTable-README-libvirtGuestTable.txt | 16 ++-- src/libvirtGuestTable.c | 16 ++-- src/libvirtGuestTable.h | 22 +++--- src/libvirtGuestTable_data_access.c | 8 +- src/libvirtGuestTable_data_get.c | 8 +- src/libvirtGuestTable_data_set.c | 22 +++--- src/libvirtGuestTable_enums.h | 24 +++--- src/libvirtGuestTable_interface.c | 82 ++++++++++---------- src/libvirtGuestTable_interface.h | 2 +- src/libvirtGuestTable_oids.h | 20 +++--- src/libvirtMib_subagent.c | 22 +++--- src/libvirtSnmp.c | 20 +++++- 16 files changed, 150 insertions(+), 130 deletions(-) -- 1.7.8.6

2 5

[libvirt] [PATCH] file: Log closing filedescriptors
by Jiri Denemark 30 May '12

30 May '12

--- src/util/virfile.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virfile.c b/src/util/virfile.c index db3d737..bc7f2c9 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -35,6 +35,7 @@ #include "configmake.h" #include "memory.h" #include "virterror_internal.h" +#include "logging.h" #define VIR_FROM_THIS VIR_FROM_NONE #define virFileError(code, ...) \ @@ -51,6 +52,15 @@ int virFileClose(int *fdptr, bool preserve_errno) if (preserve_errno) saved_errno = errno; rc = close(*fdptr); + if (rc < 0) { + if (errno != EBADF) { + char ebuf[1024] ATTRIBUTE_UNUSED; + VIR_DEBUG("Failed to close fd %d: %d", + *fdptr, virStrerror(errno, ebuf, sizeof(ebuf))); + } + } else { + VIR_DEBUG("Closed fd %d", *fdptr); + } *fdptr = -1; if (preserve_errno) errno = saved_errno; -- 1.7.10.2

2 3

[libvirt] [PATCH] command: Fix debug message during handshake
by Jiri Denemark 30 May '12

30 May '12

Probably a result of copy&paste... --- src/util/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/command.c b/src/util/command.c index 5b94f1e..8b581cf 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -2538,7 +2538,7 @@ int virCommandHandshakeNotify(virCommandPtr cmd) return -1; } - VIR_DEBUG("Notify handshake on %d", cmd->handshakeWait[0]); + VIR_DEBUG("Notify handshake on %d", cmd->handshakeNotify[1]); if (safewrite(cmd->handshakeNotify[1], &c, sizeof(c)) != sizeof(c)) { virReportSystemError(errno, "%s", _("Unable to notify child process")); VIR_FORCE_CLOSE(cmd->handshakeNotify[1]); -- 1.7.10.2

2 1

[libvirt] [PATCH] build: Fixed generating of libvirt_qemu_probes.h
by Martin Kletzander 30 May '12

30 May '12

I added libvirt_qemu_probes.h into BUILT_SOURCES. That makes it generated, but most probably it is not the clearest way how to do that, but it fixes the build. --- Feel free to clean this, but for the time being, I'm pushing this as a build breaker. src/Makefile.am | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c8efa5b..1fde936 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1294,6 +1294,7 @@ BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h +BUILT_SOURCES += libvirt_qemu_probes.h endif tapsetdir = $(datadir)/systemtap/tapset -- 1.7.8.6

2 3

[libvirt] [PATCH] virCommand: Extend debug message for handshake
by Michal Privoznik 30 May '12

30 May '12

Currently, we are logging only one side of pipes we create in virCommandRequireHandshake(); This is enough in cases where pipe2() returns two consecutive FDs. However, it is not guaranteed and it may return any FDs. Therefore, it's wise to log the other ends as well. --- src/util/command.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index eaa9f16..5b94f1e 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -2443,8 +2443,10 @@ void virCommandRequireHandshake(virCommandPtr cmd) return; } - VIR_DEBUG("Transfer handshake wait=%d notify=%d", - cmd->handshakeWait[1], cmd->handshakeNotify[0]); + VIR_DEBUG("Transfer handshake wait=%d notify=%d, " + "keep handshake wait=%d notify=%d", + cmd->handshakeWait[1], cmd->handshakeNotify[0], + cmd->handshakeWait[0], cmd->handshakeNotify[1]); virCommandTransferFD(cmd, cmd->handshakeWait[1]); virCommandTransferFD(cmd, cmd->handshakeNotify[0]); cmd->handshake = true; -- 1.7.8.5

2 2

[libvirt] [PATCH libvirt-java] Return a byte[] array with secretGetValue
by Wido den Hollander 30 May '12

30 May '12

Signed-off-by: Wido den Hollander <wido(a)widodh.nl> --- src/main/java/org/libvirt/Secret.java | 11 +++++++++-- src/main/java/org/libvirt/jna/Libvirt.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index e536cf4..a874925 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -5,6 +5,9 @@ import org.libvirt.jna.SecretPointer; import com.sun.jna.Native; import com.sun.jna.NativeLong; +import com.sun.jna.ptr.LongByReference; +import com.sun.jna.Pointer; +import java.nio.ByteBuffer; /** * A secret defined by libvirt @@ -109,9 +112,13 @@ public class Secret { * * @return the value of the secret, or null on failure. */ - public String getValue() throws LibvirtException { - String returnValue = libvirt.virSecretGetValue(VSP, new NativeLong(), 0); + public byte[] getValue() throws LibvirtException { + LongByReference value_size = new LongByReference(); + Pointer value = libvirt.virSecretGetValue(VSP, value_size, 0); processError(); + ByteBuffer bb = value.getByteBuffer(0, value_size.getValue()); + byte[] returnValue = new byte[bb.remaining()]; + bb.get(returnValue); return returnValue; } diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 2c8c03d..3804d55 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -330,7 +330,7 @@ public interface Libvirt extends Library { public int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); public int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); public String virSecretGetUsageID(SecretPointer virSecretPtr); - public String virSecretGetValue(SecretPointer virSecretPtr, NativeLong value_size, int flags); + public Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); public String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); public SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); public SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); -- 1.7.5.4

2 2

[libvirt] [PATCH] lxc: return correct number of CPUs
by Martin Kletzander 30 May '12

30 May '12

When getting number of CPUs the host has assigned, there was always number "1" returned. Even though all lxc domains with no pinning launched by libvirt run on all pCPUs (by default, no matter what's the number), we should at least return the same number as the user specified when creating the domain. --- The bug addressed above will be managed later, because I believe this needs to be discussed first (we don't say that <vcpu> is not supported for lxc, but we are able to set only pinning, shares, not number of CPUs; due to using cgroups). The question will be: "Should we change the docs and ban it in the code or make some workaround for fixing it?" src/lxc/lxc_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9aea556..33b2774 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -590,7 +590,7 @@ static int lxcDomainGetInfo(virDomainPtr dom, } info->maxMem = vm->def->mem.max_balloon; - info->nrVirtCpu = 1; + info->nrVirtCpu = vm->def->vcpus; ret = 0; cleanup: -- 1.7.8.6

2 2

[libvirt] serial console/events example script
by Dave Allan 29 May '12

29 May '12

Hi all, A while back I wrote the attached code to demonstrate how to use events and serial console to create a serial console that stays up even when the VM is down. Is it worth adding to the examples? It might need some work, as I am not terribly strong with Python. Dave

3 5

[libvirt] [PATCH] build: don't lose probes.o files
by Eric Blake 29 May '12

29 May '12

The previous patch fixed an incremental build, but missed that on a fresh checkout, we now have nothing requiring that stops make from nuking libvirt_qemu_probes.o. * src/Makefile.am ($(libvirt_driver_qemu_la_SOURCES)): Delete, since this variable is empty. (.PRECIOUS): Add %_probes.o, so they don't get nuked as an intermediate by-product after creating %_probes.lo. --- Pushing under the build-breaker rule; this time I've done more testing, including ./autobuild.sh on a fresh checkout (that died later on, due to the augeas issue mentioned here[1], but at least it got past the probes.o hangup). [1] https://www.redhat.com/archives/libvir-list/2012-May/msg01296.html src/Makefile.am | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 533e78a..c8efa5b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1294,8 +1294,6 @@ BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp if WITH_QEMU libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h - -$(libvirt_driver_qemu_la_SOURCES): libvirt_qemu_probes.h endif tapsetdir = $(datadir)/systemtap/tapset @@ -1304,6 +1302,7 @@ tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp %_probes.h: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -h -s $< +.PRECIOUS: %_probes.o %_probes.o: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -G -s $< -- 1.7.7.6

1 0

[libvirt] Compiling Error
by Alex Jia 29 May '12

29 May '12

Hi all, I met some compiling error since May 26: <snip> make[3]: Entering directory `/home/ajia/Workspace/libvirt/src' CCLD libvirt_driver_qemu.la libtool: link: `libvirt_qemu_probes.lo' is not a valid libtool object make[3]: *** [libvirt_driver_qemu.la] Error 1 make[3]: Leaving directory `/home/ajia/Workspace/libvirt/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/ajia/Workspace/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/ajia/Workspace/libvirt' make: *** [all] Error 2 </snip> Some details: <snip> File `libvirt_driver_qemu.la' does not exist. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_agent.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_agent.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_command.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_conf.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_domain.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_capabilities.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_capabilities.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_command.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_bridge_filter.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_domain.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_migration.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_cgroup.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_cgroup.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hostdev.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hostdev.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hotplug.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_hotplug.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_conf.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_process.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_process.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_migration.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_text.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_json.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_text.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_monitor_json.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_driver.c'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_driver.h'. Prerequisite `libvirt_qemu_probes.h' is newer than target `qemu/qemu_bridge_filter.c'. Must remake target `libvirt_driver_qemu.la'. </snip> Notes, in fact, libvirt_driver_qemu.la hasn't been generated: [root@202 libvirt]# find . -name libvirt_driver_qemu.la [root@202 libvirt]# find . -name libvirt_qemu_probes.lo [root@202 libvirt]# Regards, Alex

4 6

[libvirt] [PATCH] build: fix testing of augeas files in VPATH builds
by Eric Blake 29 May '12

29 May '12

Without this fix, a VPATH build fails with messages like: make[3]: Entering directory `/home/remote/eblake/libvirt-tmp2/build/daemon' ../../build-aux/augeas-gentest.pl libvirtd.conf ../../daemon/test_libvirtd.aug.in test_libvirtd.aug cannot read libvirtd.conf: No such file or directory at ../../build-aux/augeas-gentest.pl line 38. * daemon/Makefile.am (AUG_GENTEST): Factor out definition. (test_libvirtd.aug): Look for correct file. * src/Makefile.am (AUG_GENTEST): Use $(PERL). (qemu/test_libvirtd_qemu.aug, lxc/test_libvirtd_lxc.aug) (locking/test_libvirt_sanlock.aug): Ensure destination dir exists. --- This is one alternative for a fix for a build-breaker, but I'm not pushing it without a review. In particular, I still have a question: Should the various test_*.aug files be in the tarball? Right now, they are listed under EXTRA_DIST (so they are shipped pre-built), but also listed under CLEANFILES (so 'make clean' must regenerate them). Generating the files requires perl, which is a non-standard requirement. Either we require end-users to have perl in order to build from a libvirt tarball, and change the tarball to exclude files that perl can generate; or we fix the use of CLEANFILES to instead be DISTCLEANFILES or even MAINTAINERCLEANFILES (end users need not have perl if they don't alter any sources, but we should then be generating the files into $(srcdir) rather than into the build tree). For another example of a perl-generated file, remote_protocol.h is currently shipped in the tarball, and requires perl for generation, but it is generated into the $(srcdir) and only cleaned by MAINTAINERCLEANFILES. daemon/Makefile.am | 6 ++++-- src/Makefile.am | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index daf24ea..8dd019d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -351,8 +351,10 @@ libvirtd.service: libvirtd.service.in $(top_builddir)/config.status check-local: check-augeas -test_libvirtd.aug: test_libvirtd.aug.in libvirtd.conf - $(AM_V_GEN)$(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl libvirtd.conf $< $@ +AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl + +test_libvirtd.aug: test_libvirtd.aug.in $(srcdir)/libvirtd.conf + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libvirtd.conf $< $@ check-augeas: test_libvirtd.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ diff --git a/src/Makefile.am b/src/Makefile.am index 533e78a..0bbccb2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1119,11 +1119,13 @@ check-local: check-augeas check-augeas: check-augeas-qemu check-augeas-lxc check-augeas-sanlock -AUG_GENTEST = $(top_srcdir)/build-aux/augeas-gentest.pl +AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl if WITH_QEMU -qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in qemu/qemu.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) qemu/qemu.conf $< $@ +qemu/test_libvirtd_qemu.aug: qemu/test_libvirtd_qemu.aug.in \ + $(srcdir)/qemu/qemu.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) qemu && \ + $(AUG_GENTEST) $(srcdir)/qemu/qemu.conf $< $@ check-augeas-qemu: qemu/test_libvirtd_qemu.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ @@ -1135,8 +1137,10 @@ check-augeas-qemu: endif if WITH_LXC -lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in lxc/lxc.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) lxc/lxc.conf $< $@ +lxc/test_libvirtd_lxc.aug: lxc/test_libvirtd_lxc.aug.in \ + $(srcdir)/lxc/lxc.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) lxc && \ + $(AUG_GENTEST) $(srcdir)/lxc/lxc.conf $< $@ check-augeas-lxc: lxc/test_libvirtd_lxc.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ @@ -1147,8 +1151,10 @@ else check-augeas-lxc: endif -locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in locking/qemu-sanlock.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ +locking/test_libvirt_sanlock.aug: locking/test_libvirt_sanlock.aug.in \ + locking/qemu-sanlock.conf $(AUG_GENTEST) + $(AM_V_GEN)$(MKDIR_P) locking && \ + $(AUG_GENTEST) locking/qemu-sanlock.conf $< $@ check-augeas-sanlock: locking/test_libvirt_sanlock.aug $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ -- 1.7.7.6

1 1

[libvirt] [PATCH] virsh: avoid strncpy
by Eric Blake 29 May '12

29 May '12

strncpy is generally evil - it runs the risk of missing NUL termination, and more often than not wastes time zeroing way more bytes than strictly necessary. We've avoided this evil in our virStrncpy wrapper, except for places where we forgot to use the wrapper; meanwhile, we have also added an even higher layer wrapper for setting virTypedParameter values. * tools/virsh.c (cmdMemtune, cmdBlkdeviotune): Use modern API. * cfg.mk (exclude_file_name_regexp--sc_prohibit_strncpy): Tighten. --- Noticed this while updating to the latest gnulib. cfg.mk | 3 +- tools/virsh.c | 149 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/cfg.mk b/cfg.mk index daaa867..37f51a6 100644 --- a/cfg.mk +++ b/cfg.mk @@ -808,8 +808,7 @@ exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$ exclude_file_name_regexp--sc_prohibit_sprintf = \ ^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)$$ -exclude_file_name_regexp--sc_prohibit_strncpy = \ - ^(src/util/util|tools/virsh)\.c$$ +exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$ exclude_file_name_regexp--sc_prohibit_strtol = \ ^src/(util/sexpr|(vbox|xen|xenxs)/.*)\.c$$ diff --git a/tools/virsh.c b/tools/virsh.c index d273c25..5226bd8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6283,7 +6283,6 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nparams; i++) { temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; /* * Some magic here, this is used to fill the params structure with @@ -6292,24 +6291,32 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) * to the next valid argument and so on. */ if (soft_limit) { - temp->value.ul = soft_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + soft_limit) < 0) + goto error; soft_limit = 0; } else if (hard_limit) { - temp->value.ul = hard_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_HARD_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + hard_limit) < 0) + goto error; hard_limit = 0; } else if (swap_hard_limit) { - temp->value.ul = swap_hard_limit; - strncpy(temp->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + swap_hard_limit) < 0) + goto error; swap_hard_limit = 0; } else if (min_guarantee) { - temp->value.ul = min_guarantee; - strncpy(temp->field, VIR_DOMAIN_MEMORY_MIN_GUARANTEE, - sizeof(temp->field)); + if (virTypedParameterAssign(temp, + VIR_DOMAIN_MEMORY_MIN_GUARANTEE, + VIR_TYPED_PARAM_ULLONG, + min_guarantee) < 0) + goto error; min_guarantee = 0; } @@ -6318,15 +6325,19 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) temp->value.ul = VIR_DOMAIN_MEMORY_PARAM_UNLIMITED; } if (virDomainSetMemoryParameters(dom, params, nparams, flags) != 0) - vshError(ctl, "%s", _("Unable to change memory parameters")); + goto error; else ret = true; } - cleanup: +cleanup: VIR_FREE(params); virDomainFree(dom); return ret; + +error: + vshError(ctl, "%s", _("Unable to change memory parameters")); + goto cleanup; } /* @@ -8106,7 +8117,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) unsigned long long total_bytes_sec = 0, read_bytes_sec = 0, write_bytes_sec = 0; unsigned long long total_iops_sec = 0, read_iops_sec = 0, write_iops_sec = 0; int nparams = 0; - virTypedParameterPtr params = NULL, temp = NULL; + virTypedParameterPtr params = NULL; unsigned int flags = 0, i = 0; int rv = 0; bool current = vshCommandOptBool(cmd, "current"); @@ -8224,64 +8235,50 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) params = vshCalloc(ctl, nparams, sizeof(*params)); i = 0; - if (i < nparams && vshCommandOptBool(cmd, "total-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = total_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "read-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = read_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "write-bytes-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, - sizeof(temp->field)); - temp->value.ul = write_bytes_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "total-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = total_iops_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "read-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = read_iops_sec; - i++; - } - - if (i < nparams && vshCommandOptBool(cmd, "write-iops-sec")) { - temp = &params[i]; - temp->type = VIR_TYPED_PARAM_ULLONG; - strncpy(temp->field, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, - sizeof(temp->field)); - temp->value.ul = write_iops_sec; - } - - if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0) { - vshError(ctl, "%s", - _("Unable to change block I/O throttle")); - goto cleanup; - } + if (i < nparams && vshCommandOptBool(cmd, "total-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + total_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "read-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + read_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "write-bytes-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, + VIR_TYPED_PARAM_ULLONG, + write_bytes_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "total-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + total_iops_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "read-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + read_iops_sec) < 0) + goto error; + + if (i < nparams && vshCommandOptBool(cmd, "write-iops-sec") && + virTypedParameterAssign(&params[i++], + VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, + VIR_TYPED_PARAM_ULLONG, + write_iops_sec) < 0) + goto error; + + if (virDomainSetBlockIoTune(dom, disk, params, nparams, flags) < 0) + goto error; } ret = true; @@ -8290,6 +8287,10 @@ cleanup: VIR_FREE(params); virDomainFree(dom); return ret; + +error: + vshError(ctl, "%s", _("Unable to change block I/O throttle")); + goto cleanup; } /* -- 1.7.7.6

2 2

[libvirt] [PATCH] build: work around mingw isatty issues
by Eric Blake 29 May '12

29 May '12

Gnulib finally relaxed the isatty license, needed as first mentioned here: https://www.redhat.com/archives/libvir-list/2012-February/msg01022.html * .gnulib: Update to latest, for isatty. * bootstrap.conf (gnulib_modules): Add isatty. * bootstrap: Resync from gnulib. --- Not worth including until after 0.9.12 is out, but I thought I'd post it today, since I was investigating another possible gnulib issue. * .gnulib bb2f564...170e1b4 (33): > isatty: relax license to LGPLv2+ > stat-size: comment fix > Tests for module 'sh-quote'. > sh-quote: Improve shell_quote_argv's signature. > stdint: document issues with int_fast8_t etc. > nanosleep: Fix typo in comment. > nanosleep: Avoid guessing wrong when cross-compiling to Linux. > link-follow: Avoid guessing wrong when cross-compiling to glibc/Linux. > tzset: Avoid guessing wrong when cross-compiling to glibc systems. > d-ino: Avoid guessing "no" when cross-compiling to glibc/Linux systems. > fseeko-tests, ftello-tests: Avoid "guessing no" when cross-compiling. > signbit: Avoid "guessing no" when cross-compiling to glibc systems. > strerror: Avoid "guessing no" when cross-compiling to glibc systems. > canonicalize[-lgpl]: Avoid "guessing no" when cross-compiling to glibc. > gettimeofday: Avoid bad guess when cross-compiling to glibc systems. > Tweak last commit. > unistd_h: make it easier to avoid sys_types_h > lstat: Avoid "guessing no" when cross-compiling to glibc systems. > *alloc-gnu, eealloc: Avoid "guessing no" when cross-compiling to glibc. > getgroups: Avoid "guessing no" when cross-compiling to glibc systems. > chown: Avoid "guessing no" when cross-compiling to glibc systems. > Simplify last commit. > Avoid "guessing no" guesses when cross-compiling to glibc systems. > Say "guessing yes" or "guessing no" when cross-compiling. > relocatable-prog: Enable ELF ORIGIN trick also on GNU/kFreeBSD. > gnulib-tool: Remove transitional code. > getcwd: Fix misindentation. > exclude: process exclude and include directives in order > exclude: handle wildcards with FNM_NOESCAPE and with trailing \ > _Noreturn: future-proof non-GNU and non-MSVC compilers > exclude: handle wildcards with FNM_EXTMATCH > gnulib-tool: Fix list of authors. > bootstrap: support Automake-NG in $buildreq .gnulib | 2 +- bootstrap | 18 +++++++++++++++++- bootstrap.conf | 1 + 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index bb2f564..170e1b4 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit bb2f5640d5379c5b4eec2d62341413bbab1aa308 +Subproject commit 170e1b42590631eac8279664ccc0b99ee5a73fb7 diff --git a/bootstrap b/bootstrap index 6b45868..c496d29 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2012-04-25.17; # UTC +scriptversion=2012-04-26.13; # UTC # Bootstrap this package from checked-out sources. @@ -433,6 +433,22 @@ check_versions() { GZIP) ;; # Do not use $GZIP: it contains gzip options. *) eval "app=\${$appvar-$app}" ;; esac + + # Handle the still-experimental Automake-NG programs specially. + # They remain named as the mainstream Automake programs ("automake", + # and "aclocal") to avoid gratuitous incompatibilities with + # pre-existing usages (by, say, autoreconf, or custom autogen.sh + # scripts), but correctly identify themselves (as being part of + # "GNU automake-ng") when asked their version. + case $app in + automake-ng|aclocal-ng) + app=`echo "$app" | sed 's/-ng$//'` + ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { + echo "$me: Error: '$app' not found or not from Automake-NG" >&2 + ret=1 + continue + } ;; + esac if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. diff --git a/bootstrap.conf b/bootstrap.conf index c6620e5..9b42cbf 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -60,6 +60,7 @@ ignore-value inet_pton intprops ioctl +isatty largefile listen maintainer-makefile -- 1.7.7.6

2 3

[libvirt] [PATCH] Fix memory leak
by Stefan Berger 29 May '12

29 May '12

Fix the following memory leak: ==3240== 23 bytes in 1 blocks are definitely lost in loss record 242 of 744 ==3240== at 0x4C2A4CD: malloc (vg_replace_malloc.c:236) ==3240== by 0x8077537: __vasprintf_chk (vasprintf_chk.c:82) ==3240== by 0x509C677: virVasprintf (stdio2.h:199) ==3240== by 0x509C733: virAsprintf (util.c:1912) ==3240== by 0x1906583A: qemudStartup (qemu_driver.c:679) ==3240== by 0x511991D: virStateInitialize (libvirt.c:809) ==3240== by 0x40CD84: daemonRunStateInit (libvirtd.c:751) ==3240== by 0x5098745: virThreadHelper (threads-pthread.c:161) ==3240== by 0x7953D8F: start_thread (pthread_create.c:309) ==3240== by 0x805FF5C: clone (clone.S:115) --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -745,6 +745,8 @@ qemudStartup(int privileged) { if (conn) virConnectClose(conn); + VIR_FREE(membase); + return 0; out_of_memory:

2 2