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>
47 lines
1.3 KiB
C
47 lines
1.3 KiB
C
/*
|
|
* QEMU Object Model - QObject wrappers
|
|
*
|
|
* Copyright (C) 2012 Red Hat, Inc.
|
|
*
|
|
* Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "qom/object.h"
|
|
#include "qom/qom-qobject.h"
|
|
#include "qapi/visitor.h"
|
|
#include "qapi/qmp-input-visitor.h"
|
|
#include "qapi/qmp-output-visitor.h"
|
|
|
|
void object_property_set_qobject(Object *obj, QObject *value,
|
|
const char *name, Error **errp)
|
|
{
|
|
QmpInputVisitor *qiv;
|
|
qiv = qmp_input_visitor_new(value);
|
|
object_property_set(obj, qmp_input_get_visitor(qiv), name, errp);
|
|
|
|
qmp_input_visitor_cleanup(qiv);
|
|
}
|
|
|
|
QObject *object_property_get_qobject(Object *obj, const char *name,
|
|
Error **errp)
|
|
{
|
|
QObject *ret = NULL;
|
|
Error *local_err = NULL;
|
|
QmpOutputVisitor *qov;
|
|
|
|
qov = qmp_output_visitor_new();
|
|
object_property_get(obj, qmp_output_get_visitor(qov), name, &local_err);
|
|
if (!local_err) {
|
|
ret = qmp_output_get_qobject(qov);
|
|
}
|
|
error_propagate(errp, local_err);
|
|
qmp_output_visitor_cleanup(qov);
|
|
return ret;
|
|
}
|