Re: [libvirt] [PATCH] virt-admin: Call virInitialize to fix startup crash

On Tue, Jun 28, 2016 at 10:12:01AM +0200, Martin Kletzander wrote: I tried this instead, what do you think about it? diff --git i/src/util/virerror.c w/src/util/virerror.c index 1177570ef0d5..300b0b90252f 100644 --- i/src/util/virerror.c +++ w/src/util/virerror.c @@ -37,7 +37,7 @@ VIR_LOG_INIT("util.error"); -virThreadLocal virLastErr; +static virThreadLocal virLastErr; virErrorFunc virErrorHandler = NULL; /* global error handler */ void *virUserData = NULL; /* associated data */ diff --git i/src/util/virevent.c w/src/util/virevent.c index e0fd35e41644..8f9d15e46454 100644 --- i/src/util/virevent.c +++ w/src/util/virevent.c @@ -266,6 +266,9 @@ int virEventRegisterDefaultImpl(void) { VIR_DEBUG("registering default event implementation"); + if (virErrorInitialize() < 0) + return -1; + virResetLastError(); if (virEventPollInit() < 0) { diff --git i/src/util/virthread.c w/src/util/virthread.c index 6c495158f566..4b69451dd355 100644 --- i/src/util/virthread.c +++ w/src/util/virthread.c @@ -308,7 +308,8 @@ int virThreadLocalInit(virThreadLocalPtr l, virThreadLocalCleanup c) { int ret; - if ((ret = pthread_key_create(&l->key, c)) != 0) { + if (!l->initialized && + (ret = pthread_key_create(&l->key, c)) != 0) { errno = ret; return -1; } diff --git i/src/util/virthread.h w/src/util/virthread.h index e466d9bf0184..1ba8a0fe46bb 100644 --- i/src/util/virthread.h +++ w/src/util/virthread.h @@ -54,6 +54,7 @@ typedef virThreadLocal *virThreadLocalPtr; struct virThreadLocal { pthread_key_t key; + bool initialized; }; typedef struct virThread virThread; -- Martin