include: cleanup cross-subsystem inclusions, empty include/hw/

[PATCH 27/28] include: move hw/hw.h to hw/core/, rename

Paolo Bonzini posted 28 patches 1 day, 21 hours ago

Download mbox

Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Mads Ynddal <mads@ynddal.dk>, Magnus Kulke <magnus.kulke@linux.microsoft.com>, Wei Liu <wei.liu@kernel.org>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, David Hildenbrand <david@kernel.org>, Igor Mammedov <imammedo@redhat.com>, Alistair Francis <alistair.francis@wdc.com>, Stefan Berger <stefanb@linux.vnet.ibm.com>, Stefan Hajnoczi <stefanha@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, John Snow <jsnow@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Luc Michel <luc@lmichel.fr>, Damien Hedde <damien.hedde@dahe.fr>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, "Alex Bennée" <alex.bennee@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>, Markus Armbruster <armbru@redhat.com>, Ani Sinha <anisinha@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Greg Kurz <groug@kaod.org>, Dongjiu Geng <gengdongjiu1@gmail.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, Tyrone Ting <kfting@nuvoton.com>, Hao Wu <wuhaotsh@google.com>, Beniamino Galvani <b.galvani@gmail.com>, Strahinja Jankovic <strahinja.p.jankovic@gmail.com>, Niek Linnenbank <nieklinnenbank@gmail.com>, Samuel Tardieu <sam@rfc1149.net>, Antony Pavlov <antonynpavlov@gmail.com>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Jean-Christophe Dubois <jcd@tribudubois.net>, Andrey Smirnov <andrew.smirnov@gmail.com>, Bernhard Beschow <shentey@gmail.com>, Rob Herring <robh@kernel.org>, Subbaraya Sundeep <sundeep.lkml@gmail.com>, Jan Kiszka <jan.kiszka@web.de>, Felipe Balbi <balbi@kernel.org>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <leif.lindholm@oss.qualcomm.com>, Eric Auger <eric.auger@redhat.com>, Alexandre Iooss <erdnaxe@crans.org>, Shannon Zhao <shannon.zhaosl@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Michael Rolnik <mrolnik@gmail.com>, Stefano Garzarella <sgarzare@redhat.com>, Raphael Norwitz <raphael@enfabrica.net>, Helge Deller <deller@gmx.de>, "Clément Chigot" <chigot@adacore.com>, Frederic Konrad <konrad.frederic@yahoo.fr>, Alberto Garcia <berto@igalia.com>, Yoshinori Sato <yoshinori.sato@nifty.com>, Magnus Damm <magnus.damm@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Vijai Kumar K <vijai@behindbytes.com>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, "Collin L. Walling" <walling@linux.ibm.com>, Amit Shah <amit@kernel.org>, Eduardo Habkost <eduardo@habkost.net>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Riku Voipio <riku.voipio@iki.fi>, Paul Burton <paulburton@kernel.org>, Aleksandar Rikalo <arikalo@gmail.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Hervé Poussineau" <hpoussin@reactos.org>, BALATON Zoltan <balaton@eik.bme.hu>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Dmitry Osipenko <dmitry.osipenko@collabora.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Ninad Palsule <ninad@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, "Maciej S. Szmigiero" <maciej.szmigiero@oracle.com>, Corey Minyard <cminyard@mvista.com>, Patrick Leis <venture@google.com>, Alejandro Jimenez <alejandro.j.jimenez@oracle.com>, Sairaj Kodilkar <sarunkod@amd.com>, Jason Wang <jasowang@redhat.com>, Yi Liu <yi.l.liu@intel.com>, "Clément Mathieu--Drif" <clement.mathieu--drif@eviden.com>, David Woodhouse <dwmw2@infradead.org>, Sergio Lopez <slp@redhat.com>, Alexander Graf <graf@amazon.com>, Dorjoy Chowdhury <dorjoychy111@gmail.com>, Song Gao <gaosong@loongson.cn>, Bibo Mao <maobibo@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Huacai Chen <chenhuacai@kernel.org>, Jia Liu <proljc@gmail.com>, Aditya Gupta <adityag@linux.ibm.com>, Gautam Menghani <gautam@linux.ibm.com>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>, Artyom Tarasenko <atar4qemu@gmail.com>, Gustavo Romero <gustavo.romero@linaro.org>, Francisco Iglesias <francisco.iglesias@amd.com>, Pavel Pisa <pisa@cmp.felk.cvut.cz>, Vikram Garhwal <vikram.garhwal@bytedance.com>, Stefan Weil <sw@weilnetz.de>, Sriram Yagnaraman <sriram.yagnaraman@ericsson.com>, Max Filippov <jcmvbkbc@gmail.com>, Jiri Pirko <jiri@resnulli.us>, Sven Schnelle <svens@stackframe.org>, Stafford Horne <shorne@gmail.com>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Jagannathan Raman <jag.raman@oracle.com>, Chinmay Rath <rathc@linux.ibm.com>, Sai Pavan Boddu <sai.pavan.boddu@amd.com>, Ran Wang <wangran@bosc.ac.cn>, Anup Patel <anup.patel@wdc.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, Nina Schoetterl-Glausch <nsg@linux.ibm.com>, Jared Rossi <jrossi@linux.ibm.com>, Zhuoying Cai <zycai@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Fam Zheng <fam@euphon.net>, Hannes Reinecke <hare@suse.com>, Bin Meng <bmeng.cn@gmail.com>, Titus Rwantare <titusr@google.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Jeuk Kim <jeuk20.kim@samsung.com>, "Hongren (Zenithal) Zheng" <i@zenithal.me>, "Canokeys.org" <contact@canokeys.org>, John Levon <john.levon@nutanix.com>, Thanos Makatos <thanos.makatos@nutanix.com>, Alex Williamson <alex@shazbot.org>, Tomita Moeko <tomitamoeko@gmail.com>, Viresh Kumar <viresh.kumar@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, Manos Pitsidianakis <manos.pitsidianakis@linaro.org>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Jesper Devantier <foss@defmacro.it>, Huai-Cheng Kuo <hchkuo@avery-design.com.tw>, Chris Browy <cbrowy@avery-design.com>, Zhenzhong Duan <zhenzhong.duan@intel.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Cleber Rosa <crosa@redhat.com>, Maksim Davydov <davydov-max@yandex-team.ru>, David Gibson <david@gibson.dropbear.id.au>, Hyman Huang <yong.huang@smartx.com>, Brian Cain <brian.cain@oss.qualcomm.com>, Marcelo Tosatti <mtosatti@redhat.com>, Pedro Barbuda <pbarbuda@microsoft.com>, Mohamed Mediouni <mohamed@unpredictable.fr>

