[Qemu-devel] [PULL 0/2] s390x: Fixes for 2.12

[Qemu-devel] [PULL 0/2] s390x: Fixes for 2.12

[Christian Borntraeger]

Peter,

2 fixes for 2.12. Please pull

The following changes since commit d522e0bd18364f6d784d43edab35b0563d21f6f3:

  gitmodules: Use the QEMU mirror of qemu-palcode (2018-03-22 19:24:16 +0000)

are available in the Git repository at:

  git://github.com/borntraeger/qemu.git tags/s390x-20180323

for you to fetch changes up to 06a97edac172f52971d7bdca6bb56a1edcb1b8f6:

  s390x/cpumodel: fix feature groups and breakage of MSA8 (2018-03-23 09:05:42 +0000)

----------------------------------------------------------------
s390x: Fixes for 2.12

- Fix for the s390 cpumodel
- Forbid multifunction PCI devices

----------------------------------------------------------------
Christian Borntraeger (1):
      s390x/cpumodel: fix feature groups and breakage of MSA8

Yi Min Zhao (1):
      s390x/pci: forbid multifunction pci device

 hw/s390x/s390-pci-bus.c     | 10 ++++++++++
 target/s390x/cpu_features.h |  1 +
 2 files changed, 11 insertions(+)

[Qemu-devel] [PULL 1/2] s390x/pci: forbid multifunction pci device

[Christian Borntraeger]

From: Yi Min Zhao <zyimin@linux.vnet.ibm.com>

Currently we don't support pci multifunction. If a pci with
multifucntion is plugged, the guest will spin forever. This patch fixes
this.

Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Reviewed-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390x/s390-pci-bus.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index 77a50cab36..10da87458e 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -816,6 +816,11 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,
         PCIBridge *pb = PCI_BRIDGE(dev);
         PCIDevice *pdev = PCI_DEVICE(dev);
 
+        if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
+            error_setg(errp, "multifunction not supported in s390");
+            return;
+        }
+
         pci_bridge_map_irq(pb, dev->id, s390_pci_map_irq);
         pci_setup_iommu(&pb->sec_bus, s390_pci_dma_iommu, s);
 
@@ -835,6 +840,11 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev,
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
         pdev = PCI_DEVICE(dev);
 
+        if (pdev->cap_present & QEMU_PCI_CAP_MULTIFUNCTION) {
+            error_setg(errp, "multifunction not supported in s390");
+            return;
+        }
+
         if (!dev->id) {
             /* In the case the PCI device does not define an id */
             /* we generate one based on the PCI address         */
-- 
2.14.3

[Qemu-devel] [PULL 2/2] s390x/cpumodel: fix feature groups and breakage of MSA8

[Christian Borntraeger]

Since commit 46a99c9f73c7 ("s390x/cpumodel: model PTFF subfunctions
for Multiple-epoch facility") -cpu help no longer shows the MSA8
feature group. Turns out that we forgot to add the new MEPOCH_PTFF
group enum.

Fixes: 46a99c9f73c7 ("s390x/cpumodel: model PTFF subfunctions for Multiple-epoch facility")
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 target/s390x/cpu_features.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index e306aa7ab2..968b12fdfe 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -78,6 +78,7 @@ typedef enum {
     S390_FEAT_GROUP_MSA_EXT_6,
     S390_FEAT_GROUP_MSA_EXT_7,
     S390_FEAT_GROUP_MSA_EXT_8,
+    S390_FEAT_GROUP_MULTIPLE_EPOCH_PTFF,
     S390_FEAT_GROUP_MAX,
 } S390FeatGroup;
 
-- 
2.14.3

Re: [Qemu-devel] [PULL 0/2] s390x: Fixes for 2.12

[Peter Maydell]

On 23 March 2018 at 09:14, Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> Peter,
>
> 2 fixes for 2.12. Please pull
>
> The following changes since commit d522e0bd18364f6d784d43edab35b0563d21f6f3:
>
>   gitmodules: Use the QEMU mirror of qemu-palcode (2018-03-22 19:24:16 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/borntraeger/qemu.git tags/s390x-20180323
>
> for you to fetch changes up to 06a97edac172f52971d7bdca6bb56a1edcb1b8f6:
>
>   s390x/cpumodel: fix feature groups and breakage of MSA8 (2018-03-23 09:05:42 +0000)
>
> ----------------------------------------------------------------
> s390x: Fixes for 2.12
>
> - Fix for the s390 cpumodel
> - Forbid multifunction PCI devices
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM