diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-01 05:35:08 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-12-19 14:09:32 +0100 |
| commit | a60f24b56b07f46453424263b276b0879c25c4e6 (patch) | |
| tree | 092fd681aab3131e3663d48b10b9c36f20938031 /target-s390x | |
| parent | a34a92b9ecd8d25bd1de9df601ed31ccd8ebcae7 (diff) | |
cpu: Move kvm_state field into CPUState
Adapt some functions to take CPUState / {PowerPC,S390}CPU argument.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 5422678330..4e343041fa 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -291,12 +291,11 @@ int kvm_arch_process_async_events(CPUState *cs) void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm, uint64_t parm64, int vm) { - CPUS390XState *env = &cpu->env; CPUState *cs = CPU(cpu); struct kvm_s390_interrupt kvmint; int r; - if (!env->kvm_state) { + if (!cs->kvm_state) { return; } @@ -305,7 +304,7 @@ void kvm_s390_interrupt_internal(S390CPU *cpu, int type, uint32_t parm, kvmint.parm64 = parm64; if (vm) { - r = kvm_vm_ioctl(env->kvm_state, KVM_S390_INTERRUPT, &kvmint); + r = kvm_vm_ioctl(cs->kvm_state, KVM_S390_INTERRUPT, &kvmint); } else { r = kvm_vcpu_ioctl(cs, KVM_S390_INTERRUPT, &kvmint); } |