+1 -1

hw/qdev-core.h

··· 4 4 #include "qemu-queue.h" 5 5 #include "qemu-option.h" 6 6 #include "qemu-types.h" 7 7 - #include "qemu/object.h" 7 7 + #include "qom/object.h" 8 8 #include "hw/irq.h" 9 9 #include "qapi/error.h" 10 10

+1 -1

hw/stream.h

··· 2 2 #define STREAM_H 1 3 3 4 4 #include "qemu-common.h" 5 5 - #include "qemu/object.h" 5 5 + #include "qom/object.h" 6 6 7 7 /* stream slave. Used until qdev provides a generic way. */ 8 8 #define TYPE_STREAM_SLAVE "stream-slave"

+1 -1

include/qemu/cpu.h include/qom/cpu.h

··· 20 20 #ifndef QEMU_CPU_H 21 21 #define QEMU_CPU_H 22 22 23 23 - #include "qemu/object.h" 23 23 + #include "qom/object.h" 24 24 #include "qemu-thread.h" 25 25 26 26 /**

include/qemu/object.h include/qom/object.h

+1 -1

include/qemu/qom-qobject.h include/qom/qom-qobject.h

··· 13 13 #ifndef QEMU_QOM_QOBJECT_H 14 14 #define QEMU_QOM_QOBJECT_H 15 15 16 16 - #include "qemu/object.h" 16 16 + #include "qom/object.h" 17 17 18 18 /* 19 19 * object_property_get_qobject:

+1 -1

include/qemu/rng-random.h

··· 12 12 #ifndef QEMU_RNG_RANDOM_H 13 13 #define QEMU_RNG_RANDOM_H 14 14 15 15 - #include "qemu/object.h" 15 15 + #include "qom/object.h" 16 16 17 17 #define TYPE_RNG_RANDOM "rng-random" 18 18 #define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM)

+1 -1

include/qemu/rng.h

··· 13 13 #ifndef QEMU_RNG_H 14 14 #define QEMU_RNG_H 15 15 16 16 - #include "qemu/object.h" 16 16 + #include "qom/object.h" 17 17 #include "qemu-common.h" 18 18 #include "qapi/error.h" 19 19

+1 -1

qmp.c

··· 23 23 #include "arch_init.h" 24 24 #include "hw/qdev.h" 25 25 #include "blockdev.h" 26 26 - #include "qemu/qom-qobject.h" 26 26 + #include "qom/qom-qobject.h" 27 27 28 28 NameInfo *qmp_query_name(Error **errp) 29 29 {

+1 -1

qom/container.c

··· 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 13 13 - #include "qemu/object.h" 13 13 + #include "qom/object.h" 14 14 #include "module.h" 15 15 #include <assert.h> 16 16

+1 -1

qom/cpu.c

··· 18 18 * <http://www.gnu.org/licenses/gpl-2.0.html> 19 19 */ 20 20 21 21 - #include "qemu/cpu.h" 21 21 + #include "qom/cpu.h" 22 22 #include "qemu-common.h" 23 23 24 24 void cpu_reset(CPUState *cpu)

+2 -2

qom/object.c

··· 10 10 * See the COPYING file in the top-level directory. 11 11 */ 12 12 13 13 - #include "qemu/object.h" 13 13 + #include "qom/object.h" 14 14 #include "qemu-common.h" 15 15 #include "qapi/visitor.h" 16 16 #include "qapi/string-input-visitor.h" ··· 19 19 20 20 /* TODO: replace QObject with a simpler visitor to avoid a dependency 21 21 * of the QOM core on QObject? */ 22 22 - #include "qemu/qom-qobject.h" 22 22 + #include "qom/qom-qobject.h" 23 23 #include "qapi/qmp/qobject.h" 24 24 #include "qapi/qmp/qbool.h" 25 25 #include "qapi/qmp/qint.h"

+2 -2

qom/qom-qobject.c

··· 10 10 */ 11 11 12 12 #include "qemu-common.h" 13 13 - #include "qemu/object.h" 14 14 - #include "qemu/qom-qobject.h" 13 13 + #include "qom/object.h" 14 14 + #include "qom/qom-qobject.h" 15 15 #include "qapi/visitor.h" 16 16 #include "qapi/qmp-input-visitor.h" 17 17 #include "qapi/qmp-output-visitor.h"

+1 -1

target-alpha/cpu-qom.h

··· 20 20 #ifndef QEMU_ALPHA_CPU_QOM_H 21 21 #define QEMU_ALPHA_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 26 26 #define TYPE_ALPHA_CPU "alpha-cpu"

+1 -1

target-arm/cpu-qom.h

··· 20 20 #ifndef QEMU_ARM_CPU_QOM_H 21 21 #define QEMU_ARM_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #define TYPE_ARM_CPU "arm-cpu" 26 26

+1 -1

target-cris/cpu-qom.h

··· 20 20 #ifndef QEMU_CRIS_CPU_QOM_H 21 21 #define QEMU_CRIS_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #define TYPE_CRIS_CPU "cris-cpu" 26 26

+1 -1

target-i386/cpu-qom.h

··· 20 20 #ifndef QEMU_I386_CPU_QOM_H 21 21 #define QEMU_I386_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 #include "qapi/error.h" 26 26

+1 -1

target-lm32/cpu-qom.h

··· 20 20 #ifndef QEMU_LM32_CPU_QOM_H 21 21 #define QEMU_LM32_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 26 26 #define TYPE_LM32_CPU "lm32-cpu"

+1 -1

target-m68k/cpu-qom.h

··· 20 20 #ifndef QEMU_M68K_CPU_QOM_H 21 21 #define QEMU_M68K_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #define TYPE_M68K_CPU "m68k-cpu" 26 26

+1 -1

target-microblaze/cpu-qom.h

··· 20 20 #ifndef QEMU_MICROBLAZE_CPU_QOM_H 21 21 #define QEMU_MICROBLAZE_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #define TYPE_MICROBLAZE_CPU "microblaze-cpu" 26 26

+1 -1

target-mips/cpu-qom.h

··· 20 20 #ifndef QEMU_MIPS_CPU_QOM_H 21 21 #define QEMU_MIPS_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #ifdef TARGET_MIPS64 26 26 #define TYPE_MIPS_CPU "mips64-cpu"

+1 -1

target-openrisc/cpu.h

··· 32 32 #include "qemu-common.h" 33 33 #include "exec/cpu-defs.h" 34 34 #include "softfloat.h" 35 35 - #include "qemu/cpu.h" 35 35 + #include "qom/cpu.h" 36 36 #include "qapi/error.h" 37 37 38 38 #define TYPE_OPENRISC_CPU "or32-cpu"

+1 -1

target-ppc/cpu-qom.h

··· 20 20 #ifndef QEMU_PPC_CPU_QOM_H 21 21 #define QEMU_PPC_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 26 26 #ifdef TARGET_PPC64

+1 -1

target-s390x/cpu-qom.h

··· 20 20 #ifndef QEMU_S390_CPU_QOM_H 21 21 #define QEMU_S390_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 26 26 #define TYPE_S390_CPU "s390-cpu"

+1 -1

target-sh4/cpu-qom.h

··· 20 20 #ifndef QEMU_SUPERH_CPU_QOM_H 21 21 #define QEMU_SUPERH_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 25 25 #define TYPE_SUPERH_CPU "superh-cpu" 26 26

+1 -1

target-sparc/cpu-qom.h

··· 20 20 #ifndef QEMU_SPARC_CPU_QOM_H 21 21 #define QEMU_SPARC_CPU_QOM_H 22 22 23 23 - #include "qemu/cpu.h" 23 23 + #include "qom/cpu.h" 24 24 #include "cpu.h" 25 25 26 26 #ifdef TARGET_SPARC64

+1 -1

target-unicore32/cpu-qom.h

··· 11 11 #ifndef QEMU_UC32_CPU_QOM_H 12 12 #define QEMU_UC32_CPU_QOM_H 13 13 14 14 - #include "qemu/cpu.h" 14 14 + #include "qom/cpu.h" 15 15 #include "cpu.h" 16 16 17 17 #define TYPE_UNICORE32_CPU "unicore32-cpu"

+1 -1

target-xtensa/cpu-qom.h

··· 29 29 #ifndef QEMU_XTENSA_CPU_QOM_H 30 30 #define QEMU_XTENSA_CPU_QOM_H 31 31 32 32 - #include "qemu/cpu.h" 32 32 + #include "qom/cpu.h" 33 33 #include "cpu.h" 34 34 35 35 #define TYPE_XTENSA_CPU "xtensa-cpu"