- Devel - libvirt List Archives

[libvirt] [PATCH] maint: avoid new automake warning about AM_PROG_CC_STDC
by Jim Meyering 26 May '12

26 May '12

When I built libvirt recently, I saw a warning go by: (with cutting edge automake-1.12a) configure.ac:83: warning: macro 'AM_PROG_CC_STDC' not found in library This fixes it: >From 8f66a7e7f12efa2a60754f06627e94d96030ac78 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Sat, 26 May 2012 11:21:47 +0200 Subject: [PATCH] maint: avoid new automake warning about AM_PROG_CC_STDC * configure.ac (AM_PROG_CC_STDC): Stop using this macro. It provokes warnings from newer automake and is superseded by autoconf's AC_PROG_CC, which we're already using. --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5d06b47..54f51ee 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,6 @@ dnl Checks for C compiler. AC_PROG_CC AC_PROG_INSTALL AC_PROG_CPP -AM_PROG_CC_STDC gl_EARLY gl_INIT -- 1.7.10.2.565.gbd578b5

2 2

[libvirt] [PATCH] qemu: allow snapshotting of sheepdog and rbd disks
by Josh Durgin 25 May '12

25 May '12

Signed-off-by: Josh Durgin <josh.durgin(a)dreamhost.com> --- .gnulib | 2 +- src/qemu/qemu_driver.c | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gnulib b/.gnulib index d5612c7..6b93d00 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit d5612c714c87555f1059d71d347e20271dced322 +Subproject commit 6b93d00f5410ec183e3a70ebf8e418e3b1bb0191 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7e6d59c..fc537df 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9571,12 +9571,18 @@ qemuDomainSnapshotIsAllowed(virDomainObjPtr vm) * that succeed as well */ for (i = 0; i < vm->def->ndisks; i++) { - if ((vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_LUN) || - (vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK && - STRNEQ_NULLABLE(vm->def->disks[i]->driverType, "qcow2"))) { + virDomainDiskDefPtr disk = vm->def->disks[i]; + if (disk->type == VIR_DOMAIN_DISK_TYPE_NETWORK && + (disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_SHEEPDOG || + disk->protocol == VIR_DOMAIN_DISK_PROTOCOL_RBD)) + continue; + + if ((disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) || + (disk->device == VIR_DOMAIN_DISK_DEVICE_DISK && + STRNEQ_NULLABLE(disk->driverType, "qcow2"))) { qemuReportError(VIR_ERR_OPERATION_INVALID, _("Disk '%s' does not support snapshotting"), - vm->def->disks[i]->src); + disk->src); return false; } } -- 1.7.5.4

2 2

[libvirt] [PATCH 00/10 v2] Enable loadable modules for libvirtd
by Daniel P. Berrange 25 May '12

25 May '12

A simple rebase of https://www.redhat.com/archives/libvir-list/2012-April/msg00045.html For a long timer we've had the ability to build each libvirt driver as a loadable module. We have never used this by default and as a result it constantly bit-rots. This series fixes various bugs, and then enables it by default in configure. It also makes the PRMs use the loadable modules, adding new new sub-RPMs for each module. We can now finally install minimal libvirt binaries for each hypervisor. ie yum install libvirt-daemon-kvm will not pull in Xen libraries! Changes in v2: - Fix build with dtrace - Rebase to latest GIT master configure.ac | 20 ++ daemon/Makefile.am | 5 daemon/libvirtd.c | 35 ++++ libvirt.spec.in | 298 +++++++++++++++++++++++++++++++++++++++- src/Makefile.am | 156 ++++++-------------- src/driver.c | 20 ++ src/driver.h | 1 src/internal.h | 2 src/libvirt.c | 129 +++++------------ src/libvirt_driver_modules.syms | 1 src/libvirt_esx.syms | 7 src/libvirt_openvz.syms | 7 src/libvirt_private.syms | 41 +++++ src/libvirt_probes.d | 21 -- src/libvirt_qemu_probes.d | 21 ++ src/qemu/qemu_monitor.c | 4 src/qemu/qemu_monitor_json.c | 4 src/qemu/qemu_monitor_text.c | 4 tests/Makefile.am | 91 ++++++------ tests/virdrivermoduletest.c | 104 +++++++++++++ 20 files changed, 705 insertions(+), 266 deletions(-)

