Commit 03c1ca1c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20181105' into staging 



- some changes in s390x maintainership
- bugfix in vfio-ap

# gpg: Signature made Mon 05 Nov 2018 16:34:03 GMT
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20181105:
  MAINTAINERS: s390/boot: the ipl code and the bios belong together
  MAINTAINERS: s390: Remove myself
  MAINTAINERS: s390/pci: add Collin Walling as maintainer for zpci
  MAINTAINERS: s390/virtio-ccw: drop Christian, add Halil
  MAINTAINERS: s390: more maintainers for vfio-ccw
  s390x/vfio-ap: report correct error

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3cb99f41 8e4eb427

MAINTAINERS

+11 −6
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ F: disas/riscv.c 


S390

M: Richard Henderson <rth@twiddle.net>

M: Alexander Graf <agraf@suse.de>

M: David Hildenbrand <david@redhat.com>

S: Maintained

F: target/s390x/
@@ -349,7 +348,6 @@ F: target/ppc/kvm.c 
S390

M: Christian Borntraeger <borntraeger@de.ibm.com>

M: Cornelia Huck <cohuck@redhat.com>

M: Alexander Graf <agraf@suse.de>

S: Maintained

F: target/s390x/kvm.c

F: target/s390x/kvm_s390x.h
@@ -934,7 +932,6 @@ S390 Machines 
S390 Virtio-ccw

M: Cornelia Huck <cohuck@redhat.com>

M: Christian Borntraeger <borntraeger@de.ibm.com>

M: Alexander Graf <agraf@suse.de>

S: Supported

F: hw/char/sclp*.[hc]

F: hw/char/terminal3270.c
@@ -947,15 +944,22 @@ T: git git://github.com/cohuck/qemu.git s390-next 
T: git git://github.com/borntraeger/qemu.git s390-next

L: qemu-s390x@nongnu.org



S390-ccw Bios

S390-ccw boot

M: Christian Borntraeger <borntraeger@de.ibm.com>

M: Thomas Huth <thuth@redhat.com>

S: Supported

F: hw/s390x/ipl.*

F: pc-bios/s390-ccw/

F: pc-bios/s390-ccw.img

T: git git://github.com/borntraeger/qemu.git s390-next

L: qemu-s390x@nongnu.org



S390 PCI

M: Collin Walling <walling@linux.ibm.com>

S: Supported

F: hw/s390x/s390-pci*

L: qemu-s390x@nongnu.org



UniCore32 Machines

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

PKUnity-3 SoC initramfs-with-busybox
@@ -1205,6 +1209,8 @@ F: include/hw/vfio/ 


vfio-ccw

M: Cornelia Huck <cohuck@redhat.com>

M: Eric Farman <farman@linux.ibm.com>

M: Farhan Ali <alifm@linux.ibm.com>

S: Supported

F: hw/vfio/ccw.c

F: hw/s390x/s390-ccw.c
@@ -1261,7 +1267,7 @@ T: git git://github.com/stefanha/qemu.git block 


virtio-ccw

M: Cornelia Huck <cohuck@redhat.com>

M: Christian Borntraeger <borntraeger@de.ibm.com>

M: Halil Pasic <pasic@linux.ibm.com>

S: Supported

F: hw/s390x/virtio-ccw*.[hc]

F: hw/s390x/vhost-vsock-ccw.c
@@ -1990,7 +1996,6 @@ F: tcg/ppc/ 
F: disas/ppc.c



S390 target

M: Alexander Graf <agraf@suse.de>

M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: tcg/s390/

hw/vfio/ap.c

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static void vfio_ap_reset(DeviceState *dev) 
    ret = ioctl(vapdev->vdev.fd, VFIO_DEVICE_RESET);

    if (ret) {

        error_report("%s: failed to reset %s device: %s", __func__,

                     vapdev->vdev.name, strerror(ret));

                     vapdev->vdev.name, strerror(errno));

    }

}