From 2e5b09fd0e766434962327db4678ce1cda0c7241 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 9 Jul 2019 17:20:52 +0200 Subject: hw/core: Move cpu.c, cpu.h from qom/ to hw/core/ Suggested-by: Daniel P. Berrangé Signed-off-by: Markus Armbruster Message-Id: <20190709152053.16670-2-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé [Rebased onto merge commit 95a9457fd44; missed instances of qom/cpu.h in comments replaced] --- target/hppa/cpu-qom.h | 2 +- target/hppa/int_helper.c | 2 +- target/hppa/mem_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/hppa') 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 -- cgit v1.2.3-55-g7522