diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-07-09 17:20:52 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-08-21 13:24:01 +0200 |
| commit | 2e5b09fd0e766434962327db4678ce1cda0c7241 (patch) | |
| tree | 1c2e0a2e81925cbde794a98194f3683044660dd6 /target/s390x | |
| parent | 17dc57990320edaad52ac9ea808be9719c91cea6 (diff) | |
| download | 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/s390x')
| -rw-r--r-- | target/s390x/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu_models.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h index b46217dc31..b809ec8418 100644 --- a/target/s390x/cpu-qom.h +++ b/target/s390x/cpu-qom.h @@ -20,7 +20,7 @@ #ifndef QEMU_S390_CPU_QOM_H #define QEMU_S390_CPU_QOM_H -#include "qom/cpu.h" +#include "hw/core/cpu.h" #define TYPE_S390_CPU "s390x-cpu" diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index 174a99e561..88bd01a616 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -15,7 +15,7 @@ #include "cpu_features.h" #include "gen-features.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" /* static CPU definition */ struct S390CPUDef { |