motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 08:43:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390x/pci: re-arrange variable declarations

Browse source 
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: Pierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
Pierre Morel 2016-08-24 12:46:34 +02:00 • committed by Christian Borntraeger
parent 25930ed60a
commit 205e5de425
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hw/s390x/s390-pci-inst.c
View file

@ -315,6 +315,7 @@ int pcilg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)
S390PCIBusDevice *pbdev; S390PCIBusDevice *pbdev;
uint64_t offset; uint64_t offset;
uint64_t data; uint64_t data;
MemoryRegion *mr;
uint8_t len; uint8_t len;
uint32_t fh; uint32_t fh;
uint8_t pcias; 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); program_interrupt(env, PGM_OPERAND, 4);
return 0; 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, memory_region_dispatch_read(mr, offset, &data, len,
MEMTXATTRS_UNSPECIFIED); MEMTXATTRS_UNSPECIFIED);
} else if (pcias == 15) { } else if (pcias == 15) {
@ -442,6 +443,7 @@ int pcistg_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2)
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
uint64_t offset, data; uint64_t offset, data;
S390PCIBusDevice *pbdev; S390PCIBusDevice *pbdev;
MemoryRegion *mr;
uint8_t len; uint8_t len;
uint32_t fh; uint32_t fh;
uint8_t pcias; 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); program_interrupt(env, PGM_OPERAND, 4);
return 0; return 0;
} }
MemoryRegion *mr;
if (trap_msix(pbdev, offset, pcias)) { if (trap_msix(pbdev, offset, pcias)) {
offset = offset - pbdev->msix.table_offset; offset = offset - pbdev->msix.table_offset;
mr = &pbdev->pdev->msix_table_mmio; mr = &pbdev->pdev->msix_table_mmio;