- Devel - libvirt List Archives

[libvirt] [sandbox] configure: check for static libc
by Cédric Bosdonnat 17 Jun '15

17 Jun '15

Missing static libc doesn't really prevent the build to finish, but it would cause errors when running qemu sandboxes. Checking in configure will save time for new developers. --- configure.ac | 2 ++ m4/virt-static.m4 | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 m4/virt-static.m4 diff --git a/configure.ac b/configure.ac index 0e49a0a..ba5247a 100644 --- a/configure.ac +++ b/configure.ac @@ -87,6 +87,8 @@ LIBVIRT_SANDBOX_COVERAGE LIBVIRT_SANDBOX_RPCGEN LIBVIRT_SANDBOX_SELINUX +LIBVIRT_SANDBOX_STATIC_LIBC + GOBJECT_INTROSPECTION_CHECK([$GOBJECT_INTROSPECTION_REQUIRED]) dnl Should be in m4/virt-gettext.m4 but intltoolize is too diff --git a/m4/virt-static.m4 b/m4/virt-static.m4 new file mode 100644 index 0000000..8a40351 --- /dev/null +++ b/m4/virt-static.m4 @@ -0,0 +1,33 @@ +# LIBVIRT_SANDBOX_STATIC_LIB(NAME, CFLAGS, LDFLAGS, PROLOG, PROGRAM) +# ------------------------------------------------------------------ +# Check if the program can be linked with static libraries only. +# +AC_DEFUN([LIBVIRT_SANDBOX_STATIC_LIB], [ + AC_MSG_CHECKING([for static $1]) + + SAVED_LDFLAGS=$LDFLAGS + SAVED_CFLAGS=$CFLAGS + CFLAGS="$2" + LDFLAGS="-static $3" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([$4], + [$5])], + [], + [AC_MSG_RESULT([no])] + [AC_MSG_ERROR([static $1 is required in order to build virt-sandbox-init-qemu])] + ) + LDFLAGS=$SAVED_LDFLAGS + CFLAGS=$SAVED_CFLAGS + + AC_MSG_RESULT([yes]) +]) + +AC_DEFUN([LIBVIRT_SANDBOX_STATIC_LIBC], [ + LIBVIRT_SANDBOX_STATIC_LIB( + [LIBC], + [], + [], + [#include <stdio.h>], + [printf("bar");]) +]) + -- 2.1.4

2 1

[libvirt] [RFC] libvirt hugepage hooks
by Alex Williamson 17 Jun '15

17 Jun '15

Hi, This is very rough and early, but I wanted to get some feedback, possibly advice, and see if there's some interest in at least creating infrastructure for user contributed libvirt hooks, if not some default ones that are no-ops unless configured. The impetus for this is that I started trying to tune a dual-socket system for performance with device assignment and quickly became very frustrated that distros don't provide any built-in support for more than the very basics of hugepages. Yes, there are kernel commandline options, but those don't allow node specific configuration. Yes, there's 'virsh allocpages', but how does that get incorporated automatically into initializing libvirtd or a domain? Creating any sort of persistence for hugepages is an exercise for the user. So I think the first step in this is that the hooks scripts[1] should by default support sub-scripts in the common way, with a ".d" sub-directory holding those scripts, for example daemon.d and qemu.d. In the attached file, I've simply commandeered the default script to call the sub-scripts. For compatibility (ie. not overwriting user scripts), that should probably happen within libvirt. In any case, a single monolithic hook file is impossible to maintain on a system, let alone multiple systems, so this needs to be brought up to date. The second step is that even if we drop user contrib hooks out in /usr/share for admins to pull in as desired, perhaps we can provide some consistency for how to configure those hooks. In the example below I propose /etc/sysconfig/libvirt-hook-config.xml. You can see how currently it supports static and dynamic hugepage hooks, static occurring through the daemon hook and dynamic through the qemu hook. Ideally the dynamic hook would simply list the domain names participating in dynamic hugepages and figure out what needs to be allocated where from the domain xml. I haven't gotten that far (and frankly trying to satisfy cpu/numa vs numatune/memory|memnode vs memoryBacking/hugepages and memory size still looks very confusing to me). Do we want a common place to configure this sort of thing? Is XML the right format? On to the scripts themselves. I got some advice on #virt that I should use 'virsh allocpages' to manage hugepages. Despite the warning not to call into libvirt in the hook documentation[1], I was assured it'd be ok here. However, somehow 'virsh freepages' did manage to hang and my RHEL7.1 system doesn't support allocpages yet, so my prototype uses raw sysfs. AFAICT, any sort of hugepage manipulation is inherently broken because of the racy kernel interfaces. We really need a hugepage broker, but that's well beyond the scope of libvirt. Functionally this seems to work well for me. I don't know how practical it is to support dynamic 1G pages; I'd probably encourage static setup for that as my system only survived a couple rounds before getting too fragmented. 2M dynamic seems to work quite nicely though. TL;DR, I thought I'd post this, even in a rough state to see if there's interest, get nitpicks at my terrible scripting, and make sure I'm not just scratching my own itch. Thanks, Alex [1] https://www.libvirt.org/hooks.html