Expand all Fold all

[PATCH 27/28] include: move hw/hw.h to hw/core/, rename

Posted by Paolo Bonzini 1 day, 21 hours ago

Call it include/hw/core/hw-error.h since that is the only
thing it contains.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 include/hw/{hw.h => core/hw-error.h} |  0
 hw/arm/integratorcp.c                |  2 +-
 hw/arm/omap1.c                       |  2 +-
 hw/arm/xen-stubs.c                   |  2 +-
 hw/audio/lm4549.c                    |  2 +-
 hw/core/loader.c                     |  2 +-
 hw/display/bcm2835_fb.c              |  2 +-
 hw/display/exynos4210_fimd.c         |  2 +-
 hw/display/g364fb.c                  |  2 +-
 hw/dma/pl080.c                       |  2 +-
 hw/dma/xilinx_axidma.c               |  2 +-
 hw/i386/xen/xen-hvm.c                |  2 +-
 hw/intc/exynos4210_combiner.c        |  2 +-
 hw/misc/omap_clk.c                   |  2 +-
 hw/net/e1000e.c                      |  2 +-
 hw/net/igb.c                         |  2 +-
 hw/net/igbvf.c                       |  2 +-
 hw/net/vmxnet3.c                     |  2 +-
 hw/net/xilinx_axienet.c              |  2 +-
 hw/ppc/ppce500_spin.c                |  2 +-
 hw/timer/a9gtimer.c                  |  2 +-
 hw/timer/arm_mptimer.c               |  2 +-
 hw/vfio/device.c                     |  2 +-
 hw/vfio/helpers.c                    |  2 +-
 hw/vfio/igd.c                        |  2 +-
 hw/vfio/listener.c                   |  2 +-
 hw/vfio/migration.c                  |  2 +-
 hw/vfio/pci.c                        |  2 +-
 hw/vfio/region.c                     |  2 +-
 hw/vfio/spapr.c                      |  2 +-
 hw/xen/xen-hvm-common.c              |  2 +-
 system/cpus.c                        |  2 +-
 target/ppc/kvm.c                     |  2 +-
 target/ppc/mmu-hash64.c              |  2 +-
 target/s390x/mmu_helper.c            |  2 +-
 scripts/analyze-inclusions           | 10 +++++-----
 36 files changed, 39 insertions(+), 39 deletions(-)
 rename include/hw/{hw.h => core/hw-error.h} (100%)

