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 /hw/i386 | |
parent | 17dc57990320edaad52ac9ea808be9719c91cea6 (diff) | |
download | qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.zip qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.tar.gz qemu-2e5b09fd0e766434962327db4678ce1cda0c7241.tar.bz2 |
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/i386')
-rw-r--r-- | hw/i386/acpi-build.c | 2 | ||||
-rw-r--r-- | hw/i386/pc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 5b0ec1b..034e413 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -27,7 +27,7 @@ #include "qemu/bitmap.h" #include "qemu/error-report.h" #include "hw/pci/pci.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #include "target/i386/cpu.h" #include "hw/misc/pvpanic.h" #include "hw/timer/hpet.h" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3ab4bcb..006550f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -76,7 +76,7 @@ #include "qapi/error.h" #include "qapi/qapi-visit-common.h" #include "qapi/visitor.h" -#include "qom/cpu.h" +#include "hw/core/cpu.h" #include "hw/nmi.h" #include "hw/usb.h" #include "hw/i386/intel_iommu.h" |