From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KszEL-0007QT-HT for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:57 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KszEH-0007PX-Ru for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:57 -0400 Received: from [199.232.76.173] (port=51726 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KszEH-0007PU-KO for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:53 -0400 Received: from mx2.redhat.com ([66.187.237.31]:54735) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KszE2-0006Nw-MN for qemu-devel@nongnu.org; Thu, 23 Oct 2008 08:23:53 -0400 From: Glauber Costa Date: Thu, 23 Oct 2008 12:19:13 -0200 Message-Id: <1224771556-11146-30-git-send-email-glommer@redhat.com> In-Reply-To: <1224771556-11146-1-git-send-email-glommer@redhat.com> References: <1224771556-11146-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 29/32] sysret/sysexit arch specific accelerator Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, aliguori@us.ibm.com, jes@sgi.com, avi@qumranet.com, dmitry.baryshkov@siemens.com let arch-specific accelerator hook into the end of syscall return functions sysret and sysexit. Signed-off-by: Glauber Costa --- kqemu.c | 11 +++++++++++ target-i386/accel86.h | 8 ++++++++ target-i386/op_helper.c | 15 +-------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/kqemu.c b/kqemu.c index 0bea20e..1934aa5 100644 --- a/kqemu.c +++ b/kqemu.c @@ -1195,10 +1195,21 @@ static void kqemu_interrupt_return(CPUState *env) } } +static void kqemu_syscall_return(CPUState *env) +{ + if (kqemu_kernel_flags_ok(env)) { + if (env->hflags & HF_LMA_MASK) + CC_OP = CC_OP_EFLAGS; + env->exception_index = -1; + cpu_loop_exit(); + } +} + QEMUAccel86 kqemu_accel86 = { .get_msr = kqemu_get_msr, .set_msr = kqemu_set_msr, .interrupt_return = kqemu_interrupt_return, + .syscall_return = kqemu_syscall_return, }; QEMUAccel kqemu_accel = { diff --git a/target-i386/accel86.h b/target-i386/accel86.h index c3201f5..1624a64 100644 --- a/target-i386/accel86.h +++ b/target-i386/accel86.h @@ -7,6 +7,7 @@ typedef struct QEMUAccel86 { int (*get_msr)(int msr, uint64_t *value); int (*set_msr)(int msr, uint64_t value); void (*interrupt_return)(CPUState *env); + void (*syscall_return)(CPUState *env); } QEMUAccel86; #define accel86_call_func ((QEMUAccel86 *)(current_accel->arch)) @@ -32,5 +33,12 @@ static inline void accel_interrupt_return(CPUState *env) accel86_call_func->interrupt_return(env); } +static inline void accel_syscall_return(CPUState *env) +{ + if (!current_accel->arch) + return; + accel86_call_func->syscall_return(env); +} + #endif diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 61ba6fc..a831a4d 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1104,14 +1104,7 @@ void helper_sysret(int dflag) env->eflags |= IF_MASK; cpu_x86_set_cpl(env, 3); } -#ifdef USE_KQEMU - if (kqemu_is_ok(env)) { - if (env->hflags & HF_LMA_MASK) - CC_OP = CC_OP_EFLAGS; - env->exception_index = -1; - cpu_loop_exit(); - } -#endif + accel_syscall_return(env); } /* real mode interrupt */ @@ -3003,12 +2996,6 @@ void helper_sysexit(int dflag) } ESP = ECX; EIP = EDX; -#ifdef USE_KQEMU - if (kqemu_is_ok(env)) { - env->exception_index = -1; - cpu_loop_exit(); - } -#endif } #if defined(CONFIG_USER_ONLY) -- 1.5.5.1