External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-15 00:55:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Call curl_global_init from virInitialize to avoid thread-safety issues

Browse Source 
curl_global_init is not thread-safe. curl_easy_init might call
curl_global_init when it was no called before. But curl_easy_init
can be called from different threads by the ESX driver. Therefore,
call curl_global_init from virInitialize to stop curl_easy_init from
calling it.

Reported by Benjamin Wang.
(cherry picked from commit 458c499841505c340a0774914998891b48985d39)
This commit is contained in:
Matthias Bolte 2012-10-06 20:09:20 +02:00 committed by Cole Robinson
parent 88c7f28b5f
commit 47489d64c6
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -2297,9 +2297,12 @@ dnl
LIBCURL_CFLAGS="" LIBCURL_CFLAGS=""
LIBCURL_LIBS="" LIBCURL_LIBS=""
have_curl=no
if test "$with_esx" = "yes" || test "$with_esx" = "check" || test "$with_xenapi" = "yes" || test "$with_xenapi" = "check"; then if test "$with_esx" = "yes" || test "$with_esx" = "check" || test "$with_xenapi" = "yes" || test "$with_xenapi" = "check"; then
PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [ PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [
have_curl=yes
if test "$with_esx" = "check"; then if test "$with_esx" = "check"; then
with_esx=yes with_esx=yes
fi fi
@ -2324,6 +2327,11 @@ if test "$with_esx" = "yes" || test "$with_esx" = "check" || test "$with_xenapi"
]) ])
fi fi
if test "$have_curl" = "yes" ; then
AC_DEFINE_UNQUOTED([HAVE_LIBCURL], 1, [whether libcurl is available])
fi
AM_CONDITIONAL([HAVE_LIBCURL], [test "$have_curl" = "yes"])
if test "$with_esx" = "yes" ; then if test "$with_esx" = "yes" ; then
AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled]) AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled])
@ -3079,7 +3087,7 @@ AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS]) AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS])
AC_MSG_NOTICE([ dlopen: $DLOPEN_LIBS]) AC_MSG_NOTICE([ dlopen: $DLOPEN_LIBS])
if test "$with_esx" = "yes" ; then if test "$have_curl" = "yes" ; then
AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS]) AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS])
else else
AC_MSG_NOTICE([ libcurl: no]) AC_MSG_NOTICE([ libcurl: no])

8
src/libvirt.c
View File

@ -41,6 +41,10 @@
# include <winsock2.h> # include <winsock2.h>
#endif #endif
#ifdef HAVE_LIBCURL
# include <curl/curl.h>
#endif
#include "virterror_internal.h" #include "virterror_internal.h"
#include "logging.h" #include "logging.h"
#include "datatypes.h" #include "datatypes.h"
@ -418,6 +422,10 @@ virInitialize(void)
virNetTLSInit(); virNetTLSInit();
#if HAVE_LIBCURL
curl_global_init(CURL_GLOBAL_DEFAULT);
#endif
VIR_DEBUG("register drivers"); VIR_DEBUG("register drivers");
#if HAVE_WINSOCK2_H #if HAVE_WINSOCK2_H

1
src/xenapi/xenapi_driver.c
View File

@ -171,7 +171,6 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth,
xmlInitParser(); xmlInitParser();
xmlKeepBlanksDefault(0); xmlKeepBlanksDefault(0);
xen_init(); xen_init();
curl_global_init(CURL_GLOBAL_ALL);
privP->session = xen_session_login_with_password(call_func, privP, username, privP->session = xen_session_login_with_password(call_func, privP, username,
password, xen_api_latest_version); password, xen_api_latest_version);