From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LwynU-0005kO-Au for qemu-devel@nongnu.org; Thu, 23 Apr 2009 09:17:00 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LwynS-0005gN-Db for qemu-devel@nongnu.org; Thu, 23 Apr 2009 09:16:59 -0400 Received: from [199.232.76.173] (port=35276 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LwynS-0005g5-8q for qemu-devel@nongnu.org; Thu, 23 Apr 2009 09:16:58 -0400 Received: from savannah.gnu.org ([199.232.41.3]:41672 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LwynR-0004VG-VD for qemu-devel@nongnu.org; Thu, 23 Apr 2009 09:16:58 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1LwynR-0000S0-Cf for qemu-devel@nongnu.org; Thu, 23 Apr 2009 13:16:57 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.69) (envelope-from ) id 1LwynQ-0000Rv-SQ for qemu-devel@nongnu.org; Thu, 23 Apr 2009 13:16:57 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Thu, 23 Apr 2009 13:16:56 +0000 Subject: [Qemu-devel] [7233] Fix i386-linux-user build (Laurent Desnogues) List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Signed-off-by: Anthony Liguori 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... */