]> xenbits.xensource.com Git - libvirt.git/commitdiff
lxc: Enable under valgrind again
authorMichal Privoznik <mprivozn@redhat.com>
Wed, 25 Jul 2018 12:25:01 +0000 (14:25 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 26 Jul 2018 12:15:43 +0000 (14:15 +0200)
So we originally disabled LXC driver when libvirtd is running
under valgrind back in 05436ab7ff087 (which dates to beginning of
2009) as it was causing valgrind to crash. It's not the case
anymore. Valgrind works with LXC happily.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
src/lxc/lxc_driver.c

index 6969dddcab21e5fcb3bb85c51ca831bdb317036f..8867645cdc4214f70a32484398fc2ff8c61bc044 100644 (file)
@@ -1550,19 +1550,8 @@ static int lxcStateInitialize(bool privileged,
                               void *opaque ATTRIBUTE_UNUSED)
 {
     virCapsPtr caps = NULL;
-    const char *ld;
     virLXCDriverConfigPtr cfg = NULL;
 
-    /* Valgrind gets very annoyed when we clone containers, so
-     * disable LXC when under valgrind
-     * XXX remove this when valgrind is fixed
-     */
-    ld = virGetEnvBlockSUID("LD_PRELOAD");
-    if (ld && strstr(ld, "vgpreload")) {
-        VIR_INFO("Running under valgrind, disabling driver");
-        return 0;
-    }
-
     /* Check that the user is root, silently disable if not */
     if (!privileged) {
         VIR_INFO("Not running privileged, disabling driver");