diff --git a/include/hw/hw.h b/include/hw/core/hw-error.h
similarity index 100%
rename from include/hw/hw.h
rename to include/hw/core/hw-error.h
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 118808f2dc7..0bf519b6bb8 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -23,7 +23,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/char/pl011.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/sd/sd.h"
 #include "qom/object.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index f3d6be1e295..f5ff4b107ae 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -24,7 +24,7 @@
 #include "qapi/error.h"
 #include "cpu.h"
 #include "system/address-spaces.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/boot.h"
diff --git a/hw/arm/xen-stubs.c b/hw/arm/xen-stubs.c
index 6a830435533..00bc310252f 100644
--- a/hw/arm/xen-stubs.c
+++ b/hw/arm/xen-stubs.c
@@ -7,7 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/qapi-commands-migration.h"
 #include "system/xen.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/arch_hvm.h"
 
diff --git a/hw/audio/lm4549.c b/hw/audio/lm4549.c
index bf711c49c04..f85226d1ac5 100644
--- a/hw/audio/lm4549.c
+++ b/hw/audio/lm4549.c
@@ -14,7 +14,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/log.h"
 #include "qemu/audio.h"
 #include "lm4549.h"
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 40cb187a113..8252616fdd3 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -50,7 +50,7 @@
 #include "qapi/type-helpers.h"
 #include "qemu/units.h"
 #include "trace.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "disas/disas.h"
 #include "migration/cpr.h"
 #include "migration/vmstate.h"
diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 8eec0dc600b..75d7c0f8499 100644
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "ui/console.h"
 #include "framebuffer.h"
diff --git a/hw/display/exynos4210_fimd.c b/hw/display/exynos4210_fimd.c
index 7f841b88047..a97054132fb 100644
--- a/hw/display/exynos4210_fimd.c
+++ b/hw/display/exynos4210_fimd.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/sysbus.h"
 #include "migration/vmstate.h"
diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 2eefafcaf67..50952e9934b 100644
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c
index 514206b7c31..3f8acb03deb 100644
--- a/hw/dma/pl080.c
+++ b/hw/dma/pl080.c
@@ -13,7 +13,7 @@
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/dma/pl080.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index 8488f125b5f..22dec8b3eb2 100644
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -26,7 +26,7 @@
 #include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 591da26d453..a6e1683885a 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -15,7 +15,7 @@
 #include "qapi/qapi-commands-migration.h"
 #include "trace.h"
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/i386/pc.h"
 #include "hw/core/irq.h"
 #include "hw/i386/apic-msidef.h"
diff --git a/hw/intc/exynos4210_combiner.c b/hw/intc/exynos4210_combiner.c
index ec935a084db..e8cac331e4c 100644
--- a/hw/intc/exynos4210_combiner.c
+++ b/hw/intc/exynos4210_combiner.c
@@ -33,7 +33,7 @@
 #include "qemu/module.h"
 #include "hw/intc/exynos4210_combiner.h"
 #include "hw/arm/exynos4210.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "qom/object.h"
diff --git a/hw/misc/omap_clk.c b/hw/misc/omap_clk.c
index 37afef09903..e927ef22a09 100644
--- a/hw/misc/omap_clk.c
+++ b/hw/misc/omap_clk.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/arm/omap.h"
 
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index 3d4683370c6..9faf0c74c3d 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -41,7 +41,7 @@
 #include "qemu/module.h"
 #include "qemu/range.h"
 #include "system/system.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
diff --git a/hw/net/igb.c b/hw/net/igb.c
index d39eba9f64d..c076807e711 100644
--- a/hw/net/igb.c
+++ b/hw/net/igb.c
@@ -45,7 +45,7 @@
 #include "qemu/module.h"
 #include "qemu/range.h"
 #include "system/system.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pcie.h"
diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c
index 9b0db8f8411..48d56e43aca 100644
--- a/hw/net/igbvf.c
+++ b/hw/net/igbvf.c
@@ -38,7 +38,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/net/mii.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pcie.h"
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index bae3a44cb0c..97156dd33b9 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -16,7 +16,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/pci.h"
 #include "hw/core/qdev-properties.h"
 #include "net/tap.h"
diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 29c09b88ebf..d85f8bb23fe 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -23,7 +23,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/sysbus.h"
 #include "qapi/error.h"
 #include "qemu/log.h"
diff --git a/hw/ppc/ppce500_spin.c b/hw/ppc/ppce500_spin.c
index a066ada77ed..85bdcac43a1 100644
--- a/hw/ppc/ppce500_spin.c
+++ b/hw/ppc/ppce500_spin.c
@@ -30,7 +30,7 @@
 #include "qemu/osdep.h"
 #include "qemu/module.h"
 #include "qemu/units.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/sysbus.h"
 #include "system/hw_accel.h"
 #include "hw/ppc/ppc.h"
diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index a2363a89a5f..3a086915c81 100644
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -21,7 +21,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/timer/a9gtimer.h"
diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 869db913d40..88158144b23 100644
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -20,7 +20,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/core/irq.h"
 #include "hw/core/ptimer.h"
 #include "hw/core/qdev-properties.h"
diff --git a/hw/vfio/device.c b/hw/vfio/device.c
index 76869828fc8..19d1236ed75 100644
--- a/hw/vfio/device.c
+++ b/hw/vfio/device.c
@@ -23,7 +23,7 @@
 
 #include "hw/vfio/vfio-device.h"
 #include "hw/vfio/pci.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index 23d13e5db5f..2cbc7b4964f 100644
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -24,7 +24,7 @@
 
 #include "system/kvm.h"
 #include "hw/vfio/vfio-device.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qapi/error.h"
 #include "vfio-helpers.h"
 
diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c
index cff413c16f5..6aacf27284f 100644
--- a/hw/vfio/igd.c
+++ b/hw/vfio/igd.c
@@ -16,7 +16,7 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/core/boards.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/nvram/fw_cfg.h"
 #include "pci.h"
 #include "pci-quirks.h"
diff --git a/hw/vfio/listener.c b/hw/vfio/listener.c
index 2d7d3a46457..7af01075359 100644
--- a/hw/vfio/listener.c
+++ b/hw/vfio/listener.c
@@ -30,7 +30,7 @@
 #include "hw/vfio/pci.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/range.h"
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 4c06e3db936..fde343f06e3 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -30,7 +30,7 @@
 #include "exec/ramlist.h"
 #include "pci.h"
 #include "trace.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "vfio-migration-internal.h"
 
 /*
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index a0a66b105aa..c7344727214 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -23,7 +23,7 @@
 #include <linux/vfio.h>
 #include <sys/ioctl.h>
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/pci_bridge.h"
diff --git a/hw/vfio/region.c b/hw/vfio/region.c
index b165ab0b937..ca75ab1be4d 100644
--- a/hw/vfio/region.c
+++ b/hw/vfio/region.c
@@ -23,7 +23,7 @@
 
 #include "hw/vfio/vfio-region.h"
 #include "hw/vfio/vfio-device.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index 0f23681a3f9..a9f093c3570 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -16,7 +16,7 @@
 #include "system/address-spaces.h"
 
 #include "hw/vfio/vfio-container-legacy.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "trace.h"
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index 5d11b50db9c..59c73dfaeb5 100644
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -7,7 +7,7 @@
 #include "exec/target_page.h"
 #include "trace.h"
 
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/pci/pci_host.h"
 #include "hw/xen/xen-hvm-common.h"
 #include "hw/xen/xen-bus.h"
diff --git a/system/cpus.c b/system/cpus.c
index a0e1debfea8..49deeb9468a 100644
--- a/system/cpus.c
+++ b/system/cpus.c
@@ -45,7 +45,7 @@
 #include "system/cpu-timers.h"
 #include "system/whpx.h"
 #include "hw/core/boards.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "trace.h"
 
 #ifdef CONFIG_LINUX
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 43124bf1c78..2c96eca584e 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -34,7 +34,7 @@
 
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_cpu_core.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/ppc/ppc.h"
 #include "migration/qemu-file-types.h"
 #include "system/watchdog.h"
diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index dd337558aa6..d026abadd11 100644
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -28,7 +28,7 @@
 #include "kvm_ppc.h"
 #include "mmu-hash64.h"
 #include "exec/log.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "internal.h"
 #include "mmu-book3s-v3.h"
 #include "mmu-books.h"
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index 7a7b3810590..7063f1a905f 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -26,7 +26,7 @@
 #include "system/memory.h"
 #include "exec/page-protection.h"
 #include "exec/target_page.h"
-#include "hw/hw.h"
+#include "hw/core/hw-error.h"
 #include "hw/s390x/storage-keys.h"
 #include "hw/core/boards.h"
 
diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
index d2c566667df..50a7d95d9e7 100644
--- a/scripts/analyze-inclusions
+++ b/scripts/analyze-inclusions
@@ -46,7 +46,7 @@ grep_include() {
 }
 
 echo Found $(find . -name "*.d" | wc -l) object files
-echo $(grep_include -F 'hw/hw.h') files include hw/hw.h
+echo $(grep_include -F 'hw/core/hw-error.h') files include hw/core/hw-error.h
 echo $(grep_include 'target/[a-z0-9]*/cpu\.h') files include cpu.h
 echo $(grep_include -F 'qapi-types.h') files include qapi-types.h
 echo $(grep_include -F 'trace/generated-tracers.h') files include generated-tracers.h
@@ -85,8 +85,8 @@ analyze() {
 echo osdep.h:
 analyze ../include/qemu/osdep.h
 
-echo hw/hw.h:
-analyze -include ../include/qemu/osdep.h ../include/hw/hw.h
+echo hw/core/hw-error.h:
+analyze -include ../include/qemu/osdep.h ../include/hw/core/hw-error.h
 
 echo trace/generated-tracers.h:
 analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
@@ -94,5 +94,5 @@ analyze -include ../include/qemu/osdep.h trace/generated-tracers.h
 echo target/i386/cpu.h:
 analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../target/i386/cpu.h
 
-echo hw/hw.h + COMPILING_PER_TARGET:
-analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/hw.h
+echo hw/core/hw-error.h + COMPILING_PER_TARGET:
+analyze -DCOMPILING_PER_TARGET -I../target/i386 -Ii386-softmmu -include ../include/qemu/osdep.h ../include/hw/core/hw-error.h
-- 
2.51.1