1 0

[libvirt] [[libvirt-php][PATCH v1] qemu-agent-command] fixes for installation and add another libvirt function
by Vasiliy Tolstov 16 Jun '15

16 Jun '15

* add libvirt_domain_qemu_agent_command * fix install target, because before this all stuff goes to /usr/usr dir Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- configure.ac | 3 +++ src/Makefile.am | 19 ++++++++++--------- src/libvirt-php.c | 28 ++++++++++++++++++++++++++++ src/libvirt-php.h | 2 ++ 4 files changed, 43 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 9e9fee0..0afa2e2 100644 --- a/configure.ac +++ b/configure.ac @@ -23,6 +23,9 @@ PKG_PROG_PKG_CONFIG LIBVIRT_REQUIRED=0.6.2 PKG_CHECK_MODULES(LIBVIRT, libvirt >= $LIBVIRT_REQUIRED) +PKG_CHECK_MODULES(QEMU, libvirt-qemu) +AC_SUBST([QEMU_CFLAGS]) +AC_SUBST([QEMU_LIBS]) dnl ========================================================================== dnl required minimum version of libxml2 diff --git a/src/Makefile.am b/src/Makefile.am index cab0456..f270ec2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,10 +6,10 @@ WL=@WL@ SHLIB_FLAGS=@SHLIB_FLAGS@ install-exec-local: - $(MKDIR_P) $(DESTDIR)$(prefix)$(PHPEDIR) - $(MKDIR_P) $(DESTDIR)$(prefix)$(PHPCDIR) - $(INSTALL) -m 644 -D .libs/$(PACKAGE).so $(DESTDIR)$(prefix)$(PHPEDIR)/$(PACKAGE).so - $(INSTALL) -m 755 -d $(DESTDIR)$(prefix)$(PHPCDIR) + $(MKDIR_P) $(DESTDIR)$(PHPEDIR) + $(MKDIR_P) $(DESTDIR)$(PHPCDIR) + $(INSTALL) -m 644 -D .libs/$(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so + $(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR) $(ECHO) "extension=$(PACKAGE).so" > libvirt-php.ini $(ECHO) >> libvirt-php.ini $(ECHO) "[libvirt]" >> libvirt-php.ini @@ -19,21 +19,22 @@ install-exec-local: $(ECHO) "libvirt.image_path=/var/lib/libvirt/images" >> libvirt-php.ini $(ECHO) "; Limit maximum number of libvirt connections" >> libvirt-php.ini $(ECHO) "libvirt.max_connections=5" >> libvirt-php.ini - $(INSTALL) -m 644 -D libvirt-php.ini $(DESTDIR)$(prefix)$(PHPCDIR)/$(PACKAGE).ini + $(INSTALL) -m 644 -D libvirt-php.ini $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini uninstall-local: - $(RM) -f $(DESTDIR)$(prefix)$(PHPCDIR)/$(PACKAGE).ini - $(RM) -f $(DESTDIR)$(prefix)$(PHPEDIR)/$(PACKAGE).so + $(RM) -f $(DESTDIR)$(PHPCDIR)/$(PACKAGE).ini + $(RM) -f $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so AM_CFLAGS = \ $(PHPINC) $(LIBXML_CFLAGS) \ - $(LIBVIRT_CFLAGS) $(DEFINES) \ + $(LIBVIRT_CFLAGS) $(QEMU_CFLAGS) $(DEFINES) \ -I$(top_srcdir)/winsrc AM_LDFLAGS = \ $(SHLIB_LDFLAGS) \ $(LIBXML_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(QEMU_LIBS) lib_LTLIBRARIES = libvirt-php.la diff --git a/src/libvirt-php.c b/src/libvirt-php.c index d46fbb9..161abca 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -161,6 +161,7 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_send_keys, NULL) PHP_FE(libvirt_domain_send_pointer_event, NULL) PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_qemu_agent_command, NULL) /* Domain snapshot functions */ PHP_FE(libvirt_domain_has_current_snapshot, NULL) PHP_FE(libvirt_domain_snapshot_create, NULL) @@ -3943,6 +3944,33 @@ PHP_FUNCTION(libvirt_domain_get_name) } /* + Function name: libvirt_domain_qemu_agent_command + Since version: 0.5.2(-1) + Description: Function is used to send qemu-ga command + Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + @timeout [int]: timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time + @flags [int]: ?? + Returns: String on success and FALSE on error +*/ +PHP_FUNCTION(libvirt_domain_qemu_agent_command) +{ + php_libvirt_domain *domain=NULL; + zval *zdomain; + const char *cmd; + int cmd_len; + char *ret; + long timeout = -1; + long flags = 0; + + GET_DOMAIN_FROM_ARGS("rs|l|l", &zdomain, &cmd, &cmd_len, &timeout, &flags); + + ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); + if (ret == NULL) RETURN_FALSE; + + RETURN_STRING(ret,0); +} + +/* Function name: libvirt_domain_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get the domain's UUID in string format diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 7c9a229..1d9c6ab 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -80,6 +80,7 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> +#include <libvirt/libvirt-qemu.h> #include <libxml/parser.h> #include <libxml/xpath.h> #include <fcntl.h> @@ -427,6 +428,7 @@ PHP_FUNCTION(libvirt_domain_send_keys); PHP_FUNCTION(libvirt_domain_send_pointer_event); PHP_FUNCTION(libvirt_domain_get_metadata); PHP_FUNCTION(libvirt_domain_set_metadata); +PHP_FUNCTION(libvirt_domain_qemu_agent_command); /* Domain snapshot functions */ PHP_FUNCTION(libvirt_domain_has_current_snapshot); PHP_FUNCTION(libvirt_domain_snapshot_create); -- 2.3.3

