Commit 6ce9297b authored by Eric Auger's avatar Eric Auger Committed by Peter Maydell
Browse files

hw/arm/smmu-common: Fix the name of the iommu memory regions 



At the point smmu_find_add_as() gets called, the bus number might
not be computed. Let's change the name of IOMMU memory region and
just use the devfn and an incrementing index.

The name only is used for debug.

Signed-off-by: default avatarEric Auger <eric.auger@redhat.com>
Message-id: 20180921070138.10114-2-eric.auger@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
[PMM: changed 'uint' to 'unsigned int']
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bb626e5b

hw/arm/smmu-common.c

+3 −3
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn) 
    SMMUState *s = opaque;

    SMMUPciBus *sbus = g_hash_table_lookup(s->smmu_pcibus_by_busptr, bus);

    SMMUDevice *sdev;

    static unsigned int index;



    if (!sbus) {

        sbus = g_malloc0(sizeof(SMMUPciBus) +
@@ -321,9 +322,8 @@ static AddressSpace *smmu_find_add_as(PCIBus *bus, void *opaque, int devfn) 


    sdev = sbus->pbdev[devfn];

    if (!sdev) {

        char *name = g_strdup_printf("%s-%d-%d",

                                     s->mrtypename,

                                     pci_bus_num(bus), devfn);

        char *name = g_strdup_printf("%s-%d-%d", s->mrtypename, devfn, index++);



        sdev = sbus->pbdev[devfn] = g_new0(SMMUDevice, 1);



        sdev->smmu = s;