- Devel - libvirt List Archives

[libvirt] [PATCH] security: avoid memory leak
by Eric Blake 22 Feb '11

22 Feb '11

Leak introduced in commit d6623003. * src/qemu/qemu_driver.c (qemuSecurityInit): Avoid leak on failure. * src/security/security_stack.c (virSecurityStackClose): Avoid leaking component drivers. --- src/qemu/qemu_driver.c | 5 ++++- src/security/security_stack.c | 7 ++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0f25a2a..8b15a3e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -204,8 +204,11 @@ qemuSecurityInit(struct qemud_driver *driver) goto error; if (!(driver->securityManager = virSecurityManagerNewStack(mgr, - dac))) + dac))) { + + virSecurityManagerFree(dac); goto error; + } } else { driver->securityManager = mgr; } diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 79b3e1f..64f745a 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -61,8 +61,13 @@ virSecurityStackOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) } static int -virSecurityStackClose(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityStackClose(virSecurityManagerPtr mgr) { + virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); + + virSecurityManagerFree(priv->primary); + virSecurityManagerFree(priv->secondary); + return 0; } -- 1.7.4

2 2

[libvirt] [PATCH] RFC: experimental libvirtd upstart job
by apevec＠gmail.com 22 Feb '11

22 Feb '11

From: Alan Pevec <apevec(a)redhat.com> To install it, disable libvirtd sysv initscript: chkconfig libvirtd off service libvirtd stop and enable libvirtd upstart job: cp /usr/share/doc/libvirt-*/libvirtd.upstart \ /etc/init/libvirtd.conf initctl reload-configuration initctl start libvirtd Test: initctl status libvirtd libvirtd start/running, process 3929 killall -9 libvirtd initctl status libvirtd libvirtd start/running, process 4047 --- daemon/Makefile.am | 1 + daemon/libvirtd.upstart | 47 +++++++++++++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 1 + 3 files changed, 49 insertions(+), 0 deletions(-) create mode 100644 daemon/libvirtd.upstart diff --git a/daemon/Makefile.am b/daemon/Makefile.am index cdf0f75..a4ebcf8 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -27,6 +27,7 @@ EXTRA_DIST = \ remote_generate_stubs.pl \ libvirtd.conf \ libvirtd.init.in \ + libvirtd.upstart \ libvirtd.policy-0 \ libvirtd.policy-1 \ libvirtd.sasl \ diff --git a/daemon/libvirtd.upstart b/daemon/libvirtd.upstart new file mode 100644 index 0000000..40d5fa3 --- /dev/null +++ b/daemon/libvirtd.upstart @@ -0,0 +1,47 @@ +# libvirtd upstart job +# +# XXX wait for rc to get all dependent initscripts started +# from sysv libvirtd initscript: Required-Start: $network messagebus +start on stopped rc RUNLEVEL=[345] +stop on runlevel [016] +respawn +# default rate limit is 10x/5s +#respawn limit 10 5 + +# DAEMON_COREFILE_LIMIT in /etc/sysconfig/libvirtd doesn't have effect +# must set resource limits here +#limit core unlimited unlimited + +# documented http://upstart.ubuntu.com/wiki/Stanzas#pid +# but not accepted by upstart-0.6.5 +#pid file /var/run/libvirtd.pid + +env PIDFILE=/var/run/libvirtd.pid + +script + LIBVIRTD_CONFIG= + LIBVIRTD_ARGS= + KRB5_KTNAME=/etc/libvirt/krb5.tab + + test -f /etc/sysconfig/libvirtd && . /etc/sysconfig/libvirtd + + export QEMU_AUDIO_DRV + export SDL_AUDIODRIVER + + LIBVIRTD_CONFIG_ARGS= + if [ -n "$LIBVIRTD_CONFIG" ] + then + LIBVIRTD_CONFIG_ARGS="--config $LIBVIRTD_CONFIG" + else + true + fi + + mkdir -p /var/cache/libvirt + rm -rf /var/cache/libvirt/* + KRB5_KTNAME=$KRB5_KTNAME /usr/sbin/libvirtd $LIBVIRTD_CONFIG_ARGS $LIBVIRTD_ARGS +end script + +post-stop script + rm -f $PIDFILE + rm -rf /var/cache/libvirt/* +end script diff --git a/libvirt.spec.in b/libvirt.spec.in index a29693a..365000c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -854,6 +854,7 @@ fi %{_sysconfdir}/libvirt/nwfilter/*.xml %{_sysconfdir}/rc.d/init.d/libvirtd +%doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %if %{with_dtrace} -- 1.7.3.4

3 3

[libvirt] [PATCH] Expose name + UUID to LXC containers via env variables
by Daniel P. Berrange 22 Feb '11

22 Feb '11

