From: Andreas Färber <afaerber@suse.de>
Date: Fri, 21 Jun 2013 15:04:45 +0000 (+0200)
Subject: target-s390x: Don't overuse ENV_GET_CPU()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=19079e460520053114127f812ddc488b974c2117;p=qemu.git

target-s390x: Don't overuse ENV_GET_CPU()

Commit 3474b679486caa8f6448bae974e131370f360c13 (Utilize selective
runtime reg sync for hot code paths) introduced two uses of
ENV_GET_CPU() inside target-s390x/ KVM code. In one case we can use a
direct CPU() cast instead.

Cc: Jason J. Herne <jjherne@us.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 42f758fc7d..af499cfb65 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -469,7 +469,7 @@ static int kvm_handle_css_inst(S390CPU *cpu, struct kvm_run *run,
     int r = 0;
     int no_cc = 0;
     CPUS390XState *env = &cpu->env;
-    CPUState *cs = ENV_GET_CPU(env);
+    CPUState *cs = CPU(cpu);
 
     if (ipa0 != 0xb2) {
         /* Not handled for now. */