aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-07-23 12:59:12 +0300
committerAvi Kivity <avi@qumranet.com>2007-07-23 12:59:12 +0300
commitaddd66a54ae65e92053e4ddae69a720eaea6c009 (patch)
treef306a24fd8446a076cc0b6ddc86df2ce5f2751d7
parentaaac28fde922be55292d1c825ca16157217f5c51 (diff)
Remove old cpu emulation hackskvm-32
kvm hasn't used qemu emulation for a long time.
-rw-r--r--target-i386/helper.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 16ed20ba4..9f8b2e10a 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -18,9 +18,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "exec.h"
-#ifdef USE_KVM
-extern int kvm_allowed;
-#endif
//#define DEBUG_PCALL
#if 0
@@ -841,13 +838,6 @@ static void do_interrupt64(int intno, int is_int, int error_code,
uint32_t e1, e2, e3, ss;
target_ulong old_eip, esp, offset;
-#ifdef USE_KVM
- if (kvm_allowed) {
- printf("%s: unexpect\n", __FUNCTION__);
- exit(-1);
- }
-#endif
-
has_error_code = 0;
if (!is_int && !is_hw) {
switch(intno) {
@@ -1131,12 +1121,6 @@ void do_interrupt_user(int intno, int is_int, int error_code,
int dpl, cpl;
uint32_t e2;
-#ifdef USE_KVM
- if (kvm_allowed) {
- printf("%s: unexpect\n", __FUNCTION__);
- exit(-1);
- }
-#endif
dt = &env->idt;
ptr = dt->base + (intno * 8);
e2 = ldl_kernel(ptr + 4);
@@ -1162,12 +1146,6 @@ void do_interrupt_user(int intno, int is_int, int error_code,
void do_interrupt(int intno, int is_int, int error_code,
target_ulong next_eip, int is_hw)
{
-#ifdef USE_KVM
- if (kvm_allowed) {
- printf("%s: unexpect\n", __FUNCTION__);
- exit(-1);
- }
-#endif
if (loglevel & CPU_LOG_INT) {
if ((env->cr[0] & CR0_PE_MASK)) {
static int count;
@@ -1979,12 +1957,6 @@ void helper_ljmp_protected_T0_T1(int next_eip_addend)
cpu_x86_load_seg_cache(env, R_CS, (new_cs & 0xfffc) | cpl,
get_seg_base(e1, e2), limit, e2);
EIP = new_eip;
-#ifdef USE_KVM
- if (kvm_allowed && (e2 & DESC_L_MASK)) {
- env->exception_index = -1;
- cpu_loop_exit();
- }
-#endif
} else {
/* jump to call or task gate */
dpl = (e2 >> DESC_DPL_SHIFT) & 3;