4 29

[libvirt] [PATCH] build: silence libtool warning
by Eric Blake 25 May '12

25 May '12

Libtool supports linking directly against .o files on some platforms (such as Linux), which happens to be the only place where we are actually doing that (for the dtrace-generated probes.o files). However, it raises a big stink about the non-portability, even though we don't attempt it on platforms where it would actually fail: CCLD libvirt_driver_qemu.la *** Warning: Linking the shared library libvirt_driver_qemu.la against the non-libtool *** objects libvirt_qemu_probes.o is not portable! This shuts libtool up by creating a proper .lo file that matches what libtool normally expects. * src/Makefile.am (%_probes.lo): New rule. (libvirt_probes.stp, libvirt_qemu_probes.stp): Simplify into... (%_probes.stp): ...shorter rule. (CLEANFILES): Clean new .lo files. (libvirt_la_BUILT_LIBADD, libvirt_driver_qemu_la_LIBADD) (libvirt_lxc_LDADD, virt_aa_helper_LDADD): Link against .lo file. * tests/Makefile.am (PROBES_O, qemu_LDADDS): Likewise. --- I got tired enough of the warning to figure out how to shut it up; libtool was rather particular about parsing the first two lines of comments embedded in the .lo file before declaring it to have correct syntax. However, I got stumped by the next round of warnings: CCLD qemuxml2xmltest *** Warning: Linking the executable qemuxml2xmltest against the loadable module *** libvirt_driver_qemu.so is not portable! Anyone have a clue on that one? Would a convenience library be the key? src/Makefile.am | 28 ++++++++++++++++++---------- tests/Makefile.am | 4 ++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index bdb0ef4..0b20f1f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1246,7 +1246,7 @@ libvirt_la_CFLAGS = -DIN_LIBVIRT $(AM_CFLAGS) libvirt_la_DEPENDENCIES = $(libvirt_la_BUILT_LIBADD) $(LIBVIRT_SYMBOL_FILE) if WITH_DTRACE_PROBES -libvirt_la_BUILT_LIBADD += libvirt_probes.o +libvirt_la_BUILT_LIBADD += libvirt_probes.lo libvirt_la_DEPENDENCIES += libvirt_probes.o nodist_libvirt_la_SOURCES = libvirt_probes.h if WITH_REMOTE @@ -1256,7 +1256,7 @@ endif WITH_REMOTE BUILT_SOURCES += libvirt_probes.h libvirt_probes.stp libvirt_functions.stp if WITH_QEMU -libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.o +libvirt_driver_qemu_la_LIBADD += libvirt_qemu_probes.lo nodist_libvirt_driver_qemu_la_SOURCES = libvirt_qemu_probes.h libvirt_driver_qemu_la_DEPENDENCIES = libvirt_qemu_probes.o @@ -1272,6 +1272,15 @@ tapset_DATA = libvirt_probes.stp libvirt_qemu_probes.stp libvirt_functions.stp %_probes.o: %_probes.d $(AM_V_GEN)$(DTRACE) -o $@ -G -s $< +%_probes.lo: %_probes.o + $(AM_V_GEN)printf %s\\n \ + '# $@ - a libtool object file' \ + '# Generated by libtool (GNU libtool) 2.4' \ + '# Actually generated by Makefile.am, in order to shut up libtool' \ + "pic_object='$<'" \ + "non_pic_object='$<'" \ + > $@ + RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \ $(srcdir)/rpc/virkeepaliveprotocol.x \ $(srcdir)/remote/remote_protocol.x \ @@ -1280,14 +1289,13 @@ RPC_PROBE_FILES = $(srcdir)/rpc/virnetprotocol.x \ libvirt_functions.stp: $(RPC_PROBE_FILES) $(srcdir)/rpc/gensystemtap.pl $(AM_V_GEN)perl -w $(srcdir)/rpc/gensystemtap.pl $(RPC_PROBE_FILES) > $@ -libvirt_probes.stp: libvirt_probes.d $(srcdir)/dtrace2systemtap.pl - $(AM_V_GEN)perl -w $(srcdir)/dtrace2systemtap.pl $(bindir) $(sbindir) $(libdir) $< > $@ - -libvirt_qemu_probes.stp: libvirt_qemu_probes.d $(srcdir)/dtrace2systemtap.pl - $(AM_V_GEN)perl -w $(srcdir)/dtrace2systemtap.pl $(bindir) $(sbindir) $(libdir) $< > $@ +%_probes.stp: %_probes.d $(srcdir)/dtrace2systemtap.pl + $(AM_V_GEN)perl -w $(srcdir)/dtrace2systemtap.pl \ + $(bindir) $(sbindir) $(libdir) $< > $@ -CLEANFILES += libvirt_probes.h libvirt_probes.o \ +CLEANFILES += libvirt_probes.h libvirt_probes.o libvirt_probes.lo \ libvirt_qemu_probes.h libvirt_qemu_probes.o \ + libvirt_qemu_probes.lo\ libvirt_functions.stp libvirt_probes.stp \ libvirt_qemu_probes.stp endif @@ -1479,7 +1487,7 @@ libvirt_lxc_LDADD = $(CAPNG_LIBS) $(YAJL_LIBS) \ $(RT_LIBS) $(DBUS_LIBS) \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES -libvirt_lxc_LDADD += libvirt_probes.o +libvirt_lxc_LDADD += libvirt_probes.lo endif if WITH_SECDRIVER_SELINUX libvirt_lxc_LDADD += $(SELINUX_LIBS) @@ -1524,7 +1532,7 @@ virt_aa_helper_LDADD = \ libvirt_util.la \ ../gnulib/lib/libgnu.la if WITH_DTRACE_PROBES -virt_aa_helper_LDADD += libvirt_probes.o +virt_aa_helper_LDADD += libvirt_probes.lo endif virt_aa_helper_CFLAGS = \ -I$(top_srcdir)/src/conf \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 24818b1..d1106cf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,7 +31,7 @@ endif PROBES_O = if WITH_DTRACE_PROBES -PROBES_O += ../src/libvirt_probes.o +PROBES_O += ../src/libvirt_probes.lo endif LDADDS = \ @@ -295,7 +295,7 @@ if WITH_NETWORK qemu_LDADDS += ../src/libvirt_driver_network.la endif if WITH_DTRACE_PROBES -qemu_LDADDS += ../src/libvirt_qemu_probes.o +qemu_LDADDS += ../src/libvirt_qemu_probes.lo endif qemu_LDADDS += $(LDADDS) -- 1.7.7.6

2 2

[libvirt] [PATCH 0/3] Simplify error reporting int->string conversions
by Daniel P. Berrange 25 May '12

25 May '12

Currently the error reporting code has some horrible giant switch statements for doing integer to string conversions on error domains and error numbers. Replace this with the more traditional approach of using VIR_ENUM helpers

2 7

[libvirt] [PATCH] Remove last usageof PATH_MAX and ban its future use
by Daniel P. Berrange 25 May '12

25 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Remove a number of pointless checks against PATH_MAX and add a syntax-check rule to prevent its use in future --- cfg.mk | 5 +++++ src/security/virt-aa-helper.c | 4 ++-- src/storage/storage_backend_scsi.c | 2 +- src/xenxs/xen_xm.c | 2 -- tools/virsh.c | 7 ++++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/cfg.mk b/cfg.mk index 07fb7b2..534dc67 100644 --- a/cfg.mk +++ b/cfg.mk @@ -408,6 +408,11 @@ sc_prohibit_VIR_ERR_NO_MEMORY: halt='use virReportOOMError, not V'IR_ERR_NO_MEMORY \ $(_sc_search_regexp) +sc_prohibit_PATH_MAX: + @prohibit='\<P''ATH_MAX\>' \ + halt='dynamically allocate paths, do not use P'ATH_MAX \ + $(_sc_search_regexp) + # Use a subshell for each function, to give the optimal warning message. include $(srcdir)/Makefile.nonreentrant sc_prohibit_nonreentrant: diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index a5cb85c..7b41d38 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -473,7 +473,7 @@ valid_name(const char *name) * used to subvert the profile */ const char *bad = " /[]*"; - if (strlen(name) == 0 || strlen(name) > PATH_MAX - 1) + if (strlen(name) == 0) return -1; if (strcspn(name, bad) != strlen(name)) @@ -544,7 +544,7 @@ valid_path(const char *path, const bool readonly) "/sys/devices/pci" /* for hostdev pci devices */ }; - if (path == NULL || strlen(path) > PATH_MAX - 1) { + if (path == NULL) { vah_error(NULL, 0, _("bad pathname")); return -1; } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index ae1e19f..465d557 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -251,7 +251,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, goto free_vol; } - if (STREQLEN(devpath, vol->target.path, PATH_MAX) && + if (STREQ(devpath, vol->target.path) && !(STREQ(pool->def->target.path, "/dev") || STREQ(pool->def->target.path, "/dev/"))) { diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 93a26f9..bdf46bd 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -501,8 +501,6 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, /* Extract the source file path*/ if (!(offset = strchr(head, ','))) goto skipdisk; - if ((offset - head) >= (PATH_MAX-1)) - goto skipdisk; if (offset == head) { disk->src = NULL; /* No source file given, eg CDROM with no media */ diff --git a/tools/virsh.c b/tools/virsh.c index ffe6ed2..4492a2b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -15542,11 +15542,12 @@ editWriteToTempFile (vshControl *ctl, const char *doc) const char *tmpdir; int fd; - ret = vshMalloc(ctl, PATH_MAX); - tmpdir = getenv ("TMPDIR"); if (!tmpdir) tmpdir = "/tmp"; - snprintf (ret, PATH_MAX, "%s/virshXXXXXX.xml", tmpdir); + if (virAsprintf(&ret, "%s/virshXXXXXX.xml", tmpdir) < 0) { + vshError(ctl, "%s", _("out of memory")); + return NULL; + } fd = mkstemps(ret, 4); if (fd == -1) { vshError(ctl, _("mkstemps: failed to create temporary file: %s"), -- 1.7.10.1