When spawning 'init' in the container, set LIBVIRT_LXC_UUID=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX LIBVIRT_LXC_NAME=YYYYYYYYYYYY to allow guest software to detect & identify that they are in a container * src/lxc/lxc_container.c: Set LIBVIRT_LXC_UUID and LIBVIRT_LXC_NAME env vars --- src/lxc/lxc_container.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index d973984..269dc97 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -52,6 +52,7 @@ #include "util.h" #include "memory.h" #include "veth.h" +#include "uuid.h" #include "files.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -102,6 +103,20 @@ struct __lxc_child_argv { */ static int lxcContainerExecInit(virDomainDefPtr vmDef) { + char *uuidenv, *nameenv; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virUUIDFormat(vmDef->uuid, uuidstr); + + if (virAsprintf(&uuidenv, "LIBVIRT_LXC_UUID=%s", uuidstr) < 0) { + virReportOOMError(); + return -1; + } + if (virAsprintf(&nameenv, "LIBVIRT_LXC_NAME=%s", vmDef->name) < 0) { + virReportOOMError(); + return -1; + } + const char *const argv[] = { vmDef->os.init, NULL, @@ -109,6 +124,8 @@ static int lxcContainerExecInit(virDomainDefPtr vmDef) const char *const envp[] = { "PATH=/bin:/sbin", "TERM=linux", + uuidenv, + nameenv, NULL, }; -- 1.7.4

2 2

[libvirt] [PATCH] Fix group/mode for /dev/pts inside LXC container
by Daniel P. Berrange 22 Feb '11

22 Feb '11

