[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/9] s390x/pci: code cleanup
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 5/9] s390x/pci: code cleanup |
Date: |
Wed, 13 Jan 2016 16:01:40 +0100 |
From: Yi Min Zhao <address@hidden>
Make use of the new FH_ENABLED define in existing code.
Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-pci-inst.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index df57a7d..d521b2b 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -208,12 +208,12 @@ int clp_service_call(S390CPU *cpu, uint8_t r2)
switch (reqsetpci->oc) {
case CLP_SET_ENABLE_PCI_FN:
- pbdev->fh = pbdev->fh | 1 << ENABLE_BIT_OFFSET;
+ pbdev->fh = pbdev->fh | FH_ENABLED;
stl_p(&ressetpci->fh, pbdev->fh);
stw_p(&ressetpci->hdr.rsp, CLP_RC_OK);
break;
case CLP_SET_DISABLE_PCI_FN:
- pbdev->fh = pbdev->fh & ~(1 << ENABLE_BIT_OFFSET);
+ pbdev->fh = pbdev->fh & ~FH_ENABLED;
pbdev->error_state = false;
pbdev->lgstg_blocked = false;
stl_p(&ressetpci->fh, pbdev->fh);
@@ -818,7 +818,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t
fiba, uint8_t ar)
((uint32_t)pbdev->sum << 7) | pbdev->routes.adapter.summary_offset;
stl_p(&fib.data, data);
- if (pbdev->fh >> ENABLE_BIT_OFFSET) {
+ if (pbdev->fh & FH_ENABLED) {
fib.fc |= 0x80;
}
--
2.7.0
- [Qemu-devel] [PULL 0/9] First set of s390x patches for 2.6, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 8/9] virtio-ccw: fix sanity check for vector, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 2/9] s390x: remove s390-virtio machine, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 5/9] s390x/pci: code cleanup,
Cornelia Huck <=
- [Qemu-devel] [PULL 1/9] s390x: add 2.6 compat machine, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 6/9] s390x/virtio: use qemu_check_nic_model(), Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 7/9] s390: Introduce CCW_COMPAT_2_5, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 4/9] s390x/pci: reject some operations to disabled PCI function, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 9/9] s390x/pci: return real state during listing PCI, Cornelia Huck, 2016/01/13
- [Qemu-devel] [PULL 3/9] s390x: remove s390-virtio devices, Cornelia Huck, 2016/01/13
- Re: [Qemu-devel] [PULL 0/9] First set of s390x patches for 2.6, Peter Maydell, 2016/01/14