1 0

[libvirt] [PATCH] network: add an option to make dns public
by Cédric Bosdonnat 16 Jun '15

16 Jun '15

In some use cases we don't want the virtual network's DNS to only listen to the vnet interface. Adding a publiclyAccessible attribute to the dns element in the configuration allows the DNS to listen to all interfaces. It simply disables the bind-dynamic option of dnsmasq for the network. --- docs/formatnetwork.html.in | 11 +++++++++++ docs/schemas/network.rng | 15 ++++++++++----- src/conf/network_conf.c | 6 ++++++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 4 +++- tests/networkxml2confdata/nat-network-dns-hosts.conf | 1 - tests/networkxml2confdata/nat-network-dns-hosts.xml | 2 +- 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 6abed8f..8e43658 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -851,6 +851,17 @@ DNS server. + + The dns element + can have an optional <code>publiclyAccessible</code> + attribute Since 1.2.17. + If <code>publiclyAccessible</code> is "yes", then the DNS server + will handle requests for all interfaces. + If <code>publiclyAccessible</code> is not set or "no", the DNS + server will only handle requests for the interface of the virtual + network. + + Currently supported sub-elements of <code><dns></code> are: <dl> <dt><code>forwarder</code></dt> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4edb6eb..f989625 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -244,12 +244,17 @@ and other features in the <dns> element --> <optional> <element name="dns"> - <optional> - <attribute name="forwardPlainNames"> - <ref name="virYesNo"/> - </attribute> - </optional> <interleave> + <optional> + <attribute name="forwardPlainNames"> + <ref name="virYesNo"/> + </attribute> + </optional> + <optional> + <attribute name="publiclyAccessible"> + <ref name="virYesNo"/> + </attribute> + </optional> <zeroOrMore> <element name="forwarder"> <attribute name="addr"><ref name="ipAddr"/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f4a9df0..99bac6d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1309,9 +1309,14 @@ virNetworkDNSDefParseXML(const char *networkName, size_t i; int ret = -1; xmlNodePtr save = ctxt->node; + char *publiclyAccessible = NULL; ctxt->node = node; + publiclyAccessible = virXPathString("string(./@publiclyAccessible)", ctxt); + if (publiclyAccessible) + def->publiclyAccessible = virTristateBoolTypeFromString(publiclyAccessible); + forwardPlainNames = virXPathString("string(./@forwardPlainNames)", ctxt); if (forwardPlainNames) { def->forwardPlainNames = virTristateBoolTypeFromString(forwardPlainNames); @@ -1410,6 +1415,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: + VIR_FREE(publiclyAccessible); VIR_FREE(forwardPlainNames); VIR_FREE(fwdNodes); VIR_FREE(hostNodes); diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index f69d999..f555b6b 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -136,6 +136,7 @@ struct _virNetworkDNSDef { virNetworkDNSSrvDefPtr srvs; size_t nfwds; char **forwarders; + int publiclyAccessible; /* enum virTristateBool */ }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d195085..c39b1a5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -996,8 +996,10 @@ networkDnsmasqConfContents(virNetworkObjPtr network, * other than one of the virtual guests connected directly to * this network). This was added in response to CVE 2012-3411. */ + if (network->def->dns.publiclyAccessible != VIR_TRISTATE_BOOL_YES) + virBufferAddLit(&configbuf, + "bind-dynamic\n"); virBufferAsprintf(&configbuf, - "bind-dynamic\n" "interface=%s\n", network->def->bridge); } else { diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts.conf index 021316f..759a9e9 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts.conf @@ -10,6 +10,5 @@ expand-hosts domain-needed local=// except-interface=lo -bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.xml b/tests/networkxml2confdata/nat-network-dns-hosts.xml index 9add456..969dfa5 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.xml +++ b/tests/networkxml2confdata/nat-network-dns-hosts.xml @@ -4,7 +4,7 @@ <forward dev='eth0' mode='nat'/> <bridge name='virbr0' stp='on' delay='0'/> <domain name="example.com"/> - <dns forwardPlainNames='no'> + <dns forwardPlainNames='no' publiclyAccessible='yes'> <host ip='192.168.122.1'> <hostname>host</hostname> <hostname>gateway</hostname> -- 2.1.4

4 7

[libvirt] [PATCH 0/4] parallels: rename parallels to vz
by Maxim Nestratov 16 Jun '15

16 Jun '15

This change is made in the scope of 'Parallel Cloud Server' pruduct renaming to 'Virtuozzo' to prevent future confusion and make things actual. Previously we introduced a new driver name 'vz' as a synonym to 'parallels'. This patch set finalizes major part of renaming process. Though uri 'parallels:///system' and 'parallels' domain type remains valid, we are going to reference the driver and all changes related to it as 'vz' since now. Maxim Nestratov (4): parallels: change parallels prefixes to vz parallels: substitute parallels with vz in strings parallels: rename all parallels files and driver directory to vz parallels: substitute parallels with vz spec file and Makefile configure.ac | 26 +- libvirt.spec.in | 10 +- mingw-libvirt.spec.in | 6 +- po/POTFILES.in | 12 +- src/Makefile.am | 36 +- src/libvirt.c | 10 +- .../parallels_driver.c => vz/vz_driver.c} | 386 +++++++++--------- .../parallels_driver.h => vz/vz_driver.h} | 4 +- .../parallels_network.c => vz/vz_network.c} | 142 +++---- src/{parallels/parallels_sdk.c => vz/vz_sdk.c} | 244 ++++++------ src/{parallels/parallels_sdk.h => vz/vz_sdk.h} | 22 +- .../parallels_storage.c => vz/vz_storage.c} | 440 ++++++++++----------- src/{parallels/parallels_utils.c => vz/vz_utils.c} | 32 +- src/{parallels/parallels_utils.h => vz/vz_utils.h} | 54 +-- 14 files changed, 712 insertions(+), 712 deletions(-) rename src/{parallels/parallels_driver.c => vz/vz_driver.c} (73%) rename src/{parallels/parallels_driver.h => vz/vz_driver.h} (90%) rename src/{parallels/parallels_network.c => vz/vz_network.c} (75%) rename src/{parallels/parallels_sdk.c => vz/vz_sdk.c} (93%) rename src/{parallels/parallels_sdk.h => vz/vz_sdk.h} (75%) rename src/{parallels/parallels_storage.c => vz/vz_storage.c} (74%) rename src/{parallels/parallels_utils.c => vz/vz_utils.c} (84%) rename src/{parallels/parallels_utils.h => vz/vz_utils.h} (68%) -- 2.1.0