Normal practice for /dev/pts is to have it mode=620,gid=5 but LXC was leaving mode=000,gid=0 preventing unprivilegd users in the guest use of PTYs * src/lxc/lxc_controller.c: Fix /dev/pts setup --- src/lxc/lxc_controller.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index b742a33..d047f60 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -629,7 +629,7 @@ lxcControllerRun(virDomainDefPtr def, } VIR_DEBUG("Mouting 'devpts' on %s", devpts); - if (mount("devpts", devpts, "devpts", 0, "newinstance,ptmxmode=0666") < 0) { + if (mount("devpts", devpts, "devpts", 0, "newinstance,ptmxmode=0666,mode=0620,gid=5") < 0) { virReportSystemError(errno, _("Failed to mount devpts on %s"), devpts); -- 1.7.4

2 1

[libvirt] [libvirt-php] About the inconsistency in libvirt-php
by Lyre 22 Feb '11

22 Feb '11

Hi all: I noticed that there's some inconsistent behaviors in libvirt-php, and wondering what's the best way to handle them. In libvirt-php: libvirt_list_domains() returns an array of all domain resource; libvirt_list_active_domains() returns an array of running domain ids; libvirt_list_defined_domains() returns an array of defined domain names. and libvirt_list_storagepools() returns an array of actived storagepool names. In my opinion, returning an array of names would be better when listing all kinds of objects. And the naming convenances, let's take domains as an example. libvirt-php provied libvirt_list_domains() for all domains, which has no corresponding function in libvirt. libvirt_list_active_domains() for running domains, corresponding to virConnectListDomains() in libvirt. libvirt_list_defined_domains() for defined domains, corresponding to virConnectListDefinedDomains() in libvirt. I believe it is fine. However, for defined objects, sometimes it used term "defined" (libvirt_list_defined_domains), and sometimes use term "inactive" (libvirt_get_inactive_domain_count) in contrast to "active". Which would be better?

5 13

[libvirt] hello, Would I request some support about libvirt API?
by Saint yeyo 22 Feb '11

22 Feb '11

Hello, honorific developers, I'm a rookie came here to study something about libvirt, I find it a little bit difficult for me to use the API, there is absence of explanation of specific functions and examples. May I ask some kind of you who provide some docs about that for me, I'll very appreciate for you. Thank you! Best regard!

1 0

[libvirt] [libvirt-php 0/1] Added many apis for storagepool
by Lyre 22 Feb '11

22 Feb '11

Hi all: This patch added the followings for storagepool: libvirt_storagepool_get_uuid_string libvirt_storagepool_get_name libvirt_storagepool_lookup_by_uuid_string libvirt_storagepool_get_xml_desc libvirt_storagepool_define_xml libvirt_storagepool_undefine libvirt_storagepool_create libvirt_storagepool_destroy libvirt_storagepool_is_active libvirt_storagepool_get_volume_count libvirt_storagepool_refresh libvirt_storagepool_set_autostart libvirt_storagepool_get_autostart These functions were taken from my own branch of original php-libvirt, with some modification, and litte tests. I've put the function prototype in git log, but it seems not a good idea. Maybe I should provie the documents as well. In my original branch, I've extended php-libvirt a lot with their own documents. But I'm not able to simply merge it into libvirt-php: there're too many functions , some designs are really problematical, libvirt-php have indent the source. The documents may be not welly written, some statment don't looks like native English, since I'm not English speaker. I'm tring to find a way to move the source to into libvirt-php, currently it was copy & paste with some adjustment. Lyre (1): storagepool: added apis for control and query src/libvirt.c | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/php_libvirt.h | 13 +++ 2 files changed, 239 insertions(+), 0 deletions(-)

2 5

[libvirt] [libvirt-php] Fixed checking for libxml2 and prerequisites
by Lyre 22 Feb '11

22 Feb '11

Repalced AM_PATH_XML2 with with the script borrowed from libvirt, which was borrowed from xmlsec. modified: configure.ac modified: src/Makefile.am --- configure.ac | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/Makefile.am | 4 ++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index ac31bd0..b87c7f9 100644 --- a/configure.ac +++ b/configure.ac @@ -10,12 +10,58 @@ AC_PROG_CC AC_LANG([C]) AC_PROG_INSTALL AC_PROG_SED +AC_PROG_AWK AC_CHECK_TOOL([STRIP], [strip]) AC_CHECK_TOOL([ECHO], [echo]) AC_CHECK_TOOL([RM], [rm]) -dnl Check for libxml2 -AM_PATH_XML2([2.0.0]) +dnl Need to test if pkg-config exists +PKG_PROG_PKG_CONFIG + +dnl ========================================================================== +dnl required minimum version of libxml2 +dnl replace "2.0.0" with an appropriate one +dnl ========================================================================== +LIBXML_REQUIRED="2.0.0" + +dnl ========================================================================== +dnl find libxml2 library, borrowed from xmlsec +dnl ========================================================================== +LIBXML_CONFIG="xml2-config" +LIBXML_CFLAGS="" +LIBXML_LIBS="" +LIBXML_FOUND="no" + +AC_ARG_WITH([libxml], AC_HELP_STRING([--with-libxml=@<:@PFX@:>@], [libxml2 location])) +if test "x$with_libxml" = "xno" ; then + AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_REQUIRED) + AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) +elif test "x$with_libxml" = "x" && test "x$PKG_CONFIG" != "x" ; then + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED, [LIBXML_FOUND=yes], [LIBXML_FOUND=no]) +fi +if test "$LIBXML_FOUND" = "no" ; then + if test "x$with_libxml" != "x" ; then + LIBXML_CONFIG=$with_libxml/bin/$LIBXML_CONFIG + fi + AC_MSG_CHECKING(libxml2 $LIBXML_CONFIG >= $LIBXML_REQUIRED ) + if ! $LIBXML_CONFIG --version > /dev/null 2>&1 ; then + AC_MSG_ERROR([Could not find libxml2 anywhere (see config.log for details).]) + fi + vers=`$LIBXML_CONFIG --version | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + minvers=`echo $LIBXML_REQUIRED | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -ge "$minvers" ; then + LIBXML_LIBS="`$LIBXML_CONFIG --libs`" + LIBXML_CFLAGS="`$LIBXML_CONFIG --cflags`" + LIBXML_FOUND="yes" + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR( + [You need at least libxml2 $LIBXML_REQUIRED for this version of libvirt]) + fi +fi + +AC_SUBST([LIBXML_CFLAGS]) +AC_SUBST([LIBXML_LIBS]) dnl Specific XML catalog file for validation of generated html AC_ARG_WITH([xml-catalog-file], diff --git a/src/Makefile.am b/src/Makefile.am index 9e89f9f..1826b09 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,8 +7,8 @@ EXTRA_DIST = libvirt.c php_libvirt.h all-am: build clean-temp build: - $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(XML_CPPFLAGS) - $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(XML_LIBS) + $(CC) -Wall -fpic -DCOMPILE_DL_LIBVIRT=1 $(PHPINC) -c -o $(PACKAGE).o libvirt.c $(LIBXML_CFLAGS) + $(CC) -Wall -shared $(LIBS) -rdynamic -o $(PACKAGE).so $(PACKAGE).o -ldl -lvirt $(LIBXML_LIBS) $(ECHO) "Extension compiled as $(PACKAGE).so" install-exec-local: -- 1.7.1

2 1

[libvirt] [PATCH] storage: make debug log more useful
by Osier Yang 22 Feb '11

22 Feb '11

"__func__" should be replaced with "__FUNCTION__" instead for better portability, however, VIR_DEBUG already prints the function name, so it's useless, replace it with more useful log. * src/storage/storage_backend_mpath.c --- src/storage/storage_backend_mpath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 2e85561..2d48a9d 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -316,7 +316,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, { int retval = 0; - VIR_DEBUG("in %s", __func__); + VIR_DEBUG("conn=%p, pool=%p", conn, pool); pool->def->allocation = pool->def->capacity = pool->def->available = 0; -- 1.7.4

2 2

[libvirt] [PATCH] virsh: replace vshPrint with vshPrintExtra for snapshot list
by Osier Yang 22 Feb '11

22 Feb '11

Otherwise extra information will be printed even if "--quiet" is specified. * tools/virsh.c --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index ce275f1..2837e0f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -10000,8 +10000,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (numsnaps < 0) goto cleanup; - vshPrint(ctl, " %-20s %-25s %s\n", _("Name"), _("Creation Time"), _("State")); - vshPrint(ctl, "---------------------------------------------------\n"); + vshPrintExtra(ctl, " %-20s %-25s %s\n", _("Name"), _("Creation Time"), _("State")); + vshPrintExtra(ctl, "---------------------------------------------------\n"); if (numsnaps) { if (VIR_ALLOC_N(names, numsnaps) < 0) -- 1.7.4

2 2