[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [7233] Fix i386-linux-user build (Laurent Desnogues)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [7233] Fix i386-linux-user build (Laurent Desnogues) |
Date: |
Thu, 23 Apr 2009 13:16:56 +0000 |
Revision: 7233
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=7233
Author: aliguori
Date: 2009-04-23 13:16:56 +0000 (Thu, 23 Apr 2009)
Log Message:
-----------
Fix i386-linux-user build (Laurent Desnogues)
This broke due to r7230.
Signed-off-by: Laurent Desnogues <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/target-i386/op_helper.c
Modified: trunk/target-i386/op_helper.c
===================================================================
--- trunk/target-i386/op_helper.c 2009-04-22 20:20:29 UTC (rev 7232)
+++ trunk/target-i386/op_helper.c 2009-04-23 13:16:56 UTC (rev 7233)
@@ -1191,6 +1191,7 @@
EIP = next_eip;
}
+#if !defined(CONFIG_USER_ONLY)
static void handle_even_inj(int intno, int is_int, int error_code,
int is_hw, int rm)
{
@@ -1209,6 +1210,7 @@
stl_phys(env->vm_vmcb + offsetof(struct vmcb, control.event_inj),
event_inj);
}
}
+#endif
/*
* Begin execution of an interruption. is_int is TRUE if coming from
@@ -1250,8 +1252,10 @@
}
}
if (env->cr[0] & CR0_PE_MASK) {
+#if !defined(CONFIG_USER_ONLY)
if (env->hflags & HF_SVMI_MASK)
handle_even_inj(intno, is_int, error_code, is_hw, 0);
+#endif
#ifdef TARGET_X86_64
if (env->hflags & HF_LMA_MASK) {
do_interrupt64(intno, is_int, error_code, next_eip, is_hw);
@@ -1261,15 +1265,19 @@
do_interrupt_protected(intno, is_int, error_code, next_eip, is_hw);
}
} else {
+#if !defined(CONFIG_USER_ONLY)
if (env->hflags & HF_SVMI_MASK)
handle_even_inj(intno, is_int, error_code, is_hw, 1);
+#endif
do_interrupt_real(intno, is_int, error_code, next_eip);
}
+#if !defined(CONFIG_USER_ONLY)
if (env->hflags & HF_SVMI_MASK) {
uint32_t event_inj = ldl_phys(env->vm_vmcb + offsetof(struct vmcb,
control.event_inj));
stl_phys(env->vm_vmcb + offsetof(struct vmcb, control.event_inj),
event_inj & ~SVM_EVTINJ_VALID);
}
+#endif
}
/* This should come from sysemu.h - if we could include it here... */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [7233] Fix i386-linux-user build (Laurent Desnogues),
Anthony Liguori <=