2 5

[libvirt] ANNOUNCE: libvirt-glib version 0.2.1 released
by Daniel P. Berrange 16 Jun '15

16 Jun '15

I am pleased to announce that a new release of the libvirt-glib package, version 0.2.1, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) Changes in this release: - Fix libtoolize detection in autogen.sh - Allow storage volume format compatibility level to be set - Add pre-condition checks to more public API entry points - Don't try to return a value from void functions - Add API for controlling storage pool autostart flag - Add API for filesystem image format - Add loop, nbd and ploop filesystem types - Fix setting of driver type when called more than once libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not currently guaranteeing that libvirt-glib libraries are permanently API/ABI stable. That said we do not expect to break the API/ABI for the forseeable future and will always strive avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] daemon/Makefile: Add forgotten dependency
by Michal Privoznik 16 Jun '15

16 Jun '15

In latest patches we added Admin API. However, the Makefile in daemon was missing one dependency: admin_server.c is including generated file admin_dispatch.h. However, this dependency was not explicitly marked in the Makefile therefore the build happened to fail on some occasions. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build-breaker rules. daemon/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3d45f2a..bb08d9f 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -317,6 +317,7 @@ endif ! WITH_POLKIT remote.c: $(DAEMON_GENERATED) remote.h: $(DAEMON_GENERATED) +admin_server.c: $(DAEMON_GENERATED) LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ libvirtd.libxl.logrotate libvirtd.uml.logrotate \ -- 2.3.6

