[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qom-cpu v3 13/14] target-s390x: Change handle_{hyper
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH qom-cpu v3 13/14] target-s390x: Change handle_{hypercall, diag}() argument to S390CPU |
Date: |
Wed, 26 Jun 2013 19:35:42 +0200 |
This allows to get rid of the last remaining ENV_GET_CPU() in
target-s390x/ by using CPU() cast directly on the argument.
Cc: Jason J. Herne <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-s390x/kvm.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 4660074..33ca7a7 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -607,9 +607,10 @@ static int handle_priv(S390CPU *cpu, struct kvm_run *run,
return r;
}
-static int handle_hypercall(CPUS390XState *env, struct kvm_run *run)
+static int handle_hypercall(S390CPU *cpu, struct kvm_run *run)
{
- CPUState *cs = ENV_GET_CPU(env);
+ CPUState *cs = CPU(cpu);
+ CPUS390XState *env = &cpu->env;
kvm_s390_get_registers_partial(cs);
cs->kvm_vcpu_dirty = true;
@@ -618,13 +619,13 @@ static int handle_hypercall(CPUS390XState *env, struct
kvm_run *run)
return 0;
}
-static int handle_diag(CPUS390XState *env, struct kvm_run *run, int ipb_code)
+static int handle_diag(S390CPU *cpu, struct kvm_run *run, int ipb_code)
{
int r = 0;
switch (ipb_code) {
case DIAG_KVM_HYPERCALL:
- r = handle_hypercall(env, run);
+ r = handle_hypercall(cpu, run);
break;
case DIAG_KVM_BREAKPOINT:
sleep(10);
@@ -735,7 +736,6 @@ out:
static int handle_instruction(S390CPU *cpu, struct kvm_run *run)
{
- CPUS390XState *env = &cpu->env;
unsigned int ipa0 = (run->s390_sieic.ipa & 0xff00);
uint8_t ipa1 = run->s390_sieic.ipa & 0x00ff;
int ipb_code = (run->s390_sieic.ipb & 0x0fff0000) >> 16;
@@ -749,7 +749,7 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run
*run)
r = handle_priv(cpu, run, ipa0 >> 8, ipa1);
break;
case IPA0_DIAG:
- r = handle_diag(env, run, ipb_code);
+ r = handle_diag(cpu, run, ipb_code);
break;
case IPA0_SIGP:
r = handle_sigp(cpu, run, ipa1);
--
1.8.1.4
- [Qemu-devel] [PATCH qom-cpu v3 00/14] QOM CPUState, part 10: CPU loops, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 01/14] kvm: Free current_cpu identifier, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 04/14] linux-user: Clean up do_syscall() Coding Style for TARGET_NR_exit, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 12/14] target-s390x: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 03/14] kvm: Change kvm_remove_all_breakpoints() argument to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 11/14] target-ppc: Don't overuse ENV_GET_CPU(), Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 13/14] target-s390x: Change handle_{hypercall, diag}() argument to S390CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH qom-cpu v3 08/14] intc/arm_gic: Build arm_gic only once, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 09/14] intc/openpic: Build openpic only once, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 10/14] timer/arm_mptimer: Build arm_mptimer only once, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 02/14] cpu: Replace cpu_single_env with CPUState current_cpu, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 06/14] linux-user: Change thread_env to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 14/14] target-i386: Don't overuse CPUArchState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 07/14] bsd-user: Change thread_env to CPUState, Andreas Färber, 2013/06/26
- [Qemu-devel] [PATCH qom-cpu v3 05/14] cpu: Make first_cpu and next_cpu CPUState, Andreas Färber, 2013/06/26