| Message ID | 20211119171202.458919-5-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | hw/display: QOM'ify vga_mmio_init() as TYPE_VGA_MMIO | expand |
On Fri, 19 Nov 2021, Philippe Mathieu-Daudé wrote: > vga_mmio_init() is used only one time and not very helpful, > inline and remove it. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > include/hw/display/vga.h | 6 ------ > hw/display/vga-mmio.c | 20 -------------------- > hw/mips/jazz.c | 9 ++++++++- > 3 files changed, 8 insertions(+), 27 deletions(-) > > diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h > index 03c65a14218..451e4c9898c 100644 > --- a/include/hw/display/vga.h > +++ b/include/hw/display/vga.h > @@ -9,8 +9,6 @@ > #ifndef QEMU_HW_DISPLAY_VGA_H > #define QEMU_HW_DISPLAY_VGA_H > > -#include "exec/hwaddr.h" > - > /* > * modules can reference this symbol to avoid being loaded > * into system emulators without vga support > @@ -24,8 +22,4 @@ enum vga_retrace_method { > > extern enum vga_retrace_method vga_retrace_method; > > -int vga_mmio_init(hwaddr vram_base, > - hwaddr ctrl_base, int it_shift, > - MemoryRegion *address_space); > - > #endif > diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c > index d1c5f31c134..af9229794c9 100644 > --- a/hw/display/vga-mmio.c > +++ b/hw/display/vga-mmio.c > @@ -25,7 +25,6 @@ > > #include "qemu/osdep.h" > #include "qapi/error.h" > -#include "hw/display/vga.h" > #include "hw/sysbus.h" > #include "hw/qdev-properties.h" > #include "vga_int.h" > @@ -87,25 +86,6 @@ static void vga_mmio_reset(DeviceState *dev) > vga_common_reset(s); > } > > -int vga_mmio_init(hwaddr vram_base, > - hwaddr ctrl_base, int it_shift, > - MemoryRegion *address_space) > -{ > - DeviceState *dev; > - SysBusDevice *s; > - > - dev = qdev_new(TYPE_VGA_MMIO); > - qdev_prop_set_uint8(dev, "it_shift", it_shift); > - s = SYS_BUS_DEVICE(dev); > - sysbus_realize_and_unref(s, &error_fatal); > - > - sysbus_mmio_map(s, 0, ctrl_base); > - sysbus_mmio_map(s, 1, vram_base + 0x000a0000); > - sysbus_mmio_map(s, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); > - > - return 0; > -} > - > static void vga_mmio_realizefn(DeviceState *dev, Error **errp) > { > VGAMmioState *s = VGA_MMIO(dev); > diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c > index 8f345afd137..bd9815c773e 100644 > --- a/hw/mips/jazz.c > +++ b/hw/mips/jazz.c > @@ -43,6 +43,7 @@ > #include "hw/rtc/mc146818rtc.h" > #include "hw/timer/i8254.h" > #include "hw/display/vga.h" > +#include "hw/display/bochs-vbe.h" > #include "hw/audio/pcspk.h" > #include "hw/input/i8042.h" > #include "hw/sysbus.h" > @@ -274,7 +275,13 @@ static void mips_jazz_init(MachineState *machine, > } > break; > case JAZZ_PICA61: > - vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); > + dev = qdev_new("vga-mmio"); Does it worth moving TYPE_VGA_MMIO to vga.h so you could use it here? Other than that: Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> > + qdev_prop_set_uint8(dev, "it_shift", 0); > + sysbus = SYS_BUS_DEVICE(dev); > + sysbus_realize_and_unref(sysbus, &error_fatal); > + sysbus_mmio_map(sysbus, 0, 0x60000000); > + sysbus_mmio_map(sysbus, 1, 0x400a0000); > + sysbus_mmio_map(sysbus, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); > break; > default: > break; >
diff --git a/include/hw/display/vga.h b/include/hw/display/vga.h index 03c65a14218..451e4c9898c 100644 --- a/include/hw/display/vga.h +++ b/include/hw/display/vga.h @@ -9,8 +9,6 @@ #ifndef QEMU_HW_DISPLAY_VGA_H #define QEMU_HW_DISPLAY_VGA_H -#include "exec/hwaddr.h" - /* * modules can reference this symbol to avoid being loaded * into system emulators without vga support @@ -24,8 +22,4 @@ enum vga_retrace_method { extern enum vga_retrace_method vga_retrace_method; -int vga_mmio_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space); - #endif diff --git a/hw/display/vga-mmio.c b/hw/display/vga-mmio.c index d1c5f31c134..af9229794c9 100644 --- a/hw/display/vga-mmio.c +++ b/hw/display/vga-mmio.c @@ -25,7 +25,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "hw/display/vga.h" #include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "vga_int.h" @@ -87,25 +86,6 @@ static void vga_mmio_reset(DeviceState *dev) vga_common_reset(s); } -int vga_mmio_init(hwaddr vram_base, - hwaddr ctrl_base, int it_shift, - MemoryRegion *address_space) -{ - DeviceState *dev; - SysBusDevice *s; - - dev = qdev_new(TYPE_VGA_MMIO); - qdev_prop_set_uint8(dev, "it_shift", it_shift); - s = SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - - sysbus_mmio_map(s, 0, ctrl_base); - sysbus_mmio_map(s, 1, vram_base + 0x000a0000); - sysbus_mmio_map(s, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); - - return 0; -} - static void vga_mmio_realizefn(DeviceState *dev, Error **errp) { VGAMmioState *s = VGA_MMIO(dev); diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index 8f345afd137..bd9815c773e 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -43,6 +43,7 @@ #include "hw/rtc/mc146818rtc.h" #include "hw/timer/i8254.h" #include "hw/display/vga.h" +#include "hw/display/bochs-vbe.h" #include "hw/audio/pcspk.h" #include "hw/input/i8042.h" #include "hw/sysbus.h" @@ -274,7 +275,13 @@ static void mips_jazz_init(MachineState *machine, } break; case JAZZ_PICA61: - vga_mmio_init(0x40000000, 0x60000000, 0, get_system_memory()); + dev = qdev_new("vga-mmio"); + qdev_prop_set_uint8(dev, "it_shift", 0); + sysbus = SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(sysbus, &error_fatal); + sysbus_mmio_map(sysbus, 0, 0x60000000); + sysbus_mmio_map(sysbus, 1, 0x400a0000); + sysbus_mmio_map(sysbus, 2, VBE_DISPI_LFB_PHYSICAL_ADDRESS); break; default: break;
vga_mmio_init() is used only one time and not very helpful, inline and remove it. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/display/vga.h | 6 ------ hw/display/vga-mmio.c | 20 -------------------- hw/mips/jazz.c | 9 ++++++++- 3 files changed, 8 insertions(+), 27 deletions(-)