[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/8] s390x/pci: re-arrange variable declarations
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 1/8] s390x/pci: re-arrange variable declarations |
Date: |
Fri, 30 Sep 2016 12:47:57 +0200 |
From: Pierre Morel <address@hidden>
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 <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/s390-pci-inst.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index f069b11..80a5104 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -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;
--
2.5.5
- [Qemu-devel] [PULL 0/8] next patches for s390x/kvm, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 5/8] pc-bios/s390-ccw: enable subchannel for IPL I/O devices, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 1/8] s390x/pci: re-arrange variable declarations,
Christian Borntraeger <=
- [Qemu-devel] [PULL 8/8] s390x/kvm: fix build against qemu_uuid, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 4/8] s390x/kvm: Fix potential deadlock in sigp handling, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 3/8] s390x/pci: code cleanup, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 7/8] s390x/css: {c, h, t, r, x}sch: require enable AND device number valid, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 6/8] pc-bios/s390-ccw.img: rebuild image, Christian Borntraeger, 2016/09/30
- [Qemu-devel] [PULL 2/8] s390x/pci: assign msix io region for each pci device, Christian Borntraeger, 2016/09/30
- Re: [Qemu-devel] [PULL 0/8] next patches for s390x/kvm, Peter Maydell, 2016/09/30