 da34e65cb4
			
		
	
	
		da34e65cb4
		
	
	
	
	
		
			
			Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the Error typedef. Since then, we've moved to include qemu/osdep.h everywhere. Its file comment explains: "To avoid getting into possible circular include dependencies, this file should not include any other QEMU headers, with the exceptions of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which are doing a similar job to this file and are under similar constraints." qapi/error.h doesn't do a similar job, and it doesn't adhere to similar constraints: it includes qapi-types.h. That's in excess of 100KiB of crap most .c files don't actually need. Add the typedef to qemu/typedefs.h, and include that instead of qapi/error.h. Include qapi/error.h in .c files that need it and don't get it now. Include qapi-types.h in qom/object.h for uint16List. Update scripts/clean-includes accordingly. Update it further to match reality: replace config.h by config-target.h, add sysemu/os-posix.h, sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h comment quoted above similarly. This reduces the number of objects depending on qapi/error.h from "all of them" to less than a third. Unfortunately, the number depending on qapi-types.h shrinks only a little. More work is needed for that one. Signed-off-by: Markus Armbruster <armbru@redhat.com> [Fix compilation without the spice devel packages. - Paolo] Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
		
			
				
	
	
		
			151 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			151 lines
		
	
	
		
			3.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU Crypto initialization
 | |
|  *
 | |
|  * Copyright (c) 2015 Red Hat, Inc.
 | |
|  *
 | |
|  * This library is free software; you can redistribute it and/or
 | |
|  * modify it under the terms of the GNU Lesser General Public
 | |
|  * License as published by the Free Software Foundation; either
 | |
|  * version 2 of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * This library is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 | |
|  * Lesser General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU Lesser General Public
 | |
|  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "crypto/init.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/thread.h"
 | |
| 
 | |
| #ifdef CONFIG_GNUTLS
 | |
| #include <gnutls/gnutls.h>
 | |
| #include <gnutls/crypto.h>
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_GCRYPT
 | |
| #include <gcrypt.h>
 | |
| #endif
 | |
| 
 | |
| /* #define DEBUG_GNUTLS */
 | |
| 
 | |
| /*
 | |
|  * If GNUTLS is built against GCrypt then
 | |
|  *
 | |
|  *  - When GNUTLS >= 2.12, we must not initialize gcrypt threading
 | |
|  *    because GNUTLS will do that itself
 | |
|  *  - When GNUTLS < 2.12 we must always initialize gcrypt threading
 | |
|  *  - When GNUTLS is disabled we must always initialize gcrypt threading
 | |
|  *
 | |
|  * But....
 | |
|  *
 | |
|  *    When gcrypt >= 1.6.0 we must not initialize gcrypt threading
 | |
|  *    because gcrypt will do that itself.
 | |
|  *
 | |
|  * So we need to init gcrypt threading if
 | |
|  *
 | |
|  *   - gcrypt < 1.6.0
 | |
|  * AND
 | |
|  *      - gnutls < 2.12
 | |
|  *   OR
 | |
|  *      - gnutls is disabled
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #if (defined(CONFIG_GCRYPT) &&                  \
 | |
|      (!defined(CONFIG_GNUTLS) ||                \
 | |
|       !defined(GNUTLS_VERSION_NUMBER) ||       \
 | |
|       (GNUTLS_VERSION_NUMBER < 0x020c00)) &&    \
 | |
|      (!defined(GCRYPT_VERSION_NUMBER) ||        \
 | |
|       (GCRYPT_VERSION_NUMBER < 0x010600)))
 | |
| #define QCRYPTO_INIT_GCRYPT_THREADS
 | |
| #else
 | |
| #undef QCRYPTO_INIT_GCRYPT_THREADS
 | |
| #endif
 | |
| 
 | |
| #ifdef DEBUG_GNUTLS
 | |
| static void qcrypto_gnutls_log(int level, const char *str)
 | |
| {
 | |
|     fprintf(stderr, "%d: %s", level, str);
 | |
| }
 | |
| #endif
 | |
| 
 | |
| #ifdef QCRYPTO_INIT_GCRYPT_THREADS
 | |
| static int qcrypto_gcrypt_mutex_init(void **priv)
 | |
| {                                                                             \
 | |
|     QemuMutex *lock = NULL;
 | |
|     lock = g_new0(QemuMutex, 1);
 | |
|     qemu_mutex_init(lock);
 | |
|     *priv = lock;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int qcrypto_gcrypt_mutex_destroy(void **priv)
 | |
| {
 | |
|     QemuMutex *lock = *priv;
 | |
|     qemu_mutex_destroy(lock);
 | |
|     g_free(lock);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int qcrypto_gcrypt_mutex_lock(void **priv)
 | |
| {
 | |
|     QemuMutex *lock = *priv;
 | |
|     qemu_mutex_lock(lock);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static int qcrypto_gcrypt_mutex_unlock(void **priv)
 | |
| {
 | |
|     QemuMutex *lock = *priv;
 | |
|     qemu_mutex_unlock(lock);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static struct gcry_thread_cbs qcrypto_gcrypt_thread_impl = {
 | |
|     (GCRY_THREAD_OPTION_PTHREAD | (GCRY_THREAD_OPTION_VERSION << 8)),
 | |
|     NULL,
 | |
|     qcrypto_gcrypt_mutex_init,
 | |
|     qcrypto_gcrypt_mutex_destroy,
 | |
|     qcrypto_gcrypt_mutex_lock,
 | |
|     qcrypto_gcrypt_mutex_unlock,
 | |
|     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 | |
| };
 | |
| #endif /* QCRYPTO_INIT_GCRYPT */
 | |
| 
 | |
| int qcrypto_init(Error **errp)
 | |
| {
 | |
| #ifdef CONFIG_GNUTLS
 | |
|     int ret;
 | |
|     ret = gnutls_global_init();
 | |
|     if (ret < 0) {
 | |
|         error_setg(errp,
 | |
|                    "Unable to initialize GNUTLS library: %s",
 | |
|                    gnutls_strerror(ret));
 | |
|         return -1;
 | |
|     }
 | |
| #ifdef DEBUG_GNUTLS
 | |
|     gnutls_global_set_log_level(10);
 | |
|     gnutls_global_set_log_function(qcrypto_gnutls_log);
 | |
| #endif
 | |
| #endif
 | |
| 
 | |
| #ifdef CONFIG_GCRYPT
 | |
|     if (!gcry_check_version(GCRYPT_VERSION)) {
 | |
|         error_setg(errp, "Unable to initialize gcrypt");
 | |
|         return -1;
 | |
|     }
 | |
| #ifdef QCRYPTO_INIT_GCRYPT_THREADS
 | |
|     gcry_control(GCRYCTL_SET_THREAD_CBS, &qcrypto_gcrypt_thread_impl);
 | |
| #endif /* QCRYPTO_INIT_GCRYPT_THREADS */
 | |
|     gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
 | |
| #endif
 | |
| 
 | |
|     return 0;
 | |
| }
 |