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] --- hw/timer/a9gtimer.c | 2 +- hw/timer/arm_mptimer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/timer') diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 75f1867174..4c634c83b1 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -31,7 +31,7 @@ #include "qemu/bitops.h" #include "qemu/log.h" #include "qemu/module.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #ifndef A9_GTIMER_ERR_DEBUG #define A9_GTIMER_ERR_DEBUG 0 diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 983e61847e..9f63abef10 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -29,7 +29,7 @@ #include "qapi/error.h" #include "qemu/main-loop.h" #include "qemu/module.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #define PTIMER_POLICY \ (PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD | \ -- cgit v1.2.3-55-g7522