From: Christian Borntraeger Date: Sun, 20 Nov 2011 23:12:03 +0000 (+0000) Subject: s390: fix cpu hotplug / cpu activity on interrupts X-Git-Tag: qemu-xen-4.2.0~39^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d194ba1cdbeee54166845b75f9186a8e401e5f07;p=qemu-upstream-4.2-testing.git s390: fix cpu hotplug / cpu activity on interrupts 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 Signed-off-by: Alexander Graf (cherry picked from commit 93116ac0cf9734e7b28886aedf03848b37d6785e) --- diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 40b0ab192..b1404bfd2 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;