diff options
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.h | 2 | ||||
| -rw-r--r-- | target-s390x/kvm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 143b631369..0171de0179 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -476,7 +476,7 @@ int css_do_rchp(uint8_t cssid, uint8_t chpid); bool css_present(uint8_t cssid); #endif -#define cpu_init(model) (&cpu_s390x_init(model)->env) +#define cpu_init(model) CPU(cpu_s390x_init(model)) #define cpu_exec cpu_s390x_exec #define cpu_gen_code cpu_s390x_gen_code #define cpu_signal_handler cpu_s390x_signal_handler diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index a585fe3e1c..e95a60a066 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -260,7 +260,7 @@ void kvm_s390_reset_vcpu(S390CPU *cpu) * Before this ioctl cpu_synchronize_state() is called in common kvm * code (kvm-all) */ if (kvm_vcpu_ioctl(cs, KVM_S390_INITIAL_RESET, NULL)) { - error_report("Initial CPU reset failed on CPU %i\n", cs->cpu_index); + error_report("Initial CPU reset failed on CPU %i", cs->cpu_index); } } |