| Message ID | 20250313034524.3069690-17-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | accel/tcg, codebase: Build once patches | expand |
On 3/12/25 20:44, Richard Henderson wrote: > Convert the existing includes with sed. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > hw/display/vga_int.h | 2 +- > include/hw/char/parallel-isa.h | 2 +- > include/hw/dma/i8257.h | 2 +- > include/hw/ide/ide-bus.h | 2 +- > include/hw/isa/isa.h | 2 +- > include/{exec => system}/ioport.h | 6 ++---- > hw/block/fdc-isa.c | 2 +- > monitor/hmp-cmds.c | 2 +- > system/ioport.c | 2 +- > system/physmem.c | 2 +- > system/qtest.c | 2 +- > target/i386/nvmm/nvmm-all.c | 2 +- > target/i386/whpx/whpx-all.c | 2 +- > tests/qtest/fuzz/qtest_wrappers.c | 2 +- > MAINTAINERS | 2 +- > 15 files changed, 16 insertions(+), 18 deletions(-) > rename include/{exec => system}/ioport.h (97%) > > diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h > index 60ad26e03e..747b5cc6cf 100644 > --- a/hw/display/vga_int.h > +++ b/hw/display/vga_int.h > @@ -26,7 +26,7 @@ > #define HW_VGA_INT_H > > #include "ui/console.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "system/memory.h" > > #include "hw/display/bochs-vbe.h" > diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h > index 5284b2ffec..3edaf9dbe4 100644 > --- a/include/hw/char/parallel-isa.h > +++ b/include/hw/char/parallel-isa.h > @@ -12,7 +12,7 @@ > > #include "parallel.h" > > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "hw/isa/isa.h" > #include "qom/object.h" > > diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h > index 4342e4a91e..33b6286d5a 100644 > --- a/include/hw/dma/i8257.h > +++ b/include/hw/dma/i8257.h > @@ -2,7 +2,7 @@ > #define HW_I8257_H > > #include "hw/isa/isa.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "qom/object.h" > > #define TYPE_I8257 "i8257" > diff --git a/include/hw/ide/ide-bus.h b/include/hw/ide/ide-bus.h > index 4841a7dcd6..121b455fcd 100644 > --- a/include/hw/ide/ide-bus.h > +++ b/include/hw/ide/ide-bus.h > @@ -1,7 +1,7 @@ > #ifndef HW_IDE_BUS_H > #define HW_IDE_BUS_H > > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "hw/ide/ide-dev.h" > #include "hw/ide/ide-dma.h" > > diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h > index 1d852011b3..a82c5f1004 100644 > --- a/include/hw/isa/isa.h > +++ b/include/hw/isa/isa.h > @@ -4,7 +4,7 @@ > /* ISA bus */ > > #include "system/memory.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "hw/qdev-core.h" > #include "qom/object.h" > > diff --git a/include/exec/ioport.h b/include/system/ioport.h > similarity index 97% > rename from include/exec/ioport.h > rename to include/system/ioport.h > index ecea3575bc..780ea5a676 100644 > --- a/include/exec/ioport.h > +++ b/include/system/ioport.h > @@ -21,8 +21,8 @@ > * IO ports API > */ > > -#ifndef IOPORT_H > -#define IOPORT_H > +#ifndef SYSTEM_IOPORT_H > +#define SYSTEM_IOPORT_H > > #include "system/memory.h" > > @@ -39,9 +39,7 @@ typedef struct MemoryRegionPortio { > > #define PORTIO_END_OF_LIST() { } > > -#ifndef CONFIG_USER_ONLY > extern const MemoryRegionOps unassigned_io_ops; > -#endif > > void cpu_outb(uint32_t addr, uint8_t val); > void cpu_outw(uint32_t addr, uint16_t val); > diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c > index a10c24aab1..561cfa47c1 100644 > --- a/hw/block/fdc-isa.c > +++ b/hw/block/fdc-isa.c > @@ -42,7 +42,7 @@ > #include "system/block-backend.h" > #include "system/blockdev.h" > #include "system/system.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "qemu/log.h" > #include "qemu/main-loop.h" > #include "qemu/module.h" > diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c > index 8ddcdd76c1..74a0f56566 100644 > --- a/monitor/hmp-cmds.c > +++ b/monitor/hmp-cmds.c > @@ -15,7 +15,7 @@ > > #include "qemu/osdep.h" > #include "system/address-spaces.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "exec/gdbstub.h" > #include "gdbstub/enums.h" > #include "monitor/hmp.h" > diff --git a/system/ioport.c b/system/ioport.c > index 2bc14bdcfa..ec5c586cf8 100644 > --- a/system/ioport.c > +++ b/system/ioport.c > @@ -27,7 +27,7 @@ > > #include "qemu/osdep.h" > #include "cpu.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "system/memory.h" > #include "system/address-spaces.h" > #include "trace.h" > diff --git a/system/physmem.c b/system/physmem.c > index be92969a4a..2850e14780 100644 > --- a/system/physmem.c > +++ b/system/physmem.c > @@ -51,7 +51,7 @@ > #include "qemu/memalign.h" > #include "qemu/memfd.h" > #include "system/memory.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "system/dma.h" > #include "system/hostmem.h" > #include "system/hw_accel.h" > diff --git a/system/qtest.c b/system/qtest.c > index 5407289154..523a047995 100644 > --- a/system/qtest.c > +++ b/system/qtest.c > @@ -16,7 +16,7 @@ > #include "system/qtest.h" > #include "system/runstate.h" > #include "chardev/char-fe.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "system/memory.h" > #include "exec/tswap.h" > #include "hw/qdev-core.h" > diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c > index 91f0e32366..17394d073d 100644 > --- a/target/i386/nvmm/nvmm-all.c > +++ b/target/i386/nvmm/nvmm-all.c > @@ -10,7 +10,7 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "system/address-spaces.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "qemu/accel.h" > #include "system/nvmm.h" > #include "system/cpus.h" > diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c > index d58cb11cee..b64852e13e 100644 > --- a/target/i386/whpx/whpx-all.c > +++ b/target/i386/whpx/whpx-all.c > @@ -11,7 +11,7 @@ > #include "qemu/osdep.h" > #include "cpu.h" > #include "system/address-spaces.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > #include "gdbstub/helpers.h" > #include "qemu/accel.h" > #include "system/whpx.h" > diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c > index 0580f8df86..d7adcbe3fd 100644 > --- a/tests/qtest/fuzz/qtest_wrappers.c > +++ b/tests/qtest/fuzz/qtest_wrappers.c > @@ -13,7 +13,7 @@ > > #include "qemu/osdep.h" > #include "hw/core/cpu.h" > -#include "exec/ioport.h" > +#include "system/ioport.h" > > #include "fuzz.h" > > diff --git a/MAINTAINERS b/MAINTAINERS > index b5f1e81771..751d611613 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3107,7 +3107,7 @@ M: Peter Xu <peterx@redhat.com> > M: David Hildenbrand <david@redhat.com> > R: Philippe Mathieu-Daudé <philmd@linaro.org> > S: Supported > -F: include/exec/ioport.h > +F: include/system/ioport.h > F: include/exec/memop.h > F: include/system/memory.h > F: include/exec/ram_addr.h Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h index 60ad26e03e..747b5cc6cf 100644 --- a/hw/display/vga_int.h +++ b/hw/display/vga_int.h @@ -26,7 +26,7 @@ #define HW_VGA_INT_H #include "ui/console.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "hw/display/bochs-vbe.h" diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h index 5284b2ffec..3edaf9dbe4 100644 --- a/include/hw/char/parallel-isa.h +++ b/include/hw/char/parallel-isa.h @@ -12,7 +12,7 @@ #include "parallel.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/isa/isa.h" #include "qom/object.h" diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h index 4342e4a91e..33b6286d5a 100644 --- a/include/hw/dma/i8257.h +++ b/include/hw/dma/i8257.h @@ -2,7 +2,7 @@ #define HW_I8257_H #include "hw/isa/isa.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qom/object.h" #define TYPE_I8257 "i8257" diff --git a/include/hw/ide/ide-bus.h b/include/hw/ide/ide-bus.h index 4841a7dcd6..121b455fcd 100644 --- a/include/hw/ide/ide-bus.h +++ b/include/hw/ide/ide-bus.h @@ -1,7 +1,7 @@ #ifndef HW_IDE_BUS_H #define HW_IDE_BUS_H -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/ide/ide-dev.h" #include "hw/ide/ide-dma.h" diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 1d852011b3..a82c5f1004 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -4,7 +4,7 @@ /* ISA bus */ #include "system/memory.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "hw/qdev-core.h" #include "qom/object.h" diff --git a/include/exec/ioport.h b/include/system/ioport.h similarity index 97% rename from include/exec/ioport.h rename to include/system/ioport.h index ecea3575bc..780ea5a676 100644 --- a/include/exec/ioport.h +++ b/include/system/ioport.h @@ -21,8 +21,8 @@ * IO ports API */ -#ifndef IOPORT_H -#define IOPORT_H +#ifndef SYSTEM_IOPORT_H +#define SYSTEM_IOPORT_H #include "system/memory.h" @@ -39,9 +39,7 @@ typedef struct MemoryRegionPortio { #define PORTIO_END_OF_LIST() { } -#ifndef CONFIG_USER_ONLY extern const MemoryRegionOps unassigned_io_ops; -#endif void cpu_outb(uint32_t addr, uint8_t val); void cpu_outw(uint32_t addr, uint16_t val); diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c index a10c24aab1..561cfa47c1 100644 --- a/hw/block/fdc-isa.c +++ b/hw/block/fdc-isa.c @@ -42,7 +42,7 @@ #include "system/block-backend.h" #include "system/blockdev.h" #include "system/system.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h" diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 8ddcdd76c1..74a0f56566 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -15,7 +15,7 @@ #include "qemu/osdep.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "exec/gdbstub.h" #include "gdbstub/enums.h" #include "monitor/hmp.h" diff --git a/system/ioport.c b/system/ioport.c index 2bc14bdcfa..ec5c586cf8 100644 --- a/system/ioport.c +++ b/system/ioport.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "cpu.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "system/address-spaces.h" #include "trace.h" diff --git a/system/physmem.c b/system/physmem.c index be92969a4a..2850e14780 100644 --- a/system/physmem.c +++ b/system/physmem.c @@ -51,7 +51,7 @@ #include "qemu/memalign.h" #include "qemu/memfd.h" #include "system/memory.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/dma.h" #include "system/hostmem.h" #include "system/hw_accel.h" diff --git a/system/qtest.c b/system/qtest.c index 5407289154..523a047995 100644 --- a/system/qtest.c +++ b/system/qtest.c @@ -16,7 +16,7 @@ #include "system/qtest.h" #include "system/runstate.h" #include "chardev/char-fe.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "system/memory.h" #include "exec/tswap.h" #include "hw/qdev-core.h" diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index 91f0e32366..17394d073d 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -10,7 +10,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "qemu/accel.h" #include "system/nvmm.h" #include "system/cpus.h" diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c index d58cb11cee..b64852e13e 100644 --- a/target/i386/whpx/whpx-all.c +++ b/target/i386/whpx/whpx-all.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "system/address-spaces.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "gdbstub/helpers.h" #include "qemu/accel.h" #include "system/whpx.h" diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c index 0580f8df86..d7adcbe3fd 100644 --- a/tests/qtest/fuzz/qtest_wrappers.c +++ b/tests/qtest/fuzz/qtest_wrappers.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include "hw/core/cpu.h" -#include "exec/ioport.h" +#include "system/ioport.h" #include "fuzz.h" diff --git a/MAINTAINERS b/MAINTAINERS index b5f1e81771..751d611613 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3107,7 +3107,7 @@ M: Peter Xu <peterx@redhat.com> M: David Hildenbrand <david@redhat.com> R: Philippe Mathieu-Daudé <philmd@linaro.org> S: Supported -F: include/exec/ioport.h +F: include/system/ioport.h F: include/exec/memop.h F: include/system/memory.h F: include/exec/ram_addr.h
Convert the existing includes with sed. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- hw/display/vga_int.h | 2 +- include/hw/char/parallel-isa.h | 2 +- include/hw/dma/i8257.h | 2 +- include/hw/ide/ide-bus.h | 2 +- include/hw/isa/isa.h | 2 +- include/{exec => system}/ioport.h | 6 ++---- hw/block/fdc-isa.c | 2 +- monitor/hmp-cmds.c | 2 +- system/ioport.c | 2 +- system/physmem.c | 2 +- system/qtest.c | 2 +- target/i386/nvmm/nvmm-all.c | 2 +- target/i386/whpx/whpx-all.c | 2 +- tests/qtest/fuzz/qtest_wrappers.c | 2 +- MAINTAINERS | 2 +- 15 files changed, 16 insertions(+), 18 deletions(-) rename include/{exec => system}/ioport.h (97%)