Le 09/02/2021 à 20:29, Mark Cave-Ayland a écrit :
> The existing ESP QOM type currently represents a sysbus device with an
> embedded
> ESP state. Rename the type to SYSBUS_ESP accordingly.
>
> Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk>
> ---
> hw/dma/sparc32_dma.c | 4 ++--
> hw/m68k/q800.c | 4 ++--
> hw/mips/jazz.c | 4 ++--
> hw/scsi/esp.c | 8 ++++----
> hw/sparc/sun4m.c | 2 +-
> include/hw/scsi/esp.h | 4 ++--
> 6 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/hw/dma/sparc32_dma.c b/hw/dma/sparc32_dma.c
> index b643b413c5..03bc500878 100644
> --- a/hw/dma/sparc32_dma.c
> +++ b/hw/dma/sparc32_dma.c
> @@ -295,13 +295,13 @@ static void sparc32_espdma_device_init(Object *obj)
> memory_region_init_io(&s->iomem, OBJECT(s), &dma_mem_ops, s,
> "espdma-mmio", DMA_SIZE);
>
> - object_initialize_child(obj, "esp", &es->esp, TYPE_ESP);
> + object_initialize_child(obj, "esp", &es->esp, TYPE_SYSBUS_ESP);
> }
>
> static void sparc32_espdma_device_realize(DeviceState *dev, Error **errp)
> {
> ESPDMADeviceState *es = SPARC32_ESPDMA_DEVICE(dev);
> - SysBusESPState *sysbus = ESP(&es->esp);
> + SysBusESPState *sysbus = SYSBUS_ESP(&es->esp);
> ESPState *esp = &sysbus->esp;
>
> esp->dma_memory_read = espdma_memory_read;
> diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
> index 2af0e2532e..af54d509ff 100644
> --- a/hw/m68k/q800.c
> +++ b/hw/m68k/q800.c
> @@ -356,8 +356,8 @@ static void q800_init(MachineState *machine)
>
> /* SCSI */
>
> - dev = qdev_new(TYPE_ESP);
> - sysbus_esp = ESP(dev);
> + dev = qdev_new(TYPE_SYSBUS_ESP);
> + sysbus_esp = SYSBUS_ESP(dev);
> esp = &sysbus_esp->esp;
> esp->dma_memory_read = NULL;
> esp->dma_memory_write = NULL;
> diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c
> index 83c8086062..1a0888a0fd 100644
> --- a/hw/mips/jazz.c
> +++ b/hw/mips/jazz.c
> @@ -328,8 +328,8 @@ static void mips_jazz_init(MachineState *machine,
> }
>
> /* SCSI adapter */
> - dev = qdev_new(TYPE_ESP);
> - sysbus_esp = ESP(dev);
> + dev = qdev_new(TYPE_SYSBUS_ESP);
> + sysbus_esp = SYSBUS_ESP(dev);
> esp = &sysbus_esp->esp;
> esp->dma_memory_read = rc4030_dma_read;
> esp->dma_memory_write = rc4030_dma_write;
> diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
> index 7073166ad1..aa38acc660 100644
> --- a/hw/scsi/esp.c
> +++ b/hw/scsi/esp.c
> @@ -939,7 +939,7 @@ static const struct SCSIBusInfo esp_scsi_info = {
>
> static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
> {
> - SysBusESPState *sysbus = ESP(opaque);
> + SysBusESPState *sysbus = SYSBUS_ESP(opaque);
> ESPState *s = &sysbus->esp;
>
> switch (irq) {
> @@ -955,7 +955,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq,
> int level)
> static void sysbus_esp_realize(DeviceState *dev, Error **errp)
> {
> SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
> - SysBusESPState *sysbus = ESP(dev);
> + SysBusESPState *sysbus = SYSBUS_ESP(dev);
> ESPState *s = &sysbus->esp;
>
> sysbus_init_irq(sbd, &s->irq);
> @@ -977,7 +977,7 @@ static void sysbus_esp_realize(DeviceState *dev, Error
> **errp)
>
> static void sysbus_esp_hard_reset(DeviceState *dev)
> {
> - SysBusESPState *sysbus = ESP(dev);
> + SysBusESPState *sysbus = SYSBUS_ESP(dev);
> esp_hard_reset(&sysbus->esp);
> }
>
> @@ -1002,7 +1002,7 @@ static void sysbus_esp_class_init(ObjectClass *klass,
> void *data)
> }
>
> static const TypeInfo sysbus_esp_info = {
> - .name = TYPE_ESP,
> + .name = TYPE_SYSBUS_ESP,
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof(SysBusESPState),
> .class_init = sysbus_esp_class_init,
> diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
> index 38ca1e33c7..312e2afaf9 100644
> --- a/hw/sparc/sun4m.c
> +++ b/hw/sparc/sun4m.c
> @@ -334,7 +334,7 @@ static void *sparc32_dma_init(hwaddr dma_base,
> OBJECT(dma), "espdma"));
> sysbus_connect_irq(SYS_BUS_DEVICE(espdma), 0, espdma_irq);
>
> - esp = ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
> + esp = SYSBUS_ESP(object_resolve_path_component(OBJECT(espdma), "esp"));
>
> ledma = SPARC32_LEDMA_DEVICE(object_resolve_path_component(
> OBJECT(dma), "ledma"));
> diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
> index 60cc3047a5..9694825e71 100644
> --- a/include/hw/scsi/esp.h
> +++ b/include/hw/scsi/esp.h
> @@ -65,8 +65,8 @@ struct ESPState {
> void (*pdma_cb)(ESPState *s);
> };
>
> -#define TYPE_ESP "esp"
> -OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, ESP)
> +#define TYPE_SYSBUS_ESP "sysbus-esp"
> +OBJECT_DECLARE_SIMPLE_TYPE(SysBusESPState, SYSBUS_ESP)
>
> struct SysBusESPState {
> /*< private >*/
>
Reviewed-by: Laurent Vivier <laur...@vivier.eu>