1 0

[libvirt] [PATCH sandbox 0/3] Misc patches
by Daniel P. Berrange 16 Jun '15

16 Jun '15

This is just a handful of patches for libvirt-sandbox. Traditionally I've just directly pushed code to libvirt-sandbox, but since we now have a few other people working on it, I'll start posting my patches for review first. Daniel P. Berrange (3): Support lzma and gzip compressed kernel modules Explicitly check for supported URIs when starting guests Add LIBVIRT_SANDBOX_INIT_DEBUG env variable configure.ac | 4 + libvirt-sandbox.spec.in | 2 + libvirt-sandbox/Makefile.am | 7 + .../libvirt-sandbox-builder-container.c | 3 +- libvirt-sandbox/libvirt-sandbox-builder-initrd.c | 35 ++--- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 3 +- .../libvirt-sandbox-context-interactive.c | 27 ++++ libvirt-sandbox/libvirt-sandbox-init-qemu.c | 143 ++++++++++++++++++++- po/POTFILES.in | 1 + 9 files changed, 203 insertions(+), 22 deletions(-) -- 2.4.2

2 6

[libvirt] [PATCH v2 0/3] Fix and tweak 'uknown cause' error in virDirCreate
by Erik Skultety 16 Jun '15

16 Jun '15

Erik Skultety (3): util: virfile: Fix 'unknown cause' error if NFS mount point creation fails util: virDirCreate: Child now exits with positive errno-code virfile: virDirCreate: Insert blank lines to assure slightly better readability src/util/virfile.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) -- 1.9.3

2 5

[libvirt] [PATCH] util: Fix Coverity RESOURCE_LEAK
by John Ferlan 16 Jun '15

16 Jun '15

Commit id 'e44b0269c9' in advertently checked !dir before calling closedir Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index f1924eb..8fa7a9b 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -638,7 +638,7 @@ int virProcessGetPids(pid_t pid, size_t *npids, pid_t **pids) ret = 0; cleanup: - if (!dir) + if (dir) closedir(dir); VIR_FREE(taskPath); if (ret < 0) -- 2.1.0

1 0