Commit 0b17d809 authored Feb 02, 2017 by Peter Maydell

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>

parents 53761caf d8923bc7

hw/s390x/s390-pci-bus.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

hw/s390x/s390-virtio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 */

linux-user/main.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -4322,6 +4322,8 @@ int main(int argc, char argv, char envp)
		# endif
		#elif defined TARGET_SH4
		cpu_model = TYPE_SH7785_CPU;
		#elif defined TARGET_S390X
		cpu_model = "qemu";
		#else
		cpu_model = "any";
		#endif