From patchwork Tue Feb 15 04:56:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qemu@gibson.dropbear.id.au X-Patchwork-Id: 83182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A6DC9B6EFE for ; Tue, 15 Feb 2011 16:16:57 +1100 (EST) Received: from localhost ([127.0.0.1]:44381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpDAA-0005h1-Oy for incoming@patchwork.ozlabs.org; Tue, 15 Feb 2011 00:09:22 -0500 Received: from [140.186.70.92] (port=53347 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PpCyE-0008RA-8Z for qemu-devel@nongnu.org; Mon, 14 Feb 2011 23:57:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PpCyC-0001ay-Ts for qemu-devel@nongnu.org; Mon, 14 Feb 2011 23:57:02 -0500 Received: from ozlabs.org ([203.10.76.45]:34737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PpCyC-0001aL-HG for qemu-devel@nongnu.org; Mon, 14 Feb 2011 23:57:00 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 76A2EB7124; Tue, 15 Feb 2011 15:56:53 +1100 (EST) From: qemu@gibson.dropbear.id.au To: qemu-devel@nongnu.org Date: Tue, 15 Feb 2011 15:56:15 +1100 Message-Id: <1297745799-26148-5-git-send-email-qemu@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297745799-26148-1-git-send-email-qemu@gibson.dropbear.id.au> References: <1297745799-26148-1-git-send-email-qemu@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 203.10.76.45 Cc: paulus@samba.org, agraf@suse.de, anton@samba.org Subject: [Qemu-devel] [PATCH 04/28] Add a hook to allow hypercalls to be emulated on PowerPC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: David Gibson PowerPC and POWER chips since the POWER4 and 970 have a special hypervisor mode, and a corresponding form of the system call instruction which traps to the hypervisor. qemu currently has stub implementations of hypervisor mode. That is, the outline is there to allow qemu to run a PowerPC hypervisor under emulation. There are a number of details missing so this won't actually work at present, but the idea is there. What there is no provision at all, is for qemu to instead emulate the hypervisor itself. That is to have hypercalls trap into qemu and their result be emulated from qemu, rather than running hypervisor code within the emulated system. Hypervisor hardware aware KVM implementations are in the works and it would be useful for debugging and development to also allow full emulation of the same para-virtualized guests as such a KVM. Therefore, this patch adds a hook which will allow a machine to set up emulation of hypervisor calls. Signed-off-by: David Gibson --- target-ppc/cpu.h | 2 ++ target-ppc/helper.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index a20c132..eaddc27 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -692,6 +692,8 @@ struct CPUPPCState { int bfd_mach; uint32_t flags; uint64_t insns_flags; + void (*emulate_hypercall)(CPUState *, void *); + void *hcall_opaque; int error_code; uint32_t pending_interrupts; diff --git a/target-ppc/helper.c b/target-ppc/helper.c index 2094ca3..19aa067 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -2152,6 +2152,10 @@ static inline void powerpc_excp(CPUState *env, int excp_model, int excp) case POWERPC_EXCP_SYSCALL: /* System call exception */ dump_syscall(env); lev = env->error_code; + if ((lev == 1) && env->emulate_hypercall) { + env->emulate_hypercall(env, env->hcall_opaque); + return; + } if (lev == 1 || (lpes0 == 0 && lpes1 == 0)) new_msr |= (target_ulong)MSR_HVB; goto store_next;