include: move hw/registerfields.h to hw/core/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 41b536c3a2a48ab68e081c57045b54c72c4c614a..e0904cc0cc7089263a5058a0237c26ed753e75f0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3560,7 +3560,7 @@ M: Alistair Francis <alistair@alistair23.me>
 S: Maintained
 F: hw/core/register.c
 F: include/hw/register.h
-F: include/hw/registerfields.h
+F: include/hw/core/registerfields.h
 
 Rust
 M: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>

diff --git a/docs/devel/style.rst b/docs/devel/style.rst
index 941fe14bfd49bb1284724554f37d85419049fc86..12e509d10de0b8c044c8429aaaee8855bde1deb5 100644 (file)
--- a/docs/devel/style.rst
+++ b/docs/devel/style.rst
@@ -433,7 +433,7 @@ We also suggest avoiding bitfields even in structures where the exact
 layout does not matter, unless you can show that they provide a significant
 usability benefit.
 
-We encourage the usage of ``include/hw/registerfields.h`` as a safe replacement
+We encourage the usage of ``include/hw/core/registerfields.h`` as a safe replacement
 for bitfields.
 
 Reserved namespaces in C and POSIX

diff --git a/hw/adc/npcm7xx_adc.c b/hw/adc/npcm7xx_adc.c
index 44079791cbd2326bed0da833b8e6cfaee1c586e8..3584c27c75a4fa6e23ea23f501e5133202c78c30 100644 (file)
--- a/hw/adc/npcm7xx_adc.c
+++ b/hw/adc/npcm7xx_adc.c
@@ -18,7 +18,7 @@
 #include "hw/adc/npcm7xx_adc.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index 42ceb097ae896ab86fe8caef63f6d5261eeaa942..b6fc95df3b60d2903a0f9eb5d4bf79f57f780a30 100644 (file)
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -18,7 +18,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/arm/armsse.h"
 #include "hw/arm/armsse-version.h"
 #include "hw/arm/boot.h"

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 637525a7e3fbf1fba41b9479a2a658f01dfdf8e7..1276bb4df407f75d81f86118808122ea9206b5fc 100644 (file)
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -20,7 +20,7 @@
 #include "hw/arm/bcm2836.h"
 #include "hw/arm/bcm2838.h"
 #include "hw/arm/raspi_platform.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/error-report.h"
 #include "hw/core/boards.h"
 #include "hw/core/loader.h"

diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index ead28500c73d914aa33439edc1472c8cc77ea982..3eeb8f447e630b3f4dc183c54822d6df75b54985 100644 (file)
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -14,7 +14,7 @@
 #include "hw/arm/machines-qom.h"
 #include "hw/arm/raspi_platform.h"
 #include "hw/display/bcm2835_fb.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/error-report.h"
 #include "system/device_tree.h"
 #include "hw/core/boards.h"

diff --git a/hw/arm/smmuv3-internal.h b/hw/arm/smmuv3-internal.h
index b6b7399347f22c290d8cb9c7f9cf0e62b057ad52..d15031f2651c49341c98d6ea4c2f5e93a4790dec 100644 (file)
--- a/hw/arm/smmuv3-internal.h
+++ b/hw/arm/smmuv3-internal.h
@@ -21,7 +21,7 @@
 #ifndef HW_ARM_SMMUV3_INTERNAL_H
 #define HW_ARM_SMMUV3_INTERNAL_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/arm/smmu-common.h"
 
 typedef enum SMMUTranslationStatus {

diff --git a/hw/char/cmsdk-apb-uart.c b/hw/char/cmsdk-apb-uart.c
index c3645a553ec6ae467b489b7f1f72450191780c00..1a83e4a9bd142a0aadb3b354a2a9a8aafa533e2d 100644 (file)
--- a/hw/char/cmsdk-apb-uart.c
+++ b/hw/char/cmsdk-apb-uart.c
@@ -22,7 +22,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "chardev/char-fe.h"
 #include "chardev/char-serial.h"
 #include "hw/char/cmsdk-apb-uart.h"

diff --git a/hw/char/ibex_uart.c b/hw/char/ibex_uart.c
index 3166f6d3094f4401d59a1dcd239c7d8f18dfac32..127d219df3c5507311fa71246ea17305e61ee1e9 100644 (file)
--- a/hw/char/ibex_uart.c
+++ b/hw/char/ibex_uart.c
@@ -31,7 +31,7 @@
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/char/renesas_sci.c b/hw/char/renesas_sci.c
index f1c5d5ae6b36b3a26b03fc703c0309c0edea15fe..dc2810a9b11af093b301929639c0da888f3420eb 100644 (file)
--- a/hw/char/renesas_sci.c
+++ b/hw/char/renesas_sci.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
 #include "hw/char/renesas_sci.h"

diff --git a/hw/char/stm32l4x5_usart.c b/hw/char/stm32l4x5_usart.c
index 664d03d6b961ec3546e3d216342d4f3c673e1239..736f1e764e609a2de8129bd66819937e807f1e7c 100644 (file)
--- a/hw/char/stm32l4x5_usart.c
+++ b/hw/char/stm32l4x5_usart.c
@@ -28,7 +28,7 @@
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "trace.h"
 
 

diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c
index 85a5acd708742bc335c189af4364e66f3a383d9e..d9237d4360f00f328db6387fc9647f1bdbbb19c8 100644 (file)
--- a/hw/gpio/aspeed_gpio.c
+++ b/hw/gpio/aspeed_gpio.c
@@ -16,7 +16,7 @@
 #include "hw/core/irq.h"
 #include "migration/vmstate.h"
 #include "trace.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #define GPIOS_PER_GROUP 8
 

diff --git a/hw/i2c/arm_sbcon_i2c.c b/hw/i2c/arm_sbcon_i2c.c
index 979ccbe0ed67f963d38237e5712f11cda2d09aed..688f45c31395f282498035bc7035eb360812ca17 100644 (file)
--- a/hw/i2c/arm_sbcon_i2c.c
+++ b/hw/i2c/arm_sbcon_i2c.c
@@ -24,7 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/i2c/arm_sbcon_i2c.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
 #include "qom/object.h"

diff --git a/hw/i2c/aspeed_i2c.c b/hw/i2c/aspeed_i2c.c
index e3ca77865bdcc3b684a430e4fdfefa6a38e4820f..1f9ce131bf70555785649e6df2a03686654dbf58 100644 (file)
--- a/hw/i2c/aspeed_i2c.c
+++ b/hw/i2c/aspeed_i2c.c
@@ -29,7 +29,7 @@
 #include "hw/i2c/aspeed_i2c.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "trace.h"
 
 /* Enable SLAVE_ADDR_RX_MATCH always */

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index d92305b9ca101b2399250526fed2fc73896d144d..f14c340b602fa3b0b7aa05b4cd54466da60be15c 100644 (file)
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -11,7 +11,7 @@
 #include "hw/core/irq.h"
 #include "qemu/log.h"
 #include "trace.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qapi/error.h"
 
 /*

diff --git a/hw/intc/gic_internal.h b/hw/intc/gic_internal.h
index 8ddbf554c69924ea087ddaca7d3d937816c4604c..b821f1feb3bdc2fddbc9b8ece30729ece7e1166a 100644 (file)
--- a/hw/intc/gic_internal.h
+++ b/hw/intc/gic_internal.h
@@ -21,7 +21,7 @@
 #ifndef QEMU_ARM_GIC_INTERNAL_H
 #define QEMU_ARM_GIC_INTERNAL_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/intc/arm_gic.h"
 
 #define ALL_CPU_MASK ((unsigned)(((1 << GIC_NCPU) - 1)))

diff --git a/hw/intc/gicv3_internal.h b/hw/intc/gicv3_internal.h
index fc586524f56081aeb958559669926d74f88edde4..880dbe52d864ba0b1d2d188e7879e2d0fd8cab71 100644 (file)
--- a/hw/intc/gicv3_internal.h
+++ b/hw/intc/gicv3_internal.h
@@ -24,7 +24,7 @@
 #ifndef QEMU_ARM_GICV3_INTERNAL_H
 #define QEMU_ARM_GICV3_INTERNAL_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/intc/arm_gicv3_common.h"
 
 /* Distributor registers, as offsets from the distributor base address */

diff --git a/hw/intc/rx_icu.c b/hw/intc/rx_icu.c
index 788afe6b1a09430bd5de3641011ebb2e6330cbd7..87cdc6cbdef0a5ce3358f12e185a69ce25ac089d 100644 (file)
--- a/hw/intc/rx_icu.c
+++ b/hw/intc/rx_icu.c
@@ -27,7 +27,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/intc/rx_icu.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/armsse-cpu-pwrctrl.c b/hw/misc/armsse-cpu-pwrctrl.c
index 66e9218f277f0720b743a24e889b6cd870fad7ff..87770facfced32e55a77ee13555a95594d944b96 100644 (file)
--- a/hw/misc/armsse-cpu-pwrctrl.c
+++ b/hw/misc/armsse-cpu-pwrctrl.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "migration/vmstate.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/armsse-cpu-pwrctrl.h"
 
 REG32(CPUPWRCFG, 0x0)

diff --git a/hw/misc/armsse-cpuid.c b/hw/misc/armsse-cpuid.c
index 3a52bb5381f2a40e03cfdf14e790bf1a3396ef82..038331255143d3ba71b44726bc8c0a3849820fdb 100644 (file)
--- a/hw/misc/armsse-cpuid.c
+++ b/hw/misc/armsse-cpuid.c
@@ -24,7 +24,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/armsse-cpuid.h"
 #include "hw/core/qdev-properties.h"
 

diff --git a/hw/misc/armsse-mhu.c b/hw/misc/armsse-mhu.c
index 2673c2de3ef6f63cbea0189f225ad2f9559294e8..6fbe2cca37e2de03a8574ea44c01a249e74eef83 100644 (file)
--- a/hw/misc/armsse-mhu.c
+++ b/hw/misc/armsse-mhu.c
@@ -22,7 +22,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/armsse-mhu.h"
 

diff --git a/hw/misc/aspeed_i3c.c b/hw/misc/aspeed_i3c.c
index 37a05b9ce2771503a48358c68453e13070f804a7..ac6db214ee26eaa142da86e88511f4e06393b34b 100644 (file)
--- a/hw/misc/aspeed_i3c.c
+++ b/hw/misc/aspeed_i3c.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "qemu/error-report.h"
 #include "hw/misc/aspeed_i3c.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "migration/vmstate.h"

diff --git a/hw/misc/aspeed_peci.c b/hw/misc/aspeed_peci.c
index cf902a8ab8c1b1ad3b1c8eff05d75b7f3474665f..0569ee57d1fa1ba9706fab75e20314801f624685 100644 (file)
--- a/hw/misc/aspeed_peci.c
+++ b/hw/misc/aspeed_peci.c
@@ -11,7 +11,7 @@
 #include "qemu/log.h"
 #include "hw/core/irq.h"
 #include "hw/misc/aspeed_peci.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "trace.h"
 
 #define ASPEED_PECI_CC_RSP_SUCCESS (0x40U)

diff --git a/hw/misc/bcm2835_thermal.c b/hw/misc/bcm2835_thermal.c
index 33bfc91c7aa09ab2ee49092c9b72c747d51c5051..0dc1be15b4ae7c94b083b7abea2c9423ca4e8715 100644 (file)
--- a/hw/misc/bcm2835_thermal.c
+++ b/hw/misc/bcm2835_thermal.c
@@ -10,7 +10,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/misc/bcm2835_thermal.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 
 REG32(CTL, 0)

diff --git a/hw/misc/imx6ul_ccm.c b/hw/misc/imx6ul_ccm.c
index 7f3ae61710cb3938a13a6bc5d5e6d6b4545ba6f4..c4f6e372fe1c82b065f8deb9a1ed17ead34c9ebf 100644 (file)
--- a/hw/misc/imx6ul_ccm.c
+++ b/hw/misc/imx6ul_ccm.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "hw/misc/imx6ul_ccm.h"
 #include "qemu/log.h"

diff --git a/hw/misc/imx7_src.c b/hw/misc/imx7_src.c
index df0b0a6905779458b7eb9bd046afbb01f752b6df..77f13bd020b7392f062e77ad902990ca068ada1c 100644 (file)
--- a/hw/misc/imx7_src.c
+++ b/hw/misc/imx7_src.c
@@ -17,7 +17,7 @@
 #include "qemu/module.h"
 #include "target/arm/arm-powerctl.h"
 #include "hw/core/cpu.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #include "trace.h"
 

diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c
index 64e94a764799e2a870057fbf531774a2a0fbe481..832b02177746500d94c2c1b335b2f4f00ad41ee1 100644 (file)
--- a/hw/misc/iotkit-secctl.c
+++ b/hw/misc/iotkit-secctl.c
@@ -16,7 +16,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/iotkit-secctl.h"
 #include "hw/arm/armsse-version.h"

diff --git a/hw/misc/iotkit-sysctl.c b/hw/misc/iotkit-sysctl.c
index a9c3568c216df307ae591d61f96bdb368febcec0..d673ae326bcb1b2058ec508902d2a03cac5ffac7 100644 (file)
--- a/hw/misc/iotkit-sysctl.c
+++ b/hw/misc/iotkit-sysctl.c
@@ -25,7 +25,7 @@
 #include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/iotkit-sysctl.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/armsse-version.h"

diff --git a/hw/misc/iotkit-sysinfo.c b/hw/misc/iotkit-sysinfo.c
index a53b1f51802336996b373ee92657c5b4278f2d08..3b4d228e3ef850128047b329e481a89ff40cab14 100644 (file)
--- a/hw/misc/iotkit-sysinfo.c
+++ b/hw/misc/iotkit-sysinfo.c
@@ -23,7 +23,7 @@
 #include "trace.h"
 #include "qapi/error.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/iotkit-sysinfo.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/arm/armsse-version.h"

diff --git a/hw/misc/mps2-fpgaio.c b/hw/misc/mps2-fpgaio.c
index f3d51fd22862372dda20945645c28e6d48393faf..9cd5e9884c086dfe5afe501dc49113a1c574e082 100644 (file)
--- a/hw/misc/mps2-fpgaio.c
+++ b/hw/misc/mps2-fpgaio.c
@@ -22,7 +22,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/mps2-fpgaio.h"
 #include "hw/misc/led.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 56aa01350729312f86df4d8025eb935ddfb1015d..06d436cf58e1f8152b934d285befe32871a30b57 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -25,7 +25,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/mps2-scc.h"
 #include "hw/misc/led.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/npcm7xx_mft.c b/hw/misc/npcm7xx_mft.c
index 21e74385c716f7174dfba5f0b4bf55b891709cd8..742166c4e8282e0c6bf8a82339df27d3d7881bb3 100644 (file)
--- a/hw/misc/npcm7xx_mft.c
+++ b/hw/misc/npcm7xx_mft.c
@@ -20,7 +20,7 @@
 #include "hw/core/qdev-properties.h"
 #include "hw/misc/npcm7xx_mft.h"
 #include "hw/misc/npcm7xx_pwm.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"

diff --git a/hw/misc/npcm7xx_pwm.c b/hw/misc/npcm7xx_pwm.c
index 1b010e51ec0e39d047d21aa839c5d4020ee3e69f..3ee34820c8a6893e5c370938e4de88d0e266046f 100644 (file)
--- a/hw/misc/npcm7xx_pwm.c
+++ b/hw/misc/npcm7xx_pwm.c
@@ -19,7 +19,7 @@
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/misc/npcm7xx_pwm.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/bitops.h"
 #include "qemu/error-report.h"

diff --git a/hw/misc/sifive_e_aon.c b/hw/misc/sifive_e_aon.c
index 4d6e015ca383fda681802fffaa9e55604641ec39..0e82ae3758b7c5cc6058242911d1be6b7955f971 100644 (file)
--- a/hw/misc/sifive_e_aon.c
+++ b/hw/misc/sifive_e_aon.c
@@ -20,7 +20,7 @@
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/sifive_e_aon.h"
 #include "qapi/visitor.h"
 #include "qapi/error.h"

diff --git a/hw/misc/stm32l4x5_rcc.c b/hw/misc/stm32l4x5_rcc.c
index cf7fa28cbe99e06fdbce7205761b18694b522de8..85095871340e0bdb4bf4592d76716c4495418b03 100644 (file)
--- a/hw/misc/stm32l4x5_rcc.c
+++ b/hw/misc/stm32l4x5_rcc.c
@@ -28,7 +28,7 @@
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/core/qdev-properties-system.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "trace.h"
 
 #define HSE_DEFAULT_FRQ 48000000ULL

diff --git a/hw/misc/tz-mpc.c b/hw/misc/tz-mpc.c
index fb5d232bff530e7c45d16145d745082c3681b270..65517d390d376546f686af110b421413d84d498a 100644 (file)
--- a/hw/misc/tz-mpc.c
+++ b/hw/misc/tz-mpc.c
@@ -16,7 +16,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-mpc.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/tz-msc.c b/hw/misc/tz-msc.c
index 3e33455d421b5024c13abf9942f397e8984dfc95..dd845193d64fd342e23af38125a46cd7503f1389 100644 (file)
--- a/hw/misc/tz-msc.c
+++ b/hw/misc/tz-msc.c
@@ -16,7 +16,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-msc.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/tz-ppc.c b/hw/misc/tz-ppc.c
index a41c6011fbadc6c2aee14c6e98e9aab5d7350588..7b812a034b20afb8aff32a56c7a53be04d158170 100644 (file)
--- a/hw/misc/tz-ppc.c
+++ b/hw/misc/tz-ppc.c
@@ -16,7 +16,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "migration/vmstate.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/misc/tz-ppc.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/misc/xlnx-versal-cframe-reg.c b/hw/misc/xlnx-versal-cframe-reg.c
index 33a4ece26f6cf2907ff2f5653103d16f6fb27fe9..a5a5e41f3e3d98b30964061cae201f6f7ed0e5ef 100644 (file)
--- a/hw/misc/xlnx-versal-cframe-reg.c
+++ b/hw/misc/xlnx-versal-cframe-reg.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/register.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
 #include "qemu/units.h"

diff --git a/hw/misc/zynq_slcr.c b/hw/misc/zynq_slcr.c
index d1900a2b9485ce1f593ab31830cf9b6b0d434740..d7d490b093d0a5a08b4ee7bf6f1f1d209483ab9a 100644 (file)
--- a/hw/misc/zynq_slcr.c
+++ b/hw/misc/zynq_slcr.c
@@ -21,7 +21,7 @@
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "qom/object.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index fe9747fdb6f7884d1cf0076a590b98bbef6b0ad2..b568fa3392d3954f705707ef75429ea40debf277 100644 (file)
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -28,7 +28,7 @@
 #include "hw/core/irq.h"
 #include "hw/net/cadence_gem.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/net/msf2-emac.c b/hw/net/msf2-emac.c
index ac01d1ce472c1277b70f6c1b7c40732e9a664e6e..077485c95d9b51adc10c83a641c1e24103f43982 100644 (file)
--- a/hw/net/msf2-emac.c
+++ b/hw/net/msf2-emac.c
@@ -31,7 +31,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qapi/error.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/net/msf2-emac.h"
 #include "hw/net/mii.h"
 #include "hw/core/irq.h"

diff --git a/hw/net/npcm_gmac.c b/hw/net/npcm_gmac.c
index 5e32cd3edf3faf007f49dc715a24db8595fe9c43..123fb92ca40838e3c63abdc9099069ed1e1c7f6b 100644 (file)
--- a/hw/net/npcm_gmac.c
+++ b/hw/net/npcm_gmac.c
@@ -23,7 +23,7 @@
 
 #include "qemu/osdep.h"
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/net/mii.h"
 #include "hw/net/npcm_gmac.h"
 #include "migration/vmstate.h"

diff --git a/hw/net/npcm_pcs.c b/hw/net/npcm_pcs.c
index 6aec105271a94388070e1d8e5d99b6a5fd020ed9..ae078e14c385ec725720c4edde857b4f68f255e5 100644 (file)
--- a/hw/net/npcm_pcs.c
+++ b/hw/net/npcm_pcs.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 
 #include "exec/hwaddr.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/net/npcm_pcs.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"

diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index e3bf3b0e726eb70340398cefe85d36f96e273e5b..d6f57bc004aa1d79050ddc7e1c4b40c59d698e14 100644 (file)
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -13,7 +13,7 @@
 #include "net/net.h"
 #include "hw/core/irq.h"
 #include "hw/net/smc91c111.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "qapi/error.h"
 #include "qemu/log.h"

diff --git a/hw/pci-host/aspeed_pcie.c b/hw/pci-host/aspeed_pcie.c
index 27f1078e3a504cf7998ec4286a13686936b73911..83a1c7075c398ee1af97b53ada98e9192cd9e7a4 100644 (file)
--- a/hw/pci-host/aspeed_pcie.c
+++ b/hw/pci-host/aspeed_pcie.c
@@ -18,7 +18,7 @@
 #include "qemu/log.h"
 #include "qapi/error.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/irq.h"
 #include "hw/pci/pci_host.h"
 #include "hw/pci/pcie_port.h"

diff --git a/hw/pci-host/bonito.c b/hw/pci-host/bonito.c
index 90040045c1f461aefaa0edd69cff770b10c0fefd..ff2f5c966eb936e71245a9225ec8a4848b0570e0 100644 (file)
--- a/hw/pci-host/bonito.c
+++ b/hw/pci-host/bonito.c
@@ -50,7 +50,7 @@
 #include "migration/vmstate.h"
 #include "system/runstate.h"
 #include "hw/misc/unimp.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qom/object.h"
 #include "trace.h"
 

diff --git a/hw/pci-host/gt64120.c b/hw/pci-host/gt64120.c
index 2339f10a30ae93e46b436d100ae5794e9a279ee5..d361c457edbbaf84b63a86cd9126d6f46ebd0cab 100644 (file)
--- a/hw/pci-host/gt64120.c
+++ b/hw/pci-host/gt64120.c
@@ -30,7 +30,7 @@
 #include "qemu/log.h"
 #include "qemu/bswap.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_host.h"
 #include "hw/misc/empty_slot.h"

diff --git a/hw/rtc/ls7a_rtc.c b/hw/rtc/ls7a_rtc.c
index 234a7e9769804768c0f00566872f8e14339d2c93..54943f60b8099d8c4d748de27faf816fd66577d3 100644 (file)
--- a/hw/rtc/ls7a_rtc.c
+++ b/hw/rtc/ls7a_rtc.c
@@ -16,7 +16,7 @@
 #include "migration/vmstate.h"
 #include "hw/misc/unimp.h"
 #include "system/rtc.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #define SYS_TOYTRIM        0x20
 #define SYS_TOYWRITE0      0x24

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 5aa34f1d5bdccb704f171afe7724ecac67dc6341..5a1fda38a7b263b600576e0a500c1ab11ed5b88d 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -36,7 +36,7 @@
 #include "qemu/units.h"
 #include "qemu/cutils.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "system/block-backend.h"
 #include "hw/sd/sd.h"
 #include "migration/vmstate.h"

diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h
index 9f768c418e08e6ca6cc26cf0078baaac724084a2..3e81821dd1e8f298f2dd8981af68f7f8b52fb8a3 100644 (file)
--- a/hw/sd/sdhci-internal.h
+++ b/hw/sd/sdhci-internal.h
@@ -24,7 +24,7 @@
 #ifndef SDHCI_INTERNAL_H
 #define SDHCI_INTERNAL_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 /* R/W SDMA System Address register 0x0 */
 #define SDHC_SYSAD                     0x00

diff --git a/hw/sensor/tmp105.c b/hw/sensor/tmp105.c
index 4e5c968bcc744ec8c8875391e2b483e493b7fbd2..c5089d74f4bf54b0534adf8e464b6473bf724339 100644 (file)
--- a/hw/sensor/tmp105.c
+++ b/hw/sensor/tmp105.c
@@ -26,7 +26,7 @@
 #include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qemu/module.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "trace.h"
 
 FIELD(CONFIG, SHUTDOWN_MODE,        0, 1)

diff --git a/hw/ssi/ibex_spi_host.c b/hw/ssi/ibex_spi_host.c
index 50cf08de9c948c7aff8ca2869a15447bdf5fbe71..1e574c3fcb8cb58bc85dd1198ef2d3ff3de8afa3 100644 (file)
--- a/hw/ssi/ibex_spi_host.c
+++ b/hw/ssi/ibex_spi_host.c
@@ -26,7 +26,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "qemu/module.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/ssi/ibex_spi_host.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/ssi/npcm_pspi.c b/hw/ssi/npcm_pspi.c
index 1f11e1f8a46ac0d2fdba706409bc8820306458fe..2e05d5dacb28b67e40a235a0b8080c34321ace13 100644 (file)
--- a/hw/ssi/npcm_pspi.c
+++ b/hw/ssi/npcm_pspi.c
@@ -17,7 +17,7 @@
 #include "qemu/osdep.h"
 
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/ssi/npcm_pspi.h"
 #include "migration/vmstate.h"
 #include "qapi/error.h"

diff --git a/hw/timer/bcm2835_systmr.c b/hw/timer/bcm2835_systmr.c
index 7929aaa882aaa50f08c1ff9ec27cc08502d90189..00bcfcd05c6859eb606b4aecd8060cd3f0cc64b4 100644 (file)
--- a/hw/timer/bcm2835_systmr.c
+++ b/hw/timer/bcm2835_systmr.c
@@ -16,7 +16,7 @@
 #include "qemu/log.h"
 #include "qemu/timer.h"
 #include "hw/timer/bcm2835_systmr.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "trace.h"
 

diff --git a/hw/timer/cmsdk-apb-dualtimer.c b/hw/timer/cmsdk-apb-dualtimer.c
index bcb6f8e43d7ebb7955dbd371b547b2ae3d4a2b82..39b1fa3a149e8e0fe51212139dd8860fbdba6590 100644 (file)
--- a/hw/timer/cmsdk-apb-dualtimer.c
+++ b/hw/timer/cmsdk-apb-dualtimer.c
@@ -24,7 +24,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-dualtimer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index d80bf1f96d0540fb0e72592717bcb17cf81cc3ce..e8b6601097c703e2c7cc241e9e0cc8b366c7b3ad 100644 (file)
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -34,7 +34,7 @@
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/timer/cmsdk-apb-timer.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/renesas_cmt.c b/hw/timer/renesas_cmt.c
index 35962e66c32dc7e189090c41b6e2d32283d59ccf..a5cc7ebd270af01d59bb1db776256ab02f129310 100644 (file)
--- a/hw/timer/renesas_cmt.c
+++ b/hw/timer/renesas_cmt.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/timer/renesas_cmt.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/renesas_tmr.c b/hw/timer/renesas_tmr.c
index 2e7d7d4543a612cbd88a46b74ca0acd7e2bfa0aa..c917f70de225a4f6125bd7fba5fa10ef08c3da4b 100644 (file)
--- a/hw/timer/renesas_tmr.c
+++ b/hw/timer/renesas_tmr.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qemu/log.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "hw/timer/renesas_tmr.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c
index 8fda5445e74b09141b18709058c779ce1632c003..780eaa50799f3bee60c6ef72005d146dba450e3b 100644 (file)
--- a/hw/timer/sifive_pwm.c
+++ b/hw/timer/sifive_pwm.c
@@ -29,7 +29,7 @@
 #include "hw/core/irq.h"
 #include "hw/timer/sifive_pwm.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "migration/vmstate.h"
 #include "qemu/log.h"
 #include "qemu/module.h"

diff --git a/hw/timer/sse-counter.c b/hw/timer/sse-counter.c
index de9d354483bc5d4140f0cc6760f61fa332357b13..39d140347e5d12796b92985630c7028e9db88e2d 100644 (file)
--- a/hw/timer/sse-counter.c
+++ b/hw/timer/sse-counter.c
@@ -33,7 +33,7 @@
 #include "trace.h"
 #include "hw/timer/sse-counter.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
 #include "migration/vmstate.h"

diff --git a/hw/timer/sse-timer.c b/hw/timer/sse-timer.c
index 50d1de580557efd8a5f431a34349280ea084e05f..62381e07e065cccdb3a731512b9d855d93921904 100644 (file)
--- a/hw/timer/sse-timer.c
+++ b/hw/timer/sse-timer.c
@@ -42,7 +42,7 @@
 #include "hw/timer/sse-counter.h"
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/clock.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/core/qdev-properties.h"

diff --git a/hw/watchdog/allwinner-wdt.c b/hw/watchdog/allwinner-wdt.c
index 8fcd7766752a963b54b8d73abdf5e14340e1e3ea..68b600689a535e269aa2aa4d44d79ce974dc0911 100644 (file)
--- a/hw/watchdog/allwinner-wdt.c
+++ b/hw/watchdog/allwinner-wdt.c
@@ -26,7 +26,7 @@
 #include "qemu/module.h"
 #include "trace.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/watchdog/allwinner-wdt.h"
 #include "system/watchdog.h"
 #include "migration/vmstate.h"

diff --git a/hw/watchdog/cmsdk-apb-watchdog.c b/hw/watchdog/cmsdk-apb-watchdog.c
index 90d14e342b03042eb769e98aa76c020475b0a98f..ceae792580e9e5df8319de1e0f93c8fcd70dcb2a 100644 (file)
--- a/hw/watchdog/cmsdk-apb-watchdog.c
+++ b/hw/watchdog/cmsdk-apb-watchdog.c
@@ -29,7 +29,7 @@
 #include "hw/sysbus.h"
 #include "hw/core/irq.h"
 #include "hw/core/qdev-properties.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-clock.h"
 #include "hw/watchdog/cmsdk-apb-watchdog.h"
 #include "migration/vmstate.h"

diff --git a/include/block/nvme.h b/include/block/nvme.h
index 8640dfa8269fd7a80ea817b2593f1e85243c257b..9d7159ed7a7a405059aa00298a050fdf0c8c08c0 100644 (file)
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -1,7 +1,7 @@
 #ifndef BLOCK_NVME_H
 #define BLOCK_NVME_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 typedef struct QEMU_PACKED NvmeBar {
     uint64_t    cap;

diff --git a/include/block/ufs.h b/include/block/ufs.h
index a3ee62b027a506778f26a008f2bf0d978e14eea7..ede4aff08ea4dba631e83340b4bf08c97479e683 100644 (file)
--- a/include/block/ufs.h
+++ b/include/block/ufs.h
@@ -3,7 +3,7 @@
 #ifndef BLOCK_UFS_H
 #define BLOCK_UFS_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 typedef struct QEMU_PACKED UfsReg {
     uint32_t cap;

diff --git a/include/fpu/softfloat-types.h b/include/fpu/softfloat-types.h
index 1af2a0cb14bc20a1696531a31067cf0a44ab9975..8f82fdfc9752058256c0d64bbad0e14703d62b90 100644 (file)
--- a/include/fpu/softfloat-types.h
+++ b/include/fpu/softfloat-types.h
@@ -80,7 +80,7 @@ this code that are retained.
 #ifndef SOFTFLOAT_TYPES_H
 #define SOFTFLOAT_TYPES_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 /*
  * Software IEC/IEEE floating-point types.

diff --git a/include/hw/acpi/tpm.h b/include/hw/acpi/tpm.h
index 9d0fe6f2f96b6694c2f6b2889696f22aa2fad409..d2bf6637c5424b92ad99f5baa938fd6cea3520bf 100644 (file)
--- a/include/hw/acpi/tpm.h
+++ b/include/hw/acpi/tpm.h
@@ -17,7 +17,7 @@
 #define HW_ACPI_TPM_H
 
 #include "qemu/units.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/acpi/aml-build.h"
 #include "system/tpm.h"
 

diff --git a/include/hw/char/nrf51_uart.h b/include/hw/char/nrf51_uart.h
index 03d8c2a20d2cb8ec2148a5029701df759dc05160..7a54db746bde5798dbd8699f84f15728f820ee29 100644 (file)
--- a/include/hw/char/nrf51_uart.h
+++ b/include/hw/char/nrf51_uart.h
@@ -13,7 +13,7 @@
 
 #include "hw/sysbus.h"
 #include "chardev/char-fe.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qom/object.h"
 
 #define UART_FIFO_LENGTH 6

diff --git a/include/hw/registerfields.h b/include/hw/core/registerfields.h
similarity index 100%
rename from include/hw/registerfields.h
rename to include/hw/core/registerfields.h

diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
index 2daacc10ce0ec5b810260bc6b87648125cf718f4..c9c2620a8a336358ed805fb47eb7b23d4f1bbb37 100644 (file)
--- a/include/hw/i2c/aspeed_i2c.h
+++ b/include/hw/i2c/aspeed_i2c.h
@@ -22,7 +22,7 @@
 
 #include "hw/i2c/i2c.h"
 #include "hw/sysbus.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qom/object.h"
 
 #define TYPE_ASPEED_I2C "aspeed.i2c"

diff --git a/include/hw/misc/bcm2835_cprman_internals.h b/include/hw/misc/bcm2835_cprman_internals.h
index 7617aff96fdebaaf794b25307791e2be0ec0fe98..de75139cfddca8ed6784de0036cf0bb2b896039f 100644 (file)
--- a/include/hw/misc/bcm2835_cprman_internals.h
+++ b/include/hw/misc/bcm2835_cprman_internals.h
@@ -9,7 +9,7 @@
 #ifndef HW_MISC_BCM2835_CPRMAN_INTERNALS_H
 #define HW_MISC_BCM2835_CPRMAN_INTERNALS_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/bcm2835_cprman.h"
 
 #define TYPE_CPRMAN_PLL "bcm2835-cprman-pll"

diff --git a/include/hw/misc/stm32l4x5_rcc_internals.h b/include/hw/misc/stm32l4x5_rcc_internals.h
index ff1c834f694e95315081ef132a6b85cf134bec6c..1e044604c8709885baa454bb81cda3007cc37506 100644 (file)
--- a/include/hw/misc/stm32l4x5_rcc_internals.h
+++ b/include/hw/misc/stm32l4x5_rcc_internals.h
@@ -18,7 +18,7 @@
 #ifndef HW_STM32L4X5_RCC_INTERNALS_H
 #define HW_STM32L4X5_RCC_INTERNALS_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/stm32l4x5_rcc.h"
 
 #define TYPE_RCC_CLOCK_MUX "stm32l4x5-rcc-clock-mux"

diff --git a/include/hw/register.h b/include/hw/register.h
index b3d20fee7d3189fccec89a92806d2a65366ef509..1f265f4ed71e5a5f3179d26e4cd17c44689a03a8 100644 (file)
--- a/include/hw/register.h
+++ b/include/hw/register.h
@@ -13,7 +13,7 @@
 
 #include "hw/core/qdev.h"
 #include "system/memory.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qom/object.h"
 
 typedef struct RegisterInfo RegisterInfo;

diff --git a/target/arm/cpregs.h b/target/arm/cpregs.h
index 48a406a5fbcf8968b943df29570462c3eae2b913..f5ec7484c1dfbe3497e13a5f1f91e842953b7025 100644 (file)
--- a/target/arm/cpregs.h
+++ b/target/arm/cpregs.h
@@ -21,7 +21,7 @@
 #ifndef TARGET_ARM_CPREGS_H
 #define TARGET_ARM_CPREGS_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "exec/memop.h"
 #include "target/arm/kvm-consts.h"
 #include "cpu.h"

diff --git a/target/arm/cpu-features.h b/target/arm/cpu-features.h
index 579fa8f8f427cca3a6d898b20a395e1e54493e3b..c86a4e667dc46c29b6ac8e10b8ceb9c9f9a325e3 100644 (file)
--- a/target/arm/cpu-features.h
+++ b/target/arm/cpu-features.h
@@ -20,7 +20,7 @@
 #ifndef TARGET_ARM_FEATURES_H
 #define TARGET_ARM_FEATURES_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/host-utils.h"
 #include "cpu.h"
 #include "cpu-sysregs.h"

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 39f2b2e54deb2e44be5685d060458634723c8e2b..9579d43ba338700d09a1e1e87ab4e36a46416c37 100644 (file)
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -22,7 +22,7 @@
 
 #include "kvm-consts.h"
 #include "qemu/cpu-float.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "cpu-qom.h"
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"

diff --git a/target/arm/internals.h b/target/arm/internals.h
index 75677945af3cf025f59b23955b19d92f7ec9e76c..9cd4bf74efb96fb65d5d18bed6ee0b0d90463c48 100644 (file)
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -29,7 +29,7 @@
 #include "exec/vaddr.h"
 #include "exec/breakpoint.h"
 #include "accel/tcg/tb-cpu-state.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "tcg/tcg-gvec-desc.h"
 #include "system/memory.h"
 #include "syndrome.h"

diff --git a/target/arm/mmuidx-internal.h b/target/arm/mmuidx-internal.h
index 962b0538526e12b6ffedca5bd0fb51a79340f80e..776e31c9ba53157b8f083d8774cfb3e539091df3 100644 (file)
--- a/target/arm/mmuidx-internal.h
+++ b/target/arm/mmuidx-internal.h
@@ -8,7 +8,7 @@
 
 #include "mmuidx.h"
 #include "tcg/debug-assert.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 
 FIELD(MMUIDXINFO, EL, 0, 2)

diff --git a/target/hexagon/cpu.h b/target/hexagon/cpu.h
index 43a854f5172269bef18def19122b2ed6a7312362..656b7dc04498ee28ab1164248be268c8d6c8829f 100644 (file)
--- a/target/hexagon/cpu.h
+++ b/target/hexagon/cpu.h
@@ -25,7 +25,7 @@
 #include "exec/cpu-defs.h"
 #include "hex_regs.h"
 #include "mmvec/mmvec.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #ifndef CONFIG_USER_ONLY
 #error "Hexagon does not support system emulation"

diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h
index c652ef945ac4fd89c91ce5aaaa138367fc307e2a..012e54f8f6fa65c95a3926bf76cd56249939a134 100644 (file)
--- a/target/hppa/cpu.h
+++ b/target/hppa/cpu.h
@@ -27,7 +27,7 @@
 #include "system/memory.h"
 #include "qemu/cpu-float.h"
 #include "qemu/interval-tree.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #define MMU_KERNEL_IDX    0
 #define MMU_KERNEL_P_IDX  1

diff --git a/target/loongarch/cpu-csr.h b/target/loongarch/cpu-csr.h
index 689894749876943d46ca06efe91a23f73a396192..77555929264242e700f71f537c1e4dc1040f444f 100644 (file)
--- a/target/loongarch/cpu-csr.h
+++ b/target/loongarch/cpu-csr.h
@@ -8,7 +8,7 @@
 #ifndef LOONGARCH_CPU_CSR_H
 #define LOONGARCH_CPU_CSR_H
 
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 /* Based on kernel definitions: arch/loongarch/include/asm/loongarch.h */
 

diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index 1a14469b3bc1ef0f11c58399e76f38e59dc6a1c1..92af68ea7f8a5613f787908f40cf9d7b4058d7d8 100644 (file)
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -13,7 +13,7 @@
 #include "exec/cpu-defs.h"
 #include "exec/cpu-interrupt.h"
 #include "fpu/softfloat-types.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "qemu/timer.h"
 #ifndef CONFIG_USER_ONLY
 #include "system/memory.h"

diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 787020f6f90cbf2a14c2f822c9e148b4ea23002a..dbebae89dce5886e8166c1be38bb8b5550f7b96d 100644 (file)
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -27,7 +27,7 @@
 #include "exec/cpu-interrupt.h"
 #include "cpu-qom.h"
 #include "qom/object.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 
 #define CPU_RESOLVING_TYPE TYPE_POWERPC_CPU
 

diff --git a/target/ppc/internal.h b/target/ppc/internal.h
index 7723350227fb4cd5f14c9c8ccdaf61d948163c59..58f315ffcf5de1bc67e02f4d8a33442b885028aa 100644 (file)
--- a/target/ppc/internal.h
+++ b/target/ppc/internal.h
@@ -19,7 +19,7 @@
 #define PPC_INTERNAL_H
 
 #include "exec/breakpoint.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "exec/page-protection.h"
 #include "accel/tcg/tb-cpu-state.h"
 

diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h
index b54cd78f8f7162a92d22c0a51d77bd88ad9bea16..90b3e951053a6e334afe0dd6eaf4aeff0f88b1a4 100644 (file)
--- a/target/riscv/cpu.h
+++ b/target/riscv/cpu.h
@@ -21,7 +21,7 @@
 #define RISCV_CPU_H
 
 #include "hw/core/cpu.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/core/qdev-properties.h"
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"

diff --git a/target/riscv/internals.h b/target/riscv/internals.h
index 172296f12e27ab577d2b350d3223e568a1cd476b..35b923c4bf56e4eaa95fa67d361d8ec3216417d0 100644 (file)
--- a/target/riscv/internals.h
+++ b/target/riscv/internals.h
@@ -20,7 +20,7 @@
 #define RISCV_CPU_INTERNALS_H
 
 #include "exec/cpu-common.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "fpu/softfloat-types.h"
 #include "target/riscv/cpu_bits.h"
 

diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internals.h
index 8eee7e5c31c3426b077dad235a63195a7020dfed..5681b818153d37576023fead2cbc25e522920705 100644 (file)
--- a/target/riscv/vector_internals.h
+++ b/target/riscv/vector_internals.h
@@ -20,7 +20,7 @@
 #define TARGET_RISCV_VECTOR_INTERNALS_H
 
 #include "qemu/bitops.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "cpu.h"
 #include "tcg/tcg-gvec-desc.h"
 #include "internals.h"

diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index ba5761b647281580fa25488ace8693d7455591b1..b3b1ecff5af4794c23d249c82a0b4ad60fbf07c8 100644 (file)
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -20,7 +20,7 @@
 #define RX_CPU_H
 
 #include "qemu/bitops.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "cpu-qom.h"
 
 #include "exec/cpu-common.h"

diff --git a/target/tricore/cpu.h b/target/tricore/cpu.h
index 82085fbc32fd8d86e22d99dbf86e3e59567f250a..ab46192e26195ed99e75708d5637de9d38c2757e 100644 (file)
--- a/target/tricore/cpu.h
+++ b/target/tricore/cpu.h
@@ -21,7 +21,7 @@
 #define TRICORE_CPU_H
 
 #include "cpu-qom.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "exec/cpu-common.h"
 #include "exec/cpu-defs.h"
 #include "qemu/cpu-float.h"

diff --git a/target/tricore/helper.c b/target/tricore/helper.c
index 7574111c87df86491e489312cac3cab15f1bcedc..7ee8c7fd6990953d43a7167e01ea7ea9656118f6 100644 (file)
--- a/target/tricore/helper.c
+++ b/target/tricore/helper.c
@@ -17,7 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "cpu.h"
 #include "exec/cputlb.h"
 #include "accel/tcg/cpu-mmu-index.h"

diff --git a/tests/qtest/sdhci-test.c b/tests/qtest/sdhci-test.c
index 6275e7626c215638d7647bb2088f59b93a908c3c..7b32711c8f8d9c2d35271cf47f88a8d25fabdd96 100644 (file)
--- a/tests/qtest/sdhci-test.c
+++ b/tests/qtest/sdhci-test.c
@@ -9,7 +9,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "libqtest.h"
 #include "qemu/module.h"
 #include "libqos/pci-pc.h"

diff --git a/tests/qtest/sifive-e-aon-watchdog-test.c b/tests/qtest/sifive-e-aon-watchdog-test.c
index 1f313d16ad82d876b8b4ddd1aee7c6ca7b40f145..277f1b8360b4480fe95d87b790ec9ca9cfa77a72 100644 (file)
--- a/tests/qtest/sifive-e-aon-watchdog-test.c
+++ b/tests/qtest/sifive-e-aon-watchdog-test.c
@@ -20,7 +20,7 @@
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "libqtest.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "hw/misc/sifive_e_aon.h"
 
 FIELD(AON_WDT_WDOGCFG, SCALE, 0, 4)

diff --git a/tests/qtest/stm32l4x5_rcc-test.c b/tests/qtest/stm32l4x5_rcc-test.c
index d927c655d138b4117657b148644b316db1f0b771..4ab0a0ab29f30fe86b9f1efab07806b485247e6a 100644 (file)
--- a/tests/qtest/stm32l4x5_rcc-test.c
+++ b/tests/qtest/stm32l4x5_rcc-test.c
@@ -11,7 +11,7 @@
  */
 
 #include "qemu/osdep.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "libqtest-single.h"
 #include "hw/misc/stm32l4x5_rcc_internals.h"
 

diff --git a/tests/qtest/stm32l4x5_usart-test.c b/tests/qtest/stm32l4x5_usart-test.c
index 98a7472307fe55699ebe82016a99bd75694717c5..a72c5a685d146b39fb4aa94b63426c12796aa458 100644 (file)
--- a/tests/qtest/stm32l4x5_usart-test.c
+++ b/tests/qtest/stm32l4x5_usart-test.c
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "libqtest.h"
 #include "hw/misc/stm32l4x5_rcc_internals.h"
-#include "hw/registerfields.h"
+#include "hw/core/registerfields.h"
 #include "stm32l4x5.h"
 
 #define RCC_BASE_ADDR 0x40021000