openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390x/kvm: execute sigp orders on the target vcpu thread 

All sigp orders that can result in ioctls on the target vcpu should be executed
on the associated vcpu thread.

Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
David Hildenbrand 2014-08-28 13:58:50 +02:00 committed by Christian Borntraeger
parent 85ca3371f6
commit 6e6ad8db11
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
target-s390x/kvm.c
View File

@ -916,23 +916,30 @@ static int handle_diag(S390CPU *cpu, struct kvm_run *run, uint32_t ipb)
return r; return r;
} }
static int kvm_s390_cpu_start(S390CPU *cpu) static void sigp_cpu_start(void *arg)
{ {
CPUState *cs = arg;
S390CPU *cpu = S390_CPU(cs);
s390_add_running_cpu(cpu); s390_add_running_cpu(cpu);
qemu_cpu_kick(CPU(cpu));
DPRINTF("DONE: KVM cpu start: %p\n", &cpu->env); DPRINTF("DONE: KVM cpu start: %p\n", &cpu->env);
return 0;
} }
int kvm_s390_cpu_restart(S390CPU *cpu) static void sigp_cpu_restart(void *arg)
{ {
CPUState *cs = arg;
S390CPU *cpu = S390_CPU(cs);
struct kvm_s390_irq irq = { struct kvm_s390_irq irq = {
.type = KVM_S390_RESTART, .type = KVM_S390_RESTART,
}; };
kvm_s390_vcpu_interrupt(cpu, &irq); kvm_s390_vcpu_interrupt(cpu, &irq);
s390_add_running_cpu(cpu); s390_add_running_cpu(cpu);
qemu_cpu_kick(CPU(cpu)); }
int kvm_s390_cpu_restart(S390CPU *cpu)
{
run_on_cpu(CPU(cpu), sigp_cpu_restart, CPU(cpu));
DPRINTF("DONE: KVM cpu restart: %p\n", &cpu->env); DPRINTF("DONE: KVM cpu restart: %p\n", &cpu->env);
return 0; return 0;
} }
@ -980,10 +987,12 @@ static int handle_sigp(S390CPU *cpu, struct kvm_run *run, uint8_t ipa1)
switch (order_code) { switch (order_code) {
case SIGP_START: case SIGP_START:
cc = kvm_s390_cpu_start(target_cpu); run_on_cpu(CPU(target_cpu), sigp_cpu_start, CPU(target_cpu));
cc = 0;
break; break;
case SIGP_RESTART: case SIGP_RESTART:
cc = kvm_s390_cpu_restart(target_cpu); run_on_cpu(CPU(target_cpu), sigp_cpu_restart, CPU(target_cpu));
cc = 0;
break; break;
case SIGP_SET_ARCH: case SIGP_SET_ARCH:
*statusreg &= 0xffffffff00000000UL; *statusreg &= 0xffffffff00000000UL;