Revision cb446eca target-s390x/kvm.c
b/target-s390x/kvm.c | ||
---|---|---|
450 | 450 |
uint64_t code; |
451 | 451 |
int r = 0; |
452 | 452 |
|
453 |
cpu_synchronize_state(env);
|
|
453 |
cpu_synchronize_state(CPU(cpu));
|
|
454 | 454 |
sccb = env->regs[ipbh0 & 0xf]; |
455 | 455 |
code = env->regs[(ipbh0 & 0xf0) >> 4]; |
456 | 456 |
|
... | ... | |
656 | 656 |
|
657 | 657 |
static int s390_cpu_initial_reset(S390CPU *cpu) |
658 | 658 |
{ |
659 |
CPUState *cs = CPU(cpu); |
|
659 | 660 |
CPUS390XState *env = &cpu->env; |
660 | 661 |
int i; |
661 | 662 |
|
662 | 663 |
s390_del_running_cpu(cpu); |
663 |
if (kvm_vcpu_ioctl(CPU(cpu), KVM_S390_INITIAL_RESET, NULL) < 0) {
|
|
664 |
if (kvm_vcpu_ioctl(cs, KVM_S390_INITIAL_RESET, NULL) < 0) {
|
|
664 | 665 |
perror("cannot init reset vcpu"); |
665 | 666 |
} |
666 | 667 |
|
667 | 668 |
/* Manually zero out all registers */ |
668 |
cpu_synchronize_state(env);
|
|
669 |
cpu_synchronize_state(cs);
|
|
669 | 670 |
for (i = 0; i < 16; i++) { |
670 | 671 |
env->regs[i] = 0; |
671 | 672 |
} |
... | ... | |
685 | 686 |
S390CPU *target_cpu; |
686 | 687 |
CPUS390XState *target_env; |
687 | 688 |
|
688 |
cpu_synchronize_state(env);
|
|
689 |
cpu_synchronize_state(CPU(cpu));
|
|
689 | 690 |
|
690 | 691 |
/* get order code */ |
691 | 692 |
order_code = run->s390_sieic.ipb >> 28; |
Also available in: Unified diff