[Qemu-commits] [qemu/qemu] 205e5d: s390x/pci: re-arrange variable declarations

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 205e5de4251f4c18e1f17f2e7aaa42ff92c3e05f
      
https://github.com/qemu/qemu/commit/205e5de4251f4c18e1f17f2e7aaa42ff92c3e05f
  Author: Pierre Morel <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/s390x/s390-pci-inst.c

  Log Message:
  -----------
  s390x/pci: re-arrange variable declarations

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>


  Commit: 8f95595072c3d91645c21d27cd02dd0b8d920f77
      
https://github.com/qemu/qemu/commit/8f95595072c3d91645c21d27cd02dd0b8d920f77
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h

  Log Message:
  -----------
  s390x/pci: assign msix io region for each pci device

For efficiency we now assign one msix io region for each pci device
and provide it with the pointer to the zPCI device as opaque
parameter. In addition, we remove msix address space and add msix io
region as a subregion to the root memory region of pci device.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Pierre Morel <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: bfcec59a23f42dcac18a434bd48bd60d6fc0e563
      
https://github.com/qemu/qemu/commit/bfcec59a23f42dcac18a434bd48bd60d6fc0e563
  Author: Yi Min Zhao <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/s390x/s390-pci-bus.c

  Log Message:
  -----------
  s390x/pci: code cleanup

Now that each S390 PCI device uses an IO region as MSIX region. The
code in s390_translate_iommu() will never be triggered. Let's remove
it.

Signed-off-by: Yi Min Zhao <address@hidden>
Reviewed-by: Pierre Morel <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: f9530c32420fff941b7bc8bb5d90310eecab5a96
      
https://github.com/qemu/qemu/commit/f9530c32420fff941b7bc8bb5d90310eecab5a96
  Author: Christian Borntraeger <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Fix potential deadlock in sigp handling

If two VCPUs exit at the same time and target each other
with a sigp, both could run into a deadlock as run_on_cpu
on CPU0 will free the BQL when starting the CPU1 target routine.
CPU1 will run its sigp initiater for CPU0 before handling
the run_on_cpu requests, thus resulting in a dead lock.

As all qemu SIGPs are slow path anway we can use a big sigp
lock and allow only one SIGP for the guest at a time. We will
return condition code 2 (BUSY) on contention to the guest.

Reported-by: Paolo Bonzini <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 9c9f5f311a4b391c2dba57cf06b63d62b790e891
      
https://github.com/qemu/qemu/commit/9c9f5f311a4b391c2dba57cf06b63d62b790e891
  Author: Dong Jia Shi <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M pc-bios/s390-ccw/virtio.c

  Log Message:
  -----------
  pc-bios/s390-ccw: enable subchannel for IPL I/O devices

IPL should cause the IPL I/O device to become enabled. So when handling
the IPL program, we should set the E (Enable) bit. However, virtio-ccw
does not know whether it's dealing with an IPL device or not. Since
trying to perform I/O on a disabled device doesn't make any sense,
let's just always enable it. At the same time we can remove the
SCSW_FCTL_START_FUNC flag as it is ignored for msch anyway and did
not enable the device as intended.

Reported-by: Farhan Ali <address@hidden>
Signed-off-by: Dong Jia Shi <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Sascha Silbe <address@hidden>
Signed-off-by: Halil Pasic <address@hidden>
[remove superfluous flag]
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 6b5ffb14b78f8bb4835d0cd8e3d2826720acfa43
      
https://github.com/qemu/qemu/commit/6b5ffb14b78f8bb4835d0cd8e3d2826720acfa43
  Author: Christian Borntraeger <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M pc-bios/s390-ccw.img

  Log Message:
  -----------
  pc-bios/s390-ccw.img: rebuild image

Contains:
- pc-bios/s390-ccw: enable subchannel for IPL I/O devices

Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: c679e74d2e29fa08ede9121d59aee4e9675611d7
      
https://github.com/qemu/qemu/commit/c679e74d2e29fa08ede9121d59aee4e9675611d7
  Author: Sascha Silbe <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: {c,h,t,r,x}sch: require enable AND device number valid

According to the PoP, subchannels are only considered operational if
they are enabled _and_ the device number is valid. With the current
checks being enabled _or_ having a valid device number was
sufficient. This caused qemu to allow IO on subchannels that were not
enabled.

Fix the checks to require both bits to be set.

Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 794afd7096f1ef3ea632b5cf75998562a2f8029a
      
https://github.com/qemu/qemu/commit/794afd7096f1ef3ea632b5cf75998562a2f8029a
  Author: Christian Borntraeger <address@hidden>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: fix build against qemu_uuid

commit 9c5ce8db2e5c ("vl: Switch qemu_uuid to QemuUUID") changed most
users of qemu_uuid but not all. Fix a build error on s390/kvm.

Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: c5d128ffeb5357df1ea3e6de0c13b3d6a09f6064
      
https://github.com/qemu/qemu/commit/c5d128ffeb5357df1ea3e6de0c13b3d6a09f6064
  Author: Peter Maydell <address@hidden>
  Date:   2016-09-30 (Fri, 30 Sep 2016)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/virtio.c
    M target-s390x/kvm.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20160927' into 
staging

Couple of s390x patches:
- some PCI cleanups
- fix build error due to uuid rework
- fix potential deadlock in sigp handling
- enable ccw devices in BIOS and enforce checking in QEMU

# gpg: Signature made Wed 28 Sep 2016 12:27:03 BST
# gpg:                using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <address@hidden>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20160927:
  s390x/kvm: fix build against qemu_uuid
  s390x/css: {c,h,t,r,x}sch: require enable AND device number valid
  pc-bios/s390-ccw.img: rebuild image
  pc-bios/s390-ccw: enable subchannel for IPL I/O devices
  s390x/kvm: Fix potential deadlock in sigp handling
  s390x/pci: code cleanup
  s390x/pci: assign msix io region for each pci device
  s390x/pci: re-arrange variable declarations

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/c69e3cef21ff...c5d128ffeb53