diff options
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/container.c | 4 | ||||
| -rw-r--r-- | qom/cpu.c | 2 | ||||
| -rw-r--r-- | qom/object.c | 15 | ||||
| -rw-r--r-- | qom/qom-qobject.c | 6 |
4 files changed, 14 insertions, 13 deletions
diff --git a/qom/container.c b/qom/container.c index 4ca8b5cba3..5270a5ee9c 100644 --- a/qom/container.c +++ b/qom/container.c @@ -10,8 +10,8 @@ * See the COPYING file in the top-level directory. */ -#include "qemu/object.h" -#include "module.h" +#include "qom/object.h" +#include "qemu/module.h" #include <assert.h> static TypeInfo container_info = { @@ -18,7 +18,7 @@ * <http://www.gnu.org/licenses/gpl-2.0.html> */ -#include "qemu/cpu.h" +#include "qom/cpu.h" #include "qemu-common.h" void cpu_reset(CPUState *cpu) diff --git a/qom/object.c b/qom/object.c index 0739aa2943..351b88c817 100644 --- a/qom/object.c +++ b/qom/object.c @@ -10,19 +10,20 @@ * See the COPYING file in the top-level directory. */ -#include "qemu/object.h" +#include "qom/object.h" #include "qemu-common.h" -#include "qapi/qapi-visit-core.h" +#include "qapi/visitor.h" #include "qapi/string-input-visitor.h" #include "qapi/string-output-visitor.h" +#include "qapi/qmp/qerror.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ -#include "qemu/qom-qobject.h" -#include "qobject.h" -#include "qbool.h" -#include "qint.h" -#include "qstring.h" +#include "qom/qom-qobject.h" +#include "qapi/qmp/qobject.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qstring.h" #define MAX_INTERFACES 32 diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c index 0689914e15..6384b8e98c 100644 --- a/qom/qom-qobject.c +++ b/qom/qom-qobject.c @@ -10,9 +10,9 @@ */ #include "qemu-common.h" -#include "qemu/object.h" -#include "qemu/qom-qobject.h" -#include "qapi/qapi-visit-core.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" |