- Devel - libvirt List Archives

[Libvir] [PATCH] Fix capabilities xml for topology info
by Cole Robinson 03 Mar '08

03 Mar '08

The patch below fixes the capabilities xml generated for the hosts topology info. This was causing virt-install to barf when using the test driver (see attached capabilities xml from before this patch). Thanks, Cole diff --git a/src/capabilities.c b/src/capabilities.c index bedd445..01bb308 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -583,7 +583,7 @@ virCapabilitiesFormatXML(virCapsPtr caps) caps->host.numaCell[i]->ncpus) < 0) goto no_memory; for (j = 0 ; j < caps->host.numaCell[i]->ncpus ; j++) - if (virBufferVSprintf(&xml, " <cpu id='%d'>\n", + if (virBufferVSprintf(&xml, " <cpu id='%d'/>\n", caps->host.numaCell[i]->cpus[j]) < 0) goto no_memory; if (virBufferAddLit(&xml, " </cpus>\n") < 0) <capabilities> <host> <cpu> <arch>i686</arch> <features> <pae/> <nonpae/> </features> </cpu> <topology> <cells num='2'> <cell id='0'> <cpus num='8'> <cpu id='0'> <cpu id='2'> <cpu id='4'> <cpu id='6'> <cpu id='8'> <cpu id='10'> <cpu id='12'> <cpu id='14'> </cpus> </cell> <cell id='1'> <cpus num='8'> <cpu id='1'> <cpu id='3'> <cpu id='5'> <cpu id='7'> <cpu id='9'> <cpu id='11'> <cpu id='13'> <cpu id='15'> </cpus> </cell> </cells> </topology> </host> <guest> <os_type>linux</os_type> <arch name='i686'> <wordsize>32</wordsize> <domain type='test'> </domain> </arch> <features> <pae/> <nonpae/> </features> </guest> </capabilities>

2 1

[Libvir] fix another bug exposed by a compiler warning
by Jim Meyering 03 Mar '08

03 Mar '08

Correct a no-op conditional. * src/qemu_conf.c (qemudReportError): Reverse a test, and use the pointer, errorMessage not its first byte, errorMessage[0]. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/qemu_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index eead0bc..3877849 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -68,7 +68,7 @@ void qemudReportError(virConnectPtr conn, errorMessage[0] = '\0'; } - virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage[0] : NULL)); + virerr = __virErrorMsg(code, (!errorMessage[0] ? errorMessage : NULL)); __virRaiseError(conn, dom, net, VIR_FROM_QEMU, code, VIR_ERR_ERROR, virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug skipped-qemudCleanup leak.
by Jim Meyering 03 Mar '08

03 Mar '08

And another: Plug skipped-qemudCleanup leak. * qemud/qemud.c (main): Call qemudCleanup also upon failure. Otherwise, an error return would skip it and induce leaks. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- ChangeLog | 6 ++++++ qemud/qemud.c | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 049f515..81452ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Jim Meyering <meyering(a)redhat.com> + + Plug skipped-qemudCleanup leak. + * qemud/qemud.c (main): Call qemudCleanup also upon failure. + Otherwise, an error return would skip it and induce leaks. + Mon Mar 3 07:16:35 CET 2008 Daniel Veillard <veillard(a)redhat.com> * include/libvirt/libvirt.h include/libvirt/libvirt.h.in: diff --git a/qemud/qemud.c b/qemud/qemud.c index 851e83e..7ccc9ee 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -2166,8 +2166,6 @@ int main(int argc, char **argv) { qemudRunLoop(server); - qemudCleanup(server); - close(sigwrite); if (godaemon) @@ -2181,6 +2179,7 @@ int main(int argc, char **argv) { unlink (pid_file); error1: + qemudCleanup(server); return ret; } -- 1.5.4.3.366.g55277

2 2

[Libvir] [PATCH] Plug saslUsernameWhitelist leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Here's the last one: Plug saslUsernameWhitelist leak. * qemud/qemud.c (qemudCleanup): Free the array as well as the strings in it. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 7ccc9ee..96fdf32 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1661,6 +1661,7 @@ static void qemudCleanup(struct qemud_server *server) { free(*list); list++; } + free(server->saslUsernameWhitelist); } #endif -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Plug remoteReadConfigFile leak.
by Jim Meyering 03 Mar '08

03 Mar '08

Another. This happens only upon reading an invalid config file. Plug remoteReadConfigFile leak. * qemud/qemud.c (remoteReadConfigFile): Be careful to free "conf" after a successful virConfReadFile. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- qemud/qemud.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemud/qemud.c b/qemud/qemud.c index 9ce9edd..851e83e 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1877,7 +1877,7 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) GET_CONF_STR (conf, filename, tcp_port); if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) - return -1; + goto free_and_fail; #if HAVE_POLKIT /* Change default perms to be wide-open if PolicyKit is enabled. * Admin can always override in config file @@ -1886,11 +1886,11 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename) unix_sock_rw_mask = 0777; #endif if (remoteConfigGetAuth(conf, "auth_unix_ro", &auth_unix_ro, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tcp", &auth_tcp, filename) < 0) - return -1; + goto free_and_fail; if (remoteConfigGetAuth(conf, "auth_tls", &auth_tls, filename) < 0) - return -1; + goto free_and_fail; GET_CONF_STR (conf, filename, unix_sock_group); if (unix_sock_group) { -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] Avoid two more leaks.
by Jim Meyering 03 Mar '08

