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 /hw/cpu | |
| 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 'hw/cpu')
| -rw-r--r-- | hw/cpu/a9mpcore.c | 2 | ||||
| -rw-r--r-- | hw/cpu/cluster.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c index cd1e165faf..6872a3a00a 100644 --- a/hw/cpu/a9mpcore.c +++ b/hw/cpu/a9mpcore.c @@ -14,7 +14,7 @@ #include "hw/cpu/a9mpcore.h" #include "hw/irq.h" #include "hw/qdev-properties.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" static void a9mp_priv_set_irq(void *opaque, int irq, int level) { diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c index 74d8d43c00..349a883261 100644 --- a/hw/cpu/cluster.c +++ b/hw/cpu/cluster.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "hw/cpu/cluster.h" #include "hw/qdev-properties.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #include "qapi/error.h" #include "qemu/module.h" #include "qemu/cutils.h" |