2 1

[libvirt] [PATCH 0/4] Improve testing of augeas lens & fix lens bugs
by Daniel P. Berrange 25 May '12

25 May '12

This improves testing of the augeas lens to ensure that all possible config options are handled

2 8

[libvirt] [PATCH] Fix check for socket existance / daemon spawn
by Daniel P. Berrange 25 May '12

25 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When you try to connect to a socket in the abstract namespace, the error will be ECONNREFUSED for a non-listening daemon. With the non-abstract namespace though, you instead get ENOENT. Add a check for this extra errno when auto-spawning the daemon Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/rpc/virnetsocket.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index fa16d31..0b32ffe 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -502,7 +502,11 @@ int virNetSocketNewConnectUNIX(const char *path, retry: if (connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { - if (errno == ECONNREFUSED && spawnDaemon && retries < 20) { + if ((errno == ECONNREFUSED || + errno == ENOENT) && + spawnDaemon && retries < 20) { + VIR_DEBUG("Connection refused for %s, trying to spawn %s", + path, binary); if (retries == 0 && virNetSocketForkDaemon(binary) < 0) goto error; -- 1.7.10.1

3 2

[libvirt] Compiling Warning
by Alex Jia 25 May '12

25 May '12

Hello Eric, I met some compiling warning, I'm not sure whether my environment is dirty, please help confirm them: *** Warning: Linking the executable qemuxml2argvtest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemuxml2argvtest against the loadable module *** libvirt_driver_network.so is not portable! CC qemuxml2xmltest.o CCLD qemuxml2xmltest *** Warning: Linking the executable qemuxml2xmltest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemuxml2xmltest against the loadable module *** libvirt_driver_network.so is not portable! CC qemuxmlnstest.o CCLD qemuxmlnstest *** Warning: Linking the executable qemuxmlnstest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemuxmlnstest against the loadable module *** libvirt_driver_network.so is not portable! CC qemuargv2xmltest.o CCLD qemuargv2xmltest *** Warning: Linking the executable qemuargv2xmltest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemuargv2xmltest against the loadable module *** libvirt_driver_network.so is not portable! CC qemuhelptest.o CCLD qemuhelptest *** Warning: Linking the executable qemuhelptest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemuhelptest against the loadable module *** libvirt_driver_network.so is not portable! CC domainsnapshotxml2xmltest.o CCLD domainsnapshotxml2xmltest *** Warning: Linking the executable domainsnapshotxml2xmltest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable domainsnapshotxml2xmltest against the loadable module *** libvirt_driver_network.so is not portable! CC qemumonitortest.o CCLD qemumonitortest *** Warning: Linking the executable qemumonitortest against the loadable module *** libvirt_driver_qemu.so is not portable! *** Warning: Linking the executable qemumonitortest against the loadable module *** libvirt_driver_network.so is not portable! CC lxcxml2xmltest.o CC testutilslxc.o CCLD lxcxml2xmltest *** Warning: Linking the executable lxcxml2xmltest against the loadable module *** libvirt_driver_lxc.so is not portable! *** Warning: Linking the executable lxcxml2xmltest against the loadable module *** libvirt_driver_network.so is not portable! CC openvzutilstest.o CCLD openvzutilstest CC esxutilstest.o CCLD esxutilstest CC vmx2xmltest.o CCLD vmx2xmltest CC xml2vmxtest.o CCLD xml2vmxtest CC jsontest.o CCLD jsontest CC networkxml2xmltest.o CCLD networkxml2xmltest CC networkxml2argvtest.o CCLD networkxml2argvtest *** Warning: Linking the executable networkxml2argvtest against the loadable module *** libvirt_driver_network.so is not portable! Thanks, Alex

3 4

[libvirt] [PATCH] Improve docs about compiling libvirt from GIT
by Daniel P. Berrange 25 May '12

25 May '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add a note about setting the LIBVIRT_DRIVER_DIR env variable, explain --system and fix example to use --disable-werror --- docs/compiling.html.in | 51 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/docs/compiling.html.in b/docs/compiling.html.in index 49bc7ee..5a9d9ee 100644 --- a/docs/compiling.html.in +++ b/docs/compiling.html.in @@ -62,14 +62,57 @@ The libvirt build process uses GNU autotools, so after obtaining a checkout it is necessary to generate the configure script and Makefile.in - templates using the <code>autogen.sh</code> command, passing the extra - arguments as for configure. As an example, to do a complete build and - install it into your home directory run: + templates using the <code>autogen.sh</code> command. By default when + the <code>confiure</code> script is run from within a GIT checkout, it + will turn on -Werror for builds. This can be disabled with --disable-werror, + but this is not recommended. To build & install libvirt to your home + directory the following commands can be run: <pre> - $ ./autogen.sh --prefix=$HOME/usr --enable-compile-warnings=error + $ ./autogen.sh --prefix=$HOME/usr $ make $ sudo make install</pre> + + + Be aware though, that binaries built with a custom prefix will not + interoperate with OS vendor provided binaries, since the UNIX socket + paths will all be different. To produce a build that is compatible + with normal OS vendor prefixes, using + + + <pre> + $ ./autogen.sh --system + $ make + </pre> + + + When doing this for day-to-day development purposes, it is recommended + not to install over the to OS vendor provided binaries. Instead simply + run libvirt directory from the source tree. For example to run + a privileged libvirtd instance + + + <pre> + $ su - + # service libvirtd stop (or systemctl stop libvirtd.service) + # /home/to/your/checkout/daemon/libvirtd + </pre> + + + It is also possible to run virsh directly from the source tree + + + <pre> + $ ./tools/virsh .... + </pre> + + + A normal configuration of libvirt will build hypervisor drivers + as loadable modules. When runnning from a non-installed source + tree, libvirtd will attempt to find the modules from the same + source tree. If this is not possible though, you can explicitly + set <code>LIBVIRT_DRIVER_DIR=/path/to/source/tree/src/.libs</code> + </body> </html> -- 1.7.10.1

3 3