[Qemu-devel] [PULL 1.0 0/2] s390 stable-1.0 patch queue 2012-01-12

[Qemu-devel] [PULL 1.0 0/2] s390 stable-1.0 patch queue 2012-01-12

[Alexander Graf]

Hi Justin,

This is my current patch queue for s390 for stable-1.0. Please pull.

Alex


The following changes since commit 85a4ca797dbe25f27df0a66aa4df1cab63245cd3:
  Justin M. Forbes (1):
        Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0

are available in the git repository at:

  git://repo.or.cz/qemu/agraf.git s390-1.0

Alexander Graf (1):
      s390x: add TR function for EXECUTE

Christian Borntraeger (1):
      s390: fix cpu hotplug / cpu activity on interrupts

 target-s390x/kvm.c       |    3 ---
 target-s390x/op_helper.c |    3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

[Qemu-devel] [PATCH 1/2] s390x: add TR function for EXECUTE

[Alexander Graf]

Newer gcc versions (or glibc?) also generate code that tries to EXECUTE
the TR opcode. Implement it so that we don't break valid guests.

Reported-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 target-s390x/op_helper.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c
index 137bae7..5ddc7b9 100644
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -636,6 +636,9 @@ uint32_t HELPER(ex)(uint32_t cc, uint64_t v1, uint64_t addr, uint64_t ret)
         case 0x700:
             cc = helper_xc(l, get_address(0, b1, d1), get_address(0, b2, d2));
             break;
+        case 0xc00:
+            helper_tr(l, get_address(0, b1, d1), get_address(0, b2, d2));
+            break;
         default:
             goto abort;
             break;
-- 
1.6.0.2

[Qemu-devel] [PATCH 2/2] s390: fix cpu hotplug / cpu activity on interrupts

[Alexander Graf]

From: Christian Borntraeger <borntraeger@de.ibm.com>

The add_del/running_cpu code and env->halted are tracking stopped cpus.
Sleeping cpus (idle and enabled for interrupts) are waiting inside the
kernel.
No interrupt besides the restart can move a cpu from stopped to
operational. This is already handled over there. So lets just remove
the bogus wakup from the common interrupt delivery, otherwise any
interrupt will wake up a cpu, even if this cpu is stopped (Thus leading
to strange hangs on sigp restart)

This fixes
echo 0 > /sys/devices/system/cpu/cpu0/online
echo 1 > /sys/devices/system/cpu/cpu0/online
in the guest

Signed-off-by: Christian Borntraeger<borntraeger@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
(cherry picked from commit 93116ac0cf9734e7b28886aedf03848b37d6785e)
---
 target-s390x/kvm.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 40b0ab1..b1404bf 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -185,9 +185,6 @@ void kvm_s390_interrupt_internal(CPUState *env, int type, uint32_t parm,
         return;
     }
 
-    s390_add_running_cpu(env);
-    qemu_cpu_kick(env);
-
     kvmint.type = type;
     kvmint.parm = parm;
     kvmint.parm64 = parm64;
-- 
1.6.0.2