From ab17b1fc75d9b961bf88a109b74069a383eba49f Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Tue, 16 Oct 2018 13:51:54 +0200 Subject: [PATCH 1/6] s390x/vfio-ap: report correct error If ioctl(..., VFIO_DEVICE_RESET) fails, we want to report errno instead of ret (which is always -1 on error). Fixes Coverity issue CID 1396176. Reported-by: Peter Maydell Reviewed-by: Christian Borntraeger Reviewed-by: Thomas Huth Reviewed-by: Tony Krowiak Signed-off-by: Cornelia Huck --- hw/vfio/ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 3962bb74e5..65de952f44 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -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)); } } From 7913938ae9c9a9f5fbf1807e51c12e0f716f8ebe Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 29 Oct 2018 16:42:22 +0100 Subject: [PATCH 2/6] MAINTAINERS: s390: more maintainers for vfio-ccw Eric and Farhan will help with maintaining vfio-ccw. Signed-off-by: Christian Borntraeger Message-Id: <1540827745-20795-2-git-send-email-borntraeger@de.ibm.com> Acked-by: Eric Farman Acked-by: Farhan Ali Signed-off-by: Cornelia Huck --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 98a1856afc..2909cd05b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1205,6 +1205,8 @@ F: include/hw/vfio/ vfio-ccw M: Cornelia Huck +M: Eric Farman +M: Farhan Ali S: Supported F: hw/vfio/ccw.c F: hw/s390x/s390-ccw.c From 68b91e85a2dfa68410e458494998fbf5c2c8744e Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 29 Oct 2018 16:42:23 +0100 Subject: [PATCH 3/6] MAINTAINERS: s390/virtio-ccw: drop Christian, add Halil Halil does all the work anyway. Signed-off-by: Christian Borntraeger Message-Id: <1540827745-20795-3-git-send-email-borntraeger@de.ibm.com> Acked-by: Halil Pasic Signed-off-by: Cornelia Huck --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2909cd05b3..5b6f4a2f3f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1263,7 +1263,7 @@ T: git git://github.com/stefanha/qemu.git block virtio-ccw M: Cornelia Huck -M: Christian Borntraeger +M: Halil Pasic S: Supported F: hw/s390x/virtio-ccw*.[hc] F: hw/s390x/vhost-vsock-ccw.c From d5bfb42578563981c934093133fc1e8824a685c8 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 29 Oct 2018 16:42:24 +0100 Subject: [PATCH 4/6] MAINTAINERS: s390/pci: add Collin Walling as maintainer for zpci Collin will take over the maintainership from Yi Min. Let us add a separate s390 pci section. Signed-off-by: Christian Borntraeger Message-Id: <1540827745-20795-4-git-send-email-borntraeger@de.ibm.com> Acked-by: Collin Walling Signed-off-by: Cornelia Huck --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5b6f4a2f3f..15709e099b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -956,6 +956,12 @@ 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 +S: Supported +F: hw/s390x/s390-pci* +L: qemu-s390x@nongnu.org + UniCore32 Machines ------------- PKUnity-3 SoC initramfs-with-busybox From 299256b9413aa5ccd41769de6dbfa1421807c99b Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 30 Oct 2018 10:37:15 +0100 Subject: [PATCH 5/6] MAINTAINERS: s390: Remove myself I haven't realistically maintained s390 related parts for quite a while now, so let's remove my name from the MAINTAINERS file to reflect reality. Signed-off-by: Alexander Graf Message-Id: <20181030093715.18793-1-agraf@suse.de> Signed-off-by: Cornelia Huck --- MAINTAINERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 15709e099b..e0e8b5fb9e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -253,7 +253,6 @@ F: disas/riscv.c S390 M: Richard Henderson -M: Alexander Graf M: David Hildenbrand S: Maintained F: target/s390x/ @@ -349,7 +348,6 @@ F: target/ppc/kvm.c S390 M: Christian Borntraeger M: Cornelia Huck -M: Alexander Graf 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 M: Christian Borntraeger -M: Alexander Graf S: Supported F: hw/char/sclp*.[hc] F: hw/char/terminal3270.c @@ -1998,7 +1995,6 @@ F: tcg/ppc/ F: disas/ppc.c S390 target -M: Alexander Graf M: Richard Henderson S: Maintained F: tcg/s390/ From 8e4eb4279fce9a736131b94b6f5f09f0503e4ab3 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Mon, 29 Oct 2018 16:42:25 +0100 Subject: [PATCH 6/6] MAINTAINERS: s390/boot: the ipl code and the bios belong together The s390-ccw bios and the ipl code do work in lock-step. Let us merge them in the maintainer file. Signed-off-by: Christian Borntraeger Message-Id: <1540827745-20795-5-git-send-email-borntraeger@de.ibm.com> Acked-by: Thomas Huth Signed-off-by: Cornelia Huck --- MAINTAINERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e0e8b5fb9e..8ec2281a7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -944,10 +944,11 @@ 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 M: Thomas Huth 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