diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 11:41:47 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-13 11:41:47 +0000 |
| commit | 508ba0f7e2092d3ca56e3f75e894d52d8b94818e (patch) | |
| tree | 2c5eae84479478f72ff1df18e84be4f330783b6a /hw | |
| parent | 6b8d0ac0315f7ecfa41ebdc1467410a4d3342326 (diff) | |
| parent | fdaae351435147b9be6161d0f136ca7c40308059 (diff) | |
| download | qemu-508ba0f7e2092d3ca56e3f75e894d52d8b94818e.tar.gz | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171109' into staging
s390x changes: let pci devices start out in a usable state, and make
RISBGN work in tcg.
# gpg: Signature made Thu 09 Nov 2017 15:27:21 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# 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-20171109:
target/s390x: Finish implementing RISBGN
s390x/pci: let pci devices start in configured mode
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-pci-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index e7a58e81f7..2b1e1409bf 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -715,7 +715,7 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, pbdev->pdev = pdev; pbdev->iommu = s390_pci_get_iommu(s, pdev->bus, pdev->devfn); pbdev->iommu->pbdev = pbdev; - pbdev->state = ZPCI_FS_STANDBY; + pbdev->state = ZPCI_FS_DISABLED; if (s390_pci_msix_init(pbdev)) { error_setg(errp, "MSI-X support is mandatory " |