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>
		
	
		
			
				
	
	
		
			260 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			260 lines
		
	
	
		
			6.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Core Definitions for QAPI Visitor Classes
 | |
|  *
 | |
|  * Copyright (C) 2012-2016 Red Hat, Inc.
 | |
|  * Copyright IBM, Corp. 2011
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Anthony Liguori   <aliguori@us.ibm.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
 | |
|  * See the COPYING.LIB file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu-common.h"
 | |
| #include "qapi/qmp/qobject.h"
 | |
| #include "qapi/qmp/qerror.h"
 | |
| #include "qapi/visitor.h"
 | |
| #include "qapi/visitor-impl.h"
 | |
| 
 | |
| void visit_start_struct(Visitor *v, const char *name, void **obj,
 | |
|                         size_t size, Error **errp)
 | |
| {
 | |
|     v->start_struct(v, name, obj, size, errp);
 | |
| }
 | |
| 
 | |
| void visit_end_struct(Visitor *v, Error **errp)
 | |
| {
 | |
|     v->end_struct(v, errp);
 | |
| }
 | |
| 
 | |
| void visit_start_list(Visitor *v, const char *name, Error **errp)
 | |
| {
 | |
|     v->start_list(v, name, errp);
 | |
| }
 | |
| 
 | |
| GenericList *visit_next_list(Visitor *v, GenericList **list, size_t size)
 | |
| {
 | |
|     assert(list && size >= sizeof(GenericList));
 | |
|     return v->next_list(v, list, size);
 | |
| }
 | |
| 
 | |
| void visit_end_list(Visitor *v)
 | |
| {
 | |
|     v->end_list(v);
 | |
| }
 | |
| 
 | |
| void visit_start_alternate(Visitor *v, const char *name,
 | |
|                            GenericAlternate **obj, size_t size,
 | |
|                            bool promote_int, Error **errp)
 | |
| {
 | |
|     assert(obj && size >= sizeof(GenericAlternate));
 | |
|     if (v->start_alternate) {
 | |
|         v->start_alternate(v, name, obj, size, promote_int, errp);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void visit_end_alternate(Visitor *v)
 | |
| {
 | |
|     if (v->end_alternate) {
 | |
|         v->end_alternate(v);
 | |
|     }
 | |
| }
 | |
| 
 | |
| bool visit_optional(Visitor *v, const char *name, bool *present)
 | |
| {
 | |
|     if (v->optional) {
 | |
|         v->optional(v, name, present);
 | |
|     }
 | |
|     return *present;
 | |
| }
 | |
| 
 | |
| void visit_type_enum(Visitor *v, const char *name, int *obj,
 | |
|                      const char *const strings[], Error **errp)
 | |
| {
 | |
|     v->type_enum(v, name, obj, strings, errp);
 | |
| }
 | |
| 
 | |
| void visit_type_int(Visitor *v, const char *name, int64_t *obj, Error **errp)
 | |
| {
 | |
|     v->type_int64(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| static void visit_type_uintN(Visitor *v, uint64_t *obj, const char *name,
 | |
|                              uint64_t max, const char *type, Error **errp)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     uint64_t value = *obj;
 | |
| 
 | |
|     v->type_uint64(v, name, &value, &err);
 | |
|     if (err) {
 | |
|         error_propagate(errp, err);
 | |
|     } else if (value > max) {
 | |
|         error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
 | |
|                    name ? name : "null", type);
 | |
|     } else {
 | |
|         *obj = value;
 | |
|     }
 | |
| }
 | |
| 
 | |
| void visit_type_uint8(Visitor *v, const char *name, uint8_t *obj,
 | |
|                       Error **errp)
 | |
| {
 | |
|     uint64_t value = *obj;
 | |
|     visit_type_uintN(v, &value, name, UINT8_MAX, "uint8_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_uint16(Visitor *v, const char *name, uint16_t *obj,
 | |
|                        Error **errp)
 | |
| {
 | |
|     uint64_t value = *obj;
 | |
|     visit_type_uintN(v, &value, name, UINT16_MAX, "uint16_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_uint32(Visitor *v, const char *name, uint32_t *obj,
 | |
|                        Error **errp)
 | |
| {
 | |
|     uint64_t value = *obj;
 | |
|     visit_type_uintN(v, &value, name, UINT32_MAX, "uint32_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_uint64(Visitor *v, const char *name, uint64_t *obj,
 | |
|                        Error **errp)
 | |
| {
 | |
|     v->type_uint64(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| static void visit_type_intN(Visitor *v, int64_t *obj, const char *name,
 | |
|                             int64_t min, int64_t max, const char *type,
 | |
|                             Error **errp)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     int64_t value = *obj;
 | |
| 
 | |
|     v->type_int64(v, name, &value, &err);
 | |
|     if (err) {
 | |
|         error_propagate(errp, err);
 | |
|     } else if (value < min || value > max) {
 | |
|         error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
 | |
|                    name ? name : "null", type);
 | |
|     } else {
 | |
|         *obj = value;
 | |
|     }
 | |
| }
 | |
| 
 | |
| void visit_type_int8(Visitor *v, const char *name, int8_t *obj, Error **errp)
 | |
| {
 | |
|     int64_t value = *obj;
 | |
|     visit_type_intN(v, &value, name, INT8_MIN, INT8_MAX, "int8_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_int16(Visitor *v, const char *name, int16_t *obj,
 | |
|                       Error **errp)
 | |
| {
 | |
|     int64_t value = *obj;
 | |
|     visit_type_intN(v, &value, name, INT16_MIN, INT16_MAX, "int16_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_int32(Visitor *v, const char *name, int32_t *obj,
 | |
|                       Error **errp)
 | |
| {
 | |
|     int64_t value = *obj;
 | |
|     visit_type_intN(v, &value, name, INT32_MIN, INT32_MAX, "int32_t", errp);
 | |
|     *obj = value;
 | |
| }
 | |
| 
 | |
| void visit_type_int64(Visitor *v, const char *name, int64_t *obj,
 | |
|                       Error **errp)
 | |
| {
 | |
|     v->type_int64(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| void visit_type_size(Visitor *v, const char *name, uint64_t *obj,
 | |
|                      Error **errp)
 | |
| {
 | |
|     if (v->type_size) {
 | |
|         v->type_size(v, name, obj, errp);
 | |
|     } else {
 | |
|         v->type_uint64(v, name, obj, errp);
 | |
|     }
 | |
| }
 | |
| 
 | |
| void visit_type_bool(Visitor *v, const char *name, bool *obj, Error **errp)
 | |
| {
 | |
|     v->type_bool(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| void visit_type_str(Visitor *v, const char *name, char **obj, Error **errp)
 | |
| {
 | |
|     v->type_str(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| void visit_type_number(Visitor *v, const char *name, double *obj,
 | |
|                        Error **errp)
 | |
| {
 | |
|     v->type_number(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| void visit_type_any(Visitor *v, const char *name, QObject **obj, Error **errp)
 | |
| {
 | |
|     v->type_any(v, name, obj, errp);
 | |
| }
 | |
| 
 | |
| void output_type_enum(Visitor *v, const char *name, int *obj,
 | |
|                       const char *const strings[], Error **errp)
 | |
| {
 | |
|     int i = 0;
 | |
|     int value = *obj;
 | |
|     char *enum_str;
 | |
| 
 | |
|     assert(strings);
 | |
|     while (strings[i++] != NULL);
 | |
|     if (value < 0 || value >= i - 1) {
 | |
|         error_setg(errp, QERR_INVALID_PARAMETER, name ? name : "null");
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     enum_str = (char *)strings[value];
 | |
|     visit_type_str(v, name, &enum_str, errp);
 | |
| }
 | |
| 
 | |
| void input_type_enum(Visitor *v, const char *name, int *obj,
 | |
|                      const char *const strings[], Error **errp)
 | |
| {
 | |
|     Error *local_err = NULL;
 | |
|     int64_t value = 0;
 | |
|     char *enum_str;
 | |
| 
 | |
|     assert(strings);
 | |
| 
 | |
|     visit_type_str(v, name, &enum_str, &local_err);
 | |
|     if (local_err) {
 | |
|         error_propagate(errp, local_err);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     while (strings[value] != NULL) {
 | |
|         if (strcmp(strings[value], enum_str) == 0) {
 | |
|             break;
 | |
|         }
 | |
|         value++;
 | |
|     }
 | |
| 
 | |
|     if (strings[value] == NULL) {
 | |
|         error_setg(errp, QERR_INVALID_PARAMETER, enum_str);
 | |
|         g_free(enum_str);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     g_free(enum_str);
 | |
|     *obj = value;
 | |
| }
 |