Re: [libvirt] autocreate tap device for VIR_DOMAIN_NET_TYPE_ETHERNET

diff --git a/src/libvirt.c b/src/libvirt.c index dd58e9c23d14..a0458e7004d9 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -274,6 +274,7 @@ winsock_init(void) #ifdef WITH_GNUTLS_GCRYPT +# if GCRYPT_VERSION_NUMBER < 0x010600 static int virTLSMutexInit(void **priv) { @@ -318,8 +319,9 @@ virTLSMutexUnlock(void **priv) virMutexUnlock(lock); return 0; } +#endif - +# if GCRYPT_VERSION_NUMBER < 0x010600 static struct gcry_thread_cbs virTLSThreadImpl = { /* GCRY_THREAD_OPTION_VERSION was added in gcrypt 1.4.2 */ # ifdef GCRY_THREAD_OPTION_VERSION @@ -335,7 +337,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; #endif /* WITH_GNUTLS_GCRYPT */ - +#endif static bool virGlobalError; static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; @@ -361,6 +363,7 @@ virGlobalInit(void) #endif #ifdef WITH_GNUTLS_GCRYPT + # if GCRYPT_VERSION_NUMBER < 0x010600 /* * This sequence of API calls it copied exactly from * gnutls 2.12.23 source lib/gcrypt/init.c, with @@ -374,6 +377,7 @@ virGlobalInit(void) gcry_control(GCRYCTL_DISABLE_SECMEM, NULL, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, NULL, 0); } + # endif #endif