03 Mar '08

Here are two more: Avoid two more leaks. * src/capabilities.c (virCapabilitiesFree): Free host.migrateTrans. (virCapabilitiesFreeGuest): Free arch.name member. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 2544bd3..bedd445 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -91,6 +91,7 @@ virCapabilitiesFreeGuest(virCapsGuestPtr guest) int i; free(guest->ostype); + free(guest->arch.name); free(guest->arch.defaultInfo.emulator); free(guest->arch.defaultInfo.loader); for (i = 0 ; i < guest->arch.defaultInfo.nmachines ; i++) @@ -130,6 +131,10 @@ virCapabilitiesFree(virCapsPtr caps) { virCapabilitiesFreeHostNUMACell(caps->host.numaCell[i]); free(caps->host.numaCell); + for (i = 0 ; i < caps->host.nmigrateTrans ; i++) + free(caps->host.migrateTrans[i]); + free(caps->host.migrateTrans); + free(caps->host.arch); free(caps); } -- 1.5.4.3.366.g55277

2 4

[Libvir] [PATCH] Plug a leak.
by Jim Meyering 03 Mar '08

03 Mar '08

I ran valgrind via "make check" and found some leaks. This fixes the first: Plug a leak. * src/capabilities.c (virCapabilitiesFreeGuestDomain): Free dom->type. (virCapabilitiesAddGuestDomain): Remove duplicate strdup stmt. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/capabilities.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/src/capabilities.c b/src/capabilities.c index 263935c..2544bd3 100644 --- a/src/capabilities.c +++ b/src/capabilities.c @@ -73,6 +73,7 @@ virCapabilitiesFreeGuestDomain(virCapsGuestDomainPtr dom) for (i = 0 ; i < dom->info.nmachines ; i++) free(dom->info.machines[i]); free(dom->info.machines); + free(dom->type); free(dom); } @@ -328,9 +329,6 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest, if ((dom->type = strdup(hvtype)) == NULL) goto no_memory; - if ((dom->type = strdup(hvtype)) == NULL) - goto no_memory; - if (emulator && (dom->info.emulator = strdup(emulator)) == NULL) goto no_memory; -- 1.5.4.3.366.g55277

2 1

[Libvir] [PATCH] fix typos (part3)
by Atsushi SAKAI 29 Feb '08

29 Feb '08

2 1

[Libvir] Snapshots in Libvirt
by Gabriel Kaufmann 28 Feb '08

28 Feb '08

Hi, Can anyone tell me on which version of libvirt, the snapshot functionality is planned to be implemented fos Xen and KVM? By snapshot I mean to be able to save the state of the machine in order to be able to revert to the snapshot. Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

4 4

[Libvir] [PATCH] Avoid link errors with "configure --disable-shared".
by Jim Meyering 28 Feb '08

28 Feb '08

I got link errors when building with --disable-shared, and finally fixed it. Here's most of the solution. The patch after this one adjusts the gcov (test-coverage)-related things so that works with the new setup, too. This also fixes what look like accidental omissions in src/libvirt_sym.version. Avoid link errors with "configure --disable-shared". * src/Makefile.am: Create a convenience library, libvirt_test.la, and don't restrict access to *its* symbols. * tests/Makefile.am (LDADDS): Add ../src/libvirt_test.la, so that "configure --disable-shared" no longer provokes link errors. (LIBVIRT): Remove definition. (LDADDS): Remove use. ($(LIBVIRT)): Remove rule. (LDADDS): Use the new convenience library instead. (CLEANFILES): Define. * docs/examples/index.py (dump_Makefile): Append $(COVERAGE_LDFLAGS), to the LDADDS definition, to avoid link error with the combination of --enable-test-coverage and --disable-shared. * docs/examples/Makefile.am: Regenerate. * docs/examples/index.html: Likewise. * qemud/Makefile.am (libvirtd_LDFLAGS): Append $(COVERAGE_LDFLAGS). Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/Makefile.am | 2 +- docs/examples/index.html | 2 +- docs/examples/index.py | 3 ++- qemud/Makefile.am | 26 ++++++++++++++++---------- src/Makefile.am | 19 +++++++++++++++++++ src/libvirt_sym.version | 11 +++++++---- tests/Makefile.am | 13 ++----------- 7 files changed, 48 insertions(+), 28 deletions(-) diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am index 9da4e21..d8e4868 100644 --- a/docs/examples/Makefile.am +++ b/docs/examples/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/docs/examples/index.html b/docs/examples/index.html [...omitting generated diff containing a couple of 4000+-byte lines...] diff --git a/docs/examples/index.py b/docs/examples/index.py index 8f386ed..6be80c5 100755 --- a/docs/examples/index.py +++ b/docs/examples/index.py @@ -225,7 +225,8 @@ def dump_Makefile(): SUBDIRS=python INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I@srcdir@/include DEPS = $(top_builddir)/src/libvirt.la -LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la +LDADDS = @STATIC_BINARIES@ $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ + $(COVERAGE_LDFLAGS) rebuild: examples.xml index.html diff --git a/qemud/Makefile.am b/qemud/Makefile.am index 1e1f861..b39bc2f 100644 --- a/qemud/Makefile.am +++ b/qemud/Makefile.am @@ -47,18 +47,22 @@ libvirtd_SOURCES = \ #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L libvirtd_CFLAGS = \ - -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ - -I$(top_srcdir)/include -I$(top_builddir)/include \ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(POLKIT_CFLAGS) \ - $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ - -DSYSCONF_DIR="\"$(sysconfdir)\"" \ + -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ + -I$(top_srcdir)/include -I$(top_builddir)/include \ + $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ + $(POLKIT_CFLAGS) \ + $(WARN_CFLAGS) -DLOCAL_STATE_DIR="\"$(localstatedir)\"" \ + $(COVERAGE_CFLAGS) \ + -DSYSCONF_DIR="\"$(sysconfdir)\"" \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" \ - -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + -DGETTEXT_PACKAGE=\"$(PACKAGE)\" + +libvirtd_LDFLAGS = \ + $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ + $(COVERAGE_LDFLAGS) + $(POLKIT_LIBS) -libvirtd_LDFLAGS = $(WARN_CFLAGS) $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \ - $(POLKIT_LIBS) libvirtd_DEPENDENCIES = ../src/libvirt.la libvirtd_LDADD = ../src/libvirt.la ../gnulib/lib/libgnu.la @@ -144,7 +148,6 @@ libvirtd.init: libvirtd.init.in chmod a+x $@-t mv $@-t $@ -CLEANFILES = libvirtd.init else install-init: @@ -153,3 +156,6 @@ uninstall-init: endif # DBUS_INIT_SCRIPTS_RED_HAT endif # WITH_LIBVIRTD + +CLEANFILES = libvirtd.init +CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda diff --git a/src/Makefile.am b/src/Makefile.am index 02be9db..c15de77 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -99,6 +99,25 @@ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT +# Create an automake "convenience library" version of libvirt_la, +# just for testing, since the test harness requires access to internal +# bits and pieces that we don't want to make publicly accessible. +noinst_LTLIBRARIES = libvirt_test.la + +# Convert libvirt_sym.version +# to libvirt_test_sym.version, and +# remove -version-info X.Y.Z (not needed since this is a convenience library. +test_LDFLAGS = \ + $$(echo '$(libvirt_la_LDFLAGS)' \ + |sed 's!-Wl,--v.*_sym\.version!!' \ + |sed 's!-version-info @LIBVIRT_VERSION_INFO@!!') + +# Just like the above, but with a slightly different set of public symbols. +libvirt_test_la_SOURCES = $(libvirt_la_SOURCES) +libvirt_test_la_LIBADD = $(libvirt_la_LIBADD) +libvirt_test_la_LDFLAGS = $(test_LDFLAGS) +libvirt_test_la_CFLAGS = $(COVERAGE_CFLAGS) + bin_PROGRAMS = virsh virsh_SOURCES = virsh.c console.c console.h util-lib.c diff --git a/src/libvirt_sym.version b/src/libvirt_sym.version index 38b631e..581f380 100644 --- a/src/libvirt_sym.version +++ b/src/libvirt_sym.version @@ -32,6 +32,7 @@ virDomainLookupByName; virDomainLookupByUUID; virDomainLookupByUUIDString; + virDomainParseXMLDesc; virDomainRestore; virDomainResume; virDomainSave; @@ -166,10 +167,10 @@ __virEventRegisterImpl; - __virStateInitialize; - __virStateCleanup; - __virStateReload; - __virStateActive; + __virStateInitialize; + __virStateCleanup; + __virStateReload; + __virStateActive; __virDrvSupportsFeature; @@ -184,6 +185,8 @@ __virBufferVSprintf; __virBufferAdd; __virBufferAddChar; + __virErrorMsg; + __virRaiseError; local: *; }; diff --git a/tests/Makefile.am b/tests/Makefile.am index fb9bcff..644715e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,14 +3,6 @@ SUBDIRS = virshdata confdata sexpr2xmldata \ xml2sexprdata xmconfigdata xencapsdata -# Wierd libtool related juju... -# -# We explicitly want wildcard here instead of just linking -# to the libvirt.a file. This ensures that when coverage -# tests are run, all the output data ends up in the correct -# location. ie, src/ instead of src/.libs. -LIBVIRT = $(wildcard $(top_builddir)/src/.libs/libvirt_la-*.o) - INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ @@ -34,7 +26,7 @@ LDADDS = \ $(SASL_LIBS) \ $(SELINUX_LIBS) \ $(WARN_CFLAGS) \ - $(LIBVIRT) \ + ../src/libvirt_test.la \ ../gnulib/lib/libgnu.la \ $(COVERAGE_LDFLAGS) @@ -132,5 +124,4 @@ reconnect_SOURCES = \ reconnect.c reconnect_LDADD = $(LDADDS) -$(LIBVIRT): - -@(cd $(top_builddir)/src && $(MAKE) MAKEFLAGS+=--silent) +CLEANFILES = *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda -- 1.5.4.3.231.gc0a6

3 4