Commit bf33cc75 authored by Peter Xu's avatar Peter Xu Committed by Michael S. Tsirkin
Browse files

intel_iommu: remove X86_IOMMU_PCI_DEVFN_MAX 



We have PCI_DEVFN_MAX now.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarLiu, Yi L <yi.l.liu@intel.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c3d331d2

hw/i386/intel_iommu.c

+5 −5
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ static void vtd_reset_context_cache(IntelIOMMUState *s) 
    g_hash_table_iter_init(&bus_it, s->vtd_as_by_busptr);



    while (g_hash_table_iter_next (&bus_it, NULL, (void**)&vtd_bus)) {

        for (devfn_it = 0; devfn_it < X86_IOMMU_PCI_DEVFN_MAX; ++devfn_it) {

        for (devfn_it = 0; devfn_it < PCI_DEVFN_MAX; ++devfn_it) {

            vtd_as = vtd_bus->dev_as[devfn_it];

            if (!vtd_as) {

                continue;
@@ -1002,7 +1002,7 @@ static void vtd_switch_address_space_all(IntelIOMMUState *s) 


    g_hash_table_iter_init(&iter, s->vtd_as_by_busptr);

    while (g_hash_table_iter_next(&iter, NULL, (void **)&vtd_bus)) {

        for (i = 0; i < X86_IOMMU_PCI_DEVFN_MAX; i++) {

        for (i = 0; i < PCI_DEVFN_MAX; i++) {

            if (!vtd_bus->dev_as[i]) {

                continue;

            }
@@ -1294,7 +1294,7 @@ static void vtd_context_device_invalidate(IntelIOMMUState *s, 
    vtd_bus = vtd_find_as_from_bus_num(s, bus_n);

    if (vtd_bus) {

        devfn = VTD_SID_TO_DEVFN(source_id);

        for (devfn_it = 0; devfn_it < X86_IOMMU_PCI_DEVFN_MAX; ++devfn_it) {

        for (devfn_it = 0; devfn_it < PCI_DEVFN_MAX; ++devfn_it) {

            vtd_as = vtd_bus->dev_as[devfn_it];

            if (vtd_as && ((devfn_it & mask) == (devfn & mask))) {

                trace_vtd_inv_desc_cc_device(bus_n, VTD_PCI_SLOT(devfn_it),
@@ -2699,7 +2699,7 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s, PCIBus *bus, int devfn) 
        *new_key = (uintptr_t)bus;

        /* No corresponding free() */

        vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \

                            X86_IOMMU_PCI_DEVFN_MAX);

                            PCI_DEVFN_MAX);

        vtd_bus->bus = bus;

        g_hash_table_insert(s->vtd_as_by_busptr, new_key, vtd_bus);

    }
@@ -2982,7 +2982,7 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus, void *opaque, int devfn) 
    IntelIOMMUState *s = opaque;

    VTDAddressSpace *vtd_as;



    assert(0 <= devfn && devfn < X86_IOMMU_PCI_DEVFN_MAX);

    assert(0 <= devfn && devfn < PCI_DEVFN_MAX);



    vtd_as = vtd_find_add_as(s, bus, devfn);

    return &vtd_as->as;

include/hw/i386/x86-iommu.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#define  X86_IOMMU_GET_CLASS(obj) \

    OBJECT_GET_CLASS(X86IOMMUClass, obj, TYPE_X86_IOMMU_DEVICE)



#define X86_IOMMU_PCI_DEVFN_MAX           256

#define X86_IOMMU_SID_INVALID             (0xffff)



typedef struct X86IOMMUState X86IOMMUState;