All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PULL 0/3] s390x fixes
@ 2017-02-01  9:04 Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 1/3] s390-pci: fix compilation on older GCC versions Christian Borntraeger
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Christian Borntraeger @ 2017-02-01  9:04 UTC (permalink / raw)
  To: Peter Maydell
  Cc: qemu-devel, Cornelia Huck, Jens Freimann, Alexander Graf,
	Christian Borntraeger

Peter,

The following changes since commit a0def594286d9110a6035e02eef558cf3cf5d847:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-01-30 10:23:20 +0000)

are available in the git repository at:

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

for you to fetch changes up to d8923bc75479cd3fdcc72b7647f4877f91950b01:

  target/s390x: use "qemu" cpu model in user mode (2017-02-01 09:15:17 +0100)

----------------------------------------------------------------
s390x fixes

- build error with old gcc versions
- race between cmma reset and rom/loader resets
- linux-user vs. cpu model

----------------------------------------------------------------
Christian Borntraeger (1):
      s390x/kvm: fix small race reboot vs. cmma

David Hildenbrand (1):
      target/s390x: use "qemu" cpu model in user mode

Paolo Bonzini (1):
      s390-pci: fix compilation on older GCC versions

 hw/s390x/s390-pci-bus.h | 4 ++--
 hw/s390x/s390-virtio.c  | 2 +-
 linux-user/main.c       | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [Qemu-devel] [PULL 1/3] s390-pci: fix compilation on older GCC versions
  2017-02-01  9:04 [Qemu-devel] [PULL 0/3] s390x fixes Christian Borntraeger
@ 2017-02-01  9:04 ` Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 2/3] s390x/kvm: fix small race reboot vs. cmma Christian Borntraeger
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Christian Borntraeger @ 2017-02-01  9:04 UTC (permalink / raw)
  To: Peter Maydell
  Cc: qemu-devel, Cornelia Huck, Jens Freimann, Alexander Graf,
	Paolo Bonzini, Christian Borntraeger

From: Paolo Bonzini <pbonzini@redhat.com>

S390PCIBusDevice is typedef'ed earlier in the file, before the hunks
that this patch modifies.  The double typedef causes old versions of
GCC to complain.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <1485523252-88288-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390x/s390-pci-bus.h | 4 ++--
 1 file changed, 2 insertions(+), 2 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;
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Qemu-devel] [PULL 2/3] s390x/kvm: fix small race reboot vs. cmma
  2017-02-01  9:04 [Qemu-devel] [PULL 0/3] s390x fixes Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 1/3] s390-pci: fix compilation on older GCC versions Christian Borntraeger
@ 2017-02-01  9:04 ` Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 3/3] target/s390x: use "qemu" cpu model in user mode Christian Borntraeger
  2017-02-02 16:03 ` [Qemu-devel] [PULL 0/3] s390x fixes Peter Maydell
  3 siblings, 0 replies; 5+ messages in thread
From: Christian Borntraeger @ 2017-02-01  9:04 UTC (permalink / raw)
  To: Peter Maydell
  Cc: qemu-devel, Cornelia Huck, Jens Freimann, Alexander Graf,
	Christian Borntraeger, qemu-stable

Right now we reset all devices before we reset the cmma states.  This
can result in the host kernel discarding guest pages that were
previously in the unused state but already contain a bios or a -kernel
file before the cmma reset has finished.  This race results in random
guest crashes or hangs during very early reboot.

Fixes: 1cd4e0f6f0a6 ("s390x/cmma: clean up cmma reset")
Cc: qemu-stable@nongnu.org
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 hw/s390x/s390-virtio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [Qemu-devel] [PULL 3/3] target/s390x: use "qemu" cpu model in user mode
  2017-02-01  9:04 [Qemu-devel] [PULL 0/3] s390x fixes Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 1/3] s390-pci: fix compilation on older GCC versions Christian Borntraeger
  2017-02-01  9:04 ` [Qemu-devel] [PULL 2/3] s390x/kvm: fix small race reboot vs. cmma Christian Borntraeger
@ 2017-02-01  9:04 ` Christian Borntraeger
  2017-02-02 16:03 ` [Qemu-devel] [PULL 0/3] s390x fixes Peter Maydell
  3 siblings, 0 replies; 5+ messages in thread
From: Christian Borntraeger @ 2017-02-01  9:04 UTC (permalink / raw)
  To: Peter Maydell
  Cc: qemu-devel, Cornelia Huck, Jens Freimann, Alexander Graf,
	David Hildenbrand, qemu-stable

From: David Hildenbrand <david@redhat.com>

"any" does not exist, therefore resulting in a misleading error message.

Reported-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170130145025.26475-1-david@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Alexander Graf <agraf@suse.de>
Cc: qemu-stable@nongnu.org
---
 linux-user/main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux-user/main.c b/linux-user/main.c
index 3004958..e588f58 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -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
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [Qemu-devel] [PULL 0/3] s390x fixes
  2017-02-01  9:04 [Qemu-devel] [PULL 0/3] s390x fixes Christian Borntraeger
                   ` (2 preceding siblings ...)
  2017-02-01  9:04 ` [Qemu-devel] [PULL 3/3] target/s390x: use "qemu" cpu model in user mode Christian Borntraeger
@ 2017-02-02 16:03 ` Peter Maydell
  3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2017-02-02 16:03 UTC (permalink / raw)
  To: Christian Borntraeger
  Cc: qemu-devel, Cornelia Huck, Jens Freimann, Alexander Graf

On 1 February 2017 at 09:04, Christian Borntraeger
<borntraeger@de.ibm.com> wrote:
> Peter,
>
> The following changes since commit a0def594286d9110a6035e02eef558cf3cf5d847:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-01-30 10:23:20 +0000)
>
> are available in the git repository at:
>
>   git://github.com/borntraeger/qemu.git tags/s390x-20170201
>
> for you to fetch changes up to d8923bc75479cd3fdcc72b7647f4877f91950b01:
>
>   target/s390x: use "qemu" cpu model in user mode (2017-02-01 09:15:17 +0100)
>
> ----------------------------------------------------------------
> s390x fixes
>
> - build error with old gcc versions
> - race between cmma reset and rom/loader resets
> - linux-user vs. cpu model
>
> ----------------------------------------------------------------
> Christian Borntraeger (1):
>       s390x/kvm: fix small race reboot vs. cmma
>
> David Hildenbrand (1):
>       target/s390x: use "qemu" cpu model in user mode
>
> Paolo Bonzini (1):
>       s390-pci: fix compilation on older GCC versions

Applied, thanks.

-- PMM

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-02-02 16:03 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-01  9:04 [Qemu-devel] [PULL 0/3] s390x fixes Christian Borntraeger
2017-02-01  9:04 ` [Qemu-devel] [PULL 1/3] s390-pci: fix compilation on older GCC versions Christian Borntraeger
2017-02-01  9:04 ` [Qemu-devel] [PULL 2/3] s390x/kvm: fix small race reboot vs. cmma Christian Borntraeger
2017-02-01  9:04 ` [Qemu-devel] [PULL 3/3] target/s390x: use "qemu" cpu model in user mode Christian Borntraeger
2017-02-02 16:03 ` [Qemu-devel] [PULL 0/3] s390x fixes Peter Maydell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.