 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>
		
			
				
	
	
		
			143 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			143 lines
		
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Core Definitions for QAPI/QMP Dispatch
 | |
|  *
 | |
|  * 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 "qapi/qmp/types.h"
 | |
| #include "qapi/qmp/dispatch.h"
 | |
| #include "qapi/qmp/json-parser.h"
 | |
| #include "qapi-types.h"
 | |
| #include "qapi/qmp/qerror.h"
 | |
| 
 | |
| static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
 | |
| {
 | |
|     const QDictEntry *ent;
 | |
|     const char *arg_name;
 | |
|     const QObject *arg_obj;
 | |
|     bool has_exec_key = false;
 | |
|     QDict *dict = NULL;
 | |
| 
 | |
|     if (qobject_type(request) != QTYPE_QDICT) {
 | |
|         error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT,
 | |
|                    "request is not a dictionary");
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     dict = qobject_to_qdict(request);
 | |
| 
 | |
|     for (ent = qdict_first(dict); ent;
 | |
|          ent = qdict_next(dict, ent)) {
 | |
|         arg_name = qdict_entry_key(ent);
 | |
|         arg_obj = qdict_entry_value(ent);
 | |
| 
 | |
|         if (!strcmp(arg_name, "execute")) {
 | |
|             if (qobject_type(arg_obj) != QTYPE_QSTRING) {
 | |
|                 error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
 | |
|                            "string");
 | |
|                 return NULL;
 | |
|             }
 | |
|             has_exec_key = true;
 | |
|         } else if (strcmp(arg_name, "arguments")) {
 | |
|             error_setg(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
 | |
|             return NULL;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (!has_exec_key) {
 | |
|         error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     return dict;
 | |
| }
 | |
| 
 | |
| static QObject *do_qmp_dispatch(QObject *request, Error **errp)
 | |
| {
 | |
|     Error *local_err = NULL;
 | |
|     const char *command;
 | |
|     QDict *args, *dict;
 | |
|     QmpCommand *cmd;
 | |
|     QObject *ret = NULL;
 | |
| 
 | |
|     dict = qmp_dispatch_check_obj(request, errp);
 | |
|     if (!dict) {
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     command = qdict_get_str(dict, "execute");
 | |
|     cmd = qmp_find_command(command);
 | |
|     if (cmd == NULL) {
 | |
|         error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,
 | |
|                   "The command %s has not been found", command);
 | |
|         return NULL;
 | |
|     }
 | |
|     if (!cmd->enabled) {
 | |
|         error_setg(errp, "The command %s has been disabled for this instance",
 | |
|                    command);
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     if (!qdict_haskey(dict, "arguments")) {
 | |
|         args = qdict_new();
 | |
|     } else {
 | |
|         args = qdict_get_qdict(dict, "arguments");
 | |
|         QINCREF(args);
 | |
|     }
 | |
| 
 | |
|     switch (cmd->type) {
 | |
|     case QCT_NORMAL:
 | |
|         cmd->fn(args, &ret, &local_err);
 | |
|         if (local_err) {
 | |
|             error_propagate(errp, local_err);
 | |
|         } else if (cmd->options & QCO_NO_SUCCESS_RESP) {
 | |
|             g_assert(!ret);
 | |
|         } else if (!ret) {
 | |
|             ret = QOBJECT(qdict_new());
 | |
|         }
 | |
|         break;
 | |
|     }
 | |
| 
 | |
|     QDECREF(args);
 | |
| 
 | |
|     return ret;
 | |
| }
 | |
| 
 | |
| QObject *qmp_build_error_object(Error *err)
 | |
| {
 | |
|     return qobject_from_jsonf("{ 'class': %s, 'desc': %s }",
 | |
|                               QapiErrorClass_lookup[error_get_class(err)],
 | |
|                               error_get_pretty(err));
 | |
| }
 | |
| 
 | |
| QObject *qmp_dispatch(QObject *request)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     QObject *ret;
 | |
|     QDict *rsp;
 | |
| 
 | |
|     ret = do_qmp_dispatch(request, &err);
 | |
| 
 | |
|     rsp = qdict_new();
 | |
|     if (err) {
 | |
|         qdict_put_obj(rsp, "error", qmp_build_error_object(err));
 | |
|         error_free(err);
 | |
|     } else if (ret) {
 | |
|         qdict_put_obj(rsp, "return", ret);
 | |
|     } else {
 | |
|         QDECREF(rsp);
 | |
|         return NULL;
 | |
|     }
 | |
| 
 | |
|     return QOBJECT(rsp);
 | |
| }
 |