diff options
| author | Peter Maydell | 2019-07-19 13:52:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-19 13:52:36 +0200 |
| commit | c054147ecc8598df8781241925a04f1386766dfe (patch) | |
| tree | c81a3f6381d0ce7b09930a54e1237149b070d790 | |
| parent | Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.1-rc2' i... (diff) | |
| parent | s390x/pci: add some fallthrough annotations (diff) | |
| download | qemu-c054147ecc8598df8781241925a04f1386766dfe.tar.gz qemu-c054147ecc8598df8781241925a04f1386766dfe.tar.xz qemu-c054147ecc8598df8781241925a04f1386766dfe.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190719' into staging
Add missing fallthrough annotations.
# gpg: Signature made Fri 19 Jul 2019 12:36:25 BST
# gpg: using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg: issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg: aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg: aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20190719:
s390x/pci: add some fallthrough annotations
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/s390x/s390-pci-inst.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 61f30b8e55..00235148be 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -1209,8 +1209,10 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar, * FH Enabled bit is set to one in states of ENABLED, BLOCKED or ERROR. */ case ZPCI_FS_ERROR: fib.fc |= 0x20; + /* fallthrough */ case ZPCI_FS_BLOCKED: fib.fc |= 0x40; + /* fallthrough */ case ZPCI_FS_ENABLED: fib.fc |= 0x80; if (pbdev->iommu->enabled) { |