From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1x0-0001GW-Ue for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wp-0005lq-WB for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:26 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:03 +0200 Message-Id: <1337742502-28565-41-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 40/59] spapr: Pass PowerPCCPU to spapr_hypercall() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "open list:Overall" , Marcelo Tosatti , Alexander Graf , "open list:PowerPC" , Avi Kivity , =?UTF-8?q?Andreas=20F=C3=A4rber?= Needed for the hypercall handlers. Signed-off-by: Andreas F=C3=A4rber --- hw/spapr.c | 2 +- hw/spapr.h | 2 +- hw/spapr_hcall.c | 4 +++- target-ppc/kvm.c | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 70068b4..f9c3631 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -481,7 +481,7 @@ static void emulate_spapr_hypercall(PowerPCCPU *cpu) { CPUPPCState *env =3D &cpu->env; =20 - env->gpr[3] =3D spapr_hypercall(env, env->gpr[3], &env->gpr[4]); + env->gpr[3] =3D spapr_hypercall(cpu, env->gpr[3], &env->gpr[4]); } =20 static void spapr_reset(void *opaque) diff --git a/hw/spapr.h b/hw/spapr.h index 654a7a8..ad901ae 100644 --- a/hw/spapr.h +++ b/hw/spapr.h @@ -283,7 +283,7 @@ typedef target_ulong (*spapr_hcall_fn)(CPUPPCState *e= nv, sPAPREnvironment *spapr target_ulong *args); =20 void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); -target_ulong spapr_hypercall(CPUPPCState *env, target_ulong opcode, +target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); =20 qemu_irq spapr_allocate_irq(uint32_t hint, uint32_t *irq_num, diff --git a/hw/spapr_hcall.c b/hw/spapr_hcall.c index 94bb504..5d39316 100644 --- a/hw/spapr_hcall.c +++ b/hw/spapr_hcall.c @@ -644,9 +644,11 @@ void spapr_register_hypercall(target_ulong opcode, s= papr_hcall_fn fn) *slot =3D fn; } =20 -target_ulong spapr_hypercall(CPUPPCState *env, target_ulong opcode, +target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args) { + CPUPPCState *env =3D &cpu->env; + if (msr_pr) { hcall_dprintf("Hypercall made with MSR[PR]=3D1\n"); return H_PRIVILEGE; diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index a5bdbef..148c095 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -559,7 +559,8 @@ int kvm_arch_handle_exit(CPUPPCState *env, struct kvm= _run *run) #ifdef CONFIG_PSERIES case KVM_EXIT_PAPR_HCALL: dprintf("handle PAPR hypercall\n"); - run->papr_hcall.ret =3D spapr_hypercall(env, run->papr_hcall.nr, + run->papr_hcall.ret =3D spapr_hypercall(ppc_env_get_cpu(env), + run->papr_hcall.nr, run->papr_hcall.args); ret =3D 1; break; --=20 1.7.7