[Qemu-devel] [PULL for-4.1 0/1] one s390x fix/annotation

[Qemu-devel] [PULL for-4.1 0/1] one s390x fix/annotation

[Cornelia Huck]

The following changes since commit 0b18cfb8f1828c905139b54c8644b0d8f4aad879:

  Update version for v4.1.0-rc1 release (2019-07-16 18:01:28 +0100)

are available in the Git repository at:

  https://github.com/cohuck/qemu tags/s390x-20190719

for you to fetch changes up to efac5ae420ca0644db9360861a1bf02d040afd18:

  s390x/pci: add some fallthrough annotations (2019-07-18 11:29:50 +0200)

----------------------------------------------------------------
Add missing fallthrough annotations.

----------------------------------------------------------------

Cornelia Huck (1):
  s390x/pci: add some fallthrough annotations

 hw/s390x/s390-pci-inst.c | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.20.1

[Qemu-devel] [PULL for-4.1 1/1] s390x/pci: add some fallthrough annotations

[Cornelia Huck]

According to the comment, the bits are supposed to accumulate.

Reported-by: Stefan Weil <sw@weilnetz.de>
Fixes: 5d1abf234462 ("s390x/pci: enforce zPCI state checking")
Acked-by: Collin Walling <walling@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
 hw/s390x/s390-pci-inst.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 61f30b8e55d2..00235148bed7 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) {
-- 
2.20.1

Re: [Qemu-devel] [PULL for-4.1 0/1] one s390x fix/annotation

[Peter Maydell]

On Fri, 19 Jul 2019 at 12:50, Cornelia Huck <cohuck@redhat.com> wrote:
>
> The following changes since commit 0b18cfb8f1828c905139b54c8644b0d8f4aad879:
>
>   Update version for v4.1.0-rc1 release (2019-07-16 18:01:28 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/cohuck/qemu tags/s390x-20190719
>
> for you to fetch changes up to efac5ae420ca0644db9360861a1bf02d040afd18:
>
>   s390x/pci: add some fallthrough annotations (2019-07-18 11:29:50 +0200)
>
> ----------------------------------------------------------------
> Add missing fallthrough annotations.
>
> ----------------------------------------------------------------
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM