vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qom: move include files to include/qom/ 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Paolo Bonzini 2012-12-17 18:19:50 +01:00
parent caf71f86a3
commit 14cccb6185
27 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/qdev-core.h
View File

@ -4,7 +4,7 @@
#include "qemu-queue.h" #include "qemu-queue.h"
#include "qemu-option.h" #include "qemu-option.h"
#include "qemu-types.h" #include "qemu-types.h"
#include "qemu/object.h" #include "qom/object.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "qapi/error.h" #include "qapi/error.h"

2
hw/stream.h
View File

@ -2,7 +2,7 @@
#define STREAM_H 1 #define STREAM_H 1
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/object.h" #include "qom/object.h"
/* stream slave. Used until qdev provides a generic way. */ /* stream slave. Used until qdev provides a generic way. */
#define TYPE_STREAM_SLAVE "stream-slave" #define TYPE_STREAM_SLAVE "stream-slave"

2
include/qemu/rng-random.h
View File

@ -12,7 +12,7 @@
#ifndef QEMU_RNG_RANDOM_H #ifndef QEMU_RNG_RANDOM_H
#define QEMU_RNG_RANDOM_H #define QEMU_RNG_RANDOM_H
#include "qemu/object.h" #include "qom/object.h"
#define TYPE_RNG_RANDOM "rng-random" #define TYPE_RNG_RANDOM "rng-random"
#define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM) #define RNG_RANDOM(obj) OBJECT_CHECK(RndRandom, (obj), TYPE_RNG_RANDOM)

2
include/qemu/rng.h
View File

@ -13,7 +13,7 @@
#ifndef QEMU_RNG_H #ifndef QEMU_RNG_H
#define QEMU_RNG_H #define QEMU_RNG_H
#include "qemu/object.h" #include "qom/object.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi/error.h" #include "qapi/error.h"

2
include/qemu/cpu.h → include/qom/cpu.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_CPU_H #ifndef QEMU_CPU_H
#define QEMU_CPU_H #define QEMU_CPU_H
#include "qemu/object.h" #include "qom/object.h"
#include "qemu-thread.h" #include "qemu-thread.h"
/** /**

0
include/qemu/object.h → include/qom/object.h
View File

2
include/qemu/qom-qobject.h → include/qom/qom-qobject.h
View File

@ -13,7 +13,7 @@
#ifndef QEMU_QOM_QOBJECT_H #ifndef QEMU_QOM_QOBJECT_H
#define QEMU_QOM_QOBJECT_H #define QEMU_QOM_QOBJECT_H
#include "qemu/object.h" #include "qom/object.h"
/* /*
* object_property_get_qobject: * object_property_get_qobject:

2
qmp.c
View File

@ -23,7 +23,7 @@
#include "arch_init.h" #include "arch_init.h"
#include "hw/qdev.h" #include "hw/qdev.h"
#include "blockdev.h" #include "blockdev.h"
#include "qemu/qom-qobject.h" #include "qom/qom-qobject.h"
NameInfo *qmp_query_name(Error **errp) NameInfo *qmp_query_name(Error **errp)
{ {

2
qom/container.c
View File

@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/object.h" #include "qom/object.h"
#include "module.h" #include "module.h"
#include <assert.h> #include <assert.h>

2
qom/cpu.c
View File

@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/gpl-2.0.html> * <http://www.gnu.org/licenses/gpl-2.0.html>
*/ */
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "qemu-common.h" #include "qemu-common.h"
void cpu_reset(CPUState *cpu) void cpu_reset(CPUState *cpu)

4
qom/object.c
View File

@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#include "qemu/object.h" #include "qom/object.h"
#include "qemu-common.h" #include "qemu-common.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/string-input-visitor.h" #include "qapi/string-input-visitor.h"
@ -19,7 +19,7 @@
/* TODO: replace QObject with a simpler visitor to avoid a dependency /* TODO: replace QObject with a simpler visitor to avoid a dependency
* of the QOM core on QObject? */ * of the QOM core on QObject? */
#include "qemu/qom-qobject.h" #include "qom/qom-qobject.h"
#include "qapi/qmp/qobject.h" #include "qapi/qmp/qobject.h"
#include "qapi/qmp/qbool.h" #include "qapi/qmp/qbool.h"
#include "qapi/qmp/qint.h" #include "qapi/qmp/qint.h"

4
qom/qom-qobject.c
View File

@ -10,8 +10,8 @@
*/ */
#include "qemu-common.h" #include "qemu-common.h"
#include "qemu/object.h" #include "qom/object.h"
#include "qemu/qom-qobject.h" #include "qom/qom-qobject.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/qmp-input-visitor.h" #include "qapi/qmp-input-visitor.h"
#include "qapi/qmp-output-visitor.h" #include "qapi/qmp-output-visitor.h"

2
target-alpha/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_ALPHA_CPU_QOM_H #ifndef QEMU_ALPHA_CPU_QOM_H
#define QEMU_ALPHA_CPU_QOM_H #define QEMU_ALPHA_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#define TYPE_ALPHA_CPU "alpha-cpu" #define TYPE_ALPHA_CPU "alpha-cpu"

2
target-arm/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_ARM_CPU_QOM_H #ifndef QEMU_ARM_CPU_QOM_H
#define QEMU_ARM_CPU_QOM_H #define QEMU_ARM_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#define TYPE_ARM_CPU "arm-cpu" #define TYPE_ARM_CPU "arm-cpu"

2
target-cris/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_CRIS_CPU_QOM_H #ifndef QEMU_CRIS_CPU_QOM_H
#define QEMU_CRIS_CPU_QOM_H #define QEMU_CRIS_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#define TYPE_CRIS_CPU "cris-cpu" #define TYPE_CRIS_CPU "cris-cpu"

2
target-i386/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_I386_CPU_QOM_H #ifndef QEMU_I386_CPU_QOM_H
#define QEMU_I386_CPU_QOM_H #define QEMU_I386_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#include "qapi/error.h" #include "qapi/error.h"

2
target-lm32/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_LM32_CPU_QOM_H #ifndef QEMU_LM32_CPU_QOM_H
#define QEMU_LM32_CPU_QOM_H #define QEMU_LM32_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#define TYPE_LM32_CPU "lm32-cpu" #define TYPE_LM32_CPU "lm32-cpu"

2
target-m68k/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_M68K_CPU_QOM_H #ifndef QEMU_M68K_CPU_QOM_H
#define QEMU_M68K_CPU_QOM_H #define QEMU_M68K_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#define TYPE_M68K_CPU "m68k-cpu" #define TYPE_M68K_CPU "m68k-cpu"

2
target-microblaze/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_MICROBLAZE_CPU_QOM_H #ifndef QEMU_MICROBLAZE_CPU_QOM_H
#define QEMU_MICROBLAZE_CPU_QOM_H #define QEMU_MICROBLAZE_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#define TYPE_MICROBLAZE_CPU "microblaze-cpu" #define TYPE_MICROBLAZE_CPU "microblaze-cpu"

2
target-mips/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_MIPS_CPU_QOM_H #ifndef QEMU_MIPS_CPU_QOM_H
#define QEMU_MIPS_CPU_QOM_H #define QEMU_MIPS_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#ifdef TARGET_MIPS64 #ifdef TARGET_MIPS64
#define TYPE_MIPS_CPU "mips64-cpu" #define TYPE_MIPS_CPU "mips64-cpu"

2
target-openrisc/cpu.h
View File

@ -32,7 +32,7 @@ struct OpenRISCCPU;
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/cpu-defs.h" #include "exec/cpu-defs.h"
#include "softfloat.h" #include "softfloat.h"
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "qapi/error.h" #include "qapi/error.h"
#define TYPE_OPENRISC_CPU "or32-cpu" #define TYPE_OPENRISC_CPU "or32-cpu"

2
target-ppc/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_PPC_CPU_QOM_H #ifndef QEMU_PPC_CPU_QOM_H
#define QEMU_PPC_CPU_QOM_H #define QEMU_PPC_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#ifdef TARGET_PPC64 #ifdef TARGET_PPC64

2
target-s390x/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_S390_CPU_QOM_H #ifndef QEMU_S390_CPU_QOM_H
#define QEMU_S390_CPU_QOM_H #define QEMU_S390_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#define TYPE_S390_CPU "s390-cpu" #define TYPE_S390_CPU "s390-cpu"

2
target-sh4/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_SUPERH_CPU_QOM_H #ifndef QEMU_SUPERH_CPU_QOM_H
#define QEMU_SUPERH_CPU_QOM_H #define QEMU_SUPERH_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#define TYPE_SUPERH_CPU "superh-cpu" #define TYPE_SUPERH_CPU "superh-cpu"

2
target-sparc/cpu-qom.h
View File

@ -20,7 +20,7 @@
#ifndef QEMU_SPARC_CPU_QOM_H #ifndef QEMU_SPARC_CPU_QOM_H
#define QEMU_SPARC_CPU_QOM_H #define QEMU_SPARC_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64

2
target-unicore32/cpu-qom.h
View File

@ -11,7 +11,7 @@
#ifndef QEMU_UC32_CPU_QOM_H #ifndef QEMU_UC32_CPU_QOM_H
#define QEMU_UC32_CPU_QOM_H #define QEMU_UC32_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#define TYPE_UNICORE32_CPU "unicore32-cpu" #define TYPE_UNICORE32_CPU "unicore32-cpu"

2
target-xtensa/cpu-qom.h
View File

@ -29,7 +29,7 @@
#ifndef QEMU_XTENSA_CPU_QOM_H #ifndef QEMU_XTENSA_CPU_QOM_H
#define QEMU_XTENSA_CPU_QOM_H #define QEMU_XTENSA_CPU_QOM_H
#include "qemu/cpu.h" #include "qom/cpu.h"
#include "cpu.h" #include "cpu.h"
#define TYPE_XTENSA_CPU "xtensa-cpu" #define TYPE_XTENSA_CPU "xtensa-cpu"