Commit 205e5de4 authored by Pierre Morel's avatar Pierre Morel Committed by Christian Borntraeger
Browse files

s390x/pci: re-arrange variable declarations 



Pull mr variable declarations at the top of the functions instead of
mixing them up with the code. This is in preparation for followup
patches.

Signed-off-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 25930ed6

hw/s390x/s390-pci-inst.c

+4 −2
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
    S390PCIBusDevice *pbdev;

    uint64_t offset;

    uint64_t data;

    MemoryRegion *mr;

    uint8_t len;

    uint32_t fh;

    uint8_t pcias;
@@ -363,7 +364,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
            program_interrupt(env, PGM_OPERAND, 4);

            return 0;

        }

        MemoryRegion *mr = pbdev->pdev->io_regions[pcias].memory;

        mr = pbdev->pdev->io_regions[pcias].memory;

        memory_region_dispatch_read(mr, offset, &data, len,

                                    MEMTXATTRS_UNSPECIFIED);

    } else if (pcias == 15) {
@@ -442,6 +443,7 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
    CPUS390XState *env = &cpu->env;

    uint64_t offset, data;

    S390PCIBusDevice *pbdev;

    MemoryRegion *mr;

    uint8_t len;

    uint32_t fh;

    uint8_t pcias;
@@ -491,7 +493,7 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2) 
            program_interrupt(env, PGM_OPERAND, 4);

            return 0;

        }

        MemoryRegion *mr;



        if (trap_msix(pbdev, offset, pcias)) {

            offset = offset - pbdev->msix.table_offset;

            mr = &pbdev->pdev->msix_table_mmio;