diff options
author | Markus Armbruster | 2019-07-09 17:20:52 +0200 |
---|---|---|
committer | Markus Armbruster | 2019-08-21 13:24:01 +0200 |
commit | 2e5b09fd0e766434962327db4678ce1cda0c7241 (patch) | |
tree | 1c2e0a2e81925cbde794a98194f3683044660dd6 /target/hppa | |
parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-2... (diff) | |
download | qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.tar.gz qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.tar.xz qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.zip |
hw/core: Move cpu.c, cpu.h from qom/ to hw/core/
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190709152053.16670-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Rebased onto merge commit 95a9457fd44; missed instances of qom/cpu.h
in comments replaced]
Diffstat (limited to 'target/hppa')
-rw-r--r-- | target/hppa/cpu-qom.h | 2 | ||||
-rw-r--r-- | target/hppa/int_helper.c | 2 | ||||
-rw-r--r-- | target/hppa/mem_helper.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/target/hppa/cpu-qom.h b/target/hppa/cpu-qom.h index 9084e4701d..6367dc4793 100644 --- a/target/hppa/cpu-qom.h +++ b/target/hppa/cpu-qom.h @@ -20,7 +20,7 @@ #ifndef QEMU_HPPA_CPU_QOM_H #define QEMU_HPPA_CPU_QOM_H -#include "qom/cpu.h" +#include "hw/core/cpu.h" #define TYPE_HPPA_CPU "hppa-cpu" diff --git a/target/hppa/int_helper.c b/target/hppa/int_helper.c index 89241c31e7..462747baf8 100644 --- a/target/hppa/int_helper.c +++ b/target/hppa/int_helper.c @@ -22,7 +22,7 @@ #include "qemu/log.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #ifndef CONFIG_USER_ONLY static void eval_interrupt(HPPACPU *cpu) diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c index b12c5b5054..5a465db0dd 100644 --- a/target/hppa/mem_helper.c +++ b/target/hppa/mem_helper.c @@ -21,7 +21,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #include "trace.h" #ifdef CONFIG_USER_ONLY |