diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 15:14:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-02 15:14:24 +0000 |
| commit | 0b17d809b08e0315430d2e2923dbe4e967ef4f63 (patch) | |
| tree | 66e1593ce3fab09c3e697cd17847ee1821f0183a /hw | |
| parent | 53761caf179013650c18d2a8285e7f0548254e78 (diff) | |
| parent | d8923bc75479cd3fdcc72b7647f4877f91950b01 (diff) | |
| download | qemu-0b17d809b08e0315430d2e2923dbe4e967ef4f63.zip qemu-0b17d809b08e0315430d2e2923dbe4e967ef4f63.tar.gz qemu-0b17d809b08e0315430d2e2923dbe4e967ef4f63.tar.bz2 | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170201' into staging
s390x fixes
- build error with old gcc versions
- race between cmma reset and rom/loader resets
- linux-user vs. cpu model
# gpg: Signature made Wed 01 Feb 2017 08:24:47 GMT
# gpg: using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20170201:
target/s390x: use "qemu" cpu model in user mode
s390x/kvm: fix small race reboot vs. cmma
s390-pci: fix compilation on older GCC versions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390x/s390-pci-bus.h | 4 | ||||
| -rw-r--r-- | hw/s390x/s390-virtio.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h index 0aad9cc..dcbf482 100644 --- a/hw/s390x/s390-pci-bus.h +++ b/hw/s390x/s390-pci-bus.h @@ -279,7 +279,7 @@ typedef struct S390PCIIOMMUTable { S390PCIIOMMU *iommu[PCI_SLOT_MAX]; } S390PCIIOMMUTable; -typedef struct S390PCIBusDevice { +struct S390PCIBusDevice { DeviceState qdev; PCIDevice *pdev; ZpciState state; @@ -301,7 +301,7 @@ typedef struct S390PCIBusDevice { IndAddr *indicator; QEMUTimer *release_timer; QTAILQ_ENTRY(S390PCIBusDevice) link; -} S390PCIBusDevice; +}; typedef struct S390PCIBus { BusState qbus; diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 0a96347..7a3a7fe 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -204,8 +204,8 @@ void s390_machine_reset(void) { S390CPU *ipl_cpu = S390_CPU(qemu_get_cpu(0)); - qemu_devices_reset(); s390_cmma_reset(); + qemu_devices_reset(); s390_crypto_reset(); /* all cpus are stopped - configure and start the ipl cpu only */ |