Commit 28c78fe8 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

hw/misc/empty_slot: Name the slots when created 



Directly set the slot name when creating the device,
to display the device name in trace events.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: default avatarArtyom Tarasenko <atar4qemu@gmail.com>
Message-Id: <20200510152840.13558-8-f4bug@amsat.org>
parent 6007523a

hw/mips/malta.c

+1 −1
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ void mips_malta_init(MachineState *machine) 
     * exception when accessing invalid memory. Create an empty slot to

     * emulate this feature.

     */

    empty_slot_init(0, 0x20000000);

    empty_slot_init("GT64120", 0, 0x20000000);



    qdev_init_nofail(dev);

hw/misc/empty_slot.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static const MemoryRegionOps empty_slot_ops = { 
    .endianness = DEVICE_NATIVE_ENDIAN,

};



void empty_slot_init(hwaddr addr, uint64_t slot_size)

void empty_slot_init(const char *name, hwaddr addr, uint64_t slot_size)

{

    if (slot_size > 0) {

        /* Only empty slots larger than 0 byte need handling. */

hw/sparc/sun4m.c

+7 −3
Original line number Diff line number Diff line
@@ -884,7 +884,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, 


    /* models without ECC don't trap when missing ram is accessed */

    if (!hwdef->ecc_base) {

        empty_slot_init(machine->ram_size, hwdef->max_mem - machine->ram_size);

        empty_slot_init("ecc", machine->ram_size,

                        hwdef->max_mem - machine->ram_size);

    }



    prom_init(hwdef->slavio_base, bios_name);
@@ -915,7 +916,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, 
           Software shouldn't use aliased addresses, neither should it crash

           when does. Using empty_slot instead of aliasing can help with

           debugging such accesses */

        empty_slot_init(hwdef->iommu_pad_base,hwdef->iommu_pad_len);

        empty_slot_init("iommu.alias",

                        hwdef->iommu_pad_base, hwdef->iommu_pad_len);

    }



    sparc32_dma_init(hwdef->dma_base,
@@ -964,7 +966,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, 
    for (i = 0; i < MAX_VSIMMS; i++) {

        /* vsimm registers probed by OBP */

        if (hwdef->vsimm[i].reg_base) {

            empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000);

            char *name = g_strdup_printf("vsimm[%d]", i);

            empty_slot_init(name, hwdef->vsimm[i].reg_base, 0x2000);

            g_free(name);

        }

    }

include/hw/misc/empty_slot.h

+1 −1
Original line number Diff line number Diff line
@@ -14,6 +14,6 @@ 


#include "exec/hwaddr.h"



void empty_slot_init(hwaddr addr, uint64_t slot_size);

void empty_slot_init(const char *name, hwaddr addr, uint64_t slot_size);



#endif