Re: [Qemu-devel] svn trunk currently borked

[Laurent Desnogues <laurent.desnogues@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 884 bytes --]

On Thu, Apr 23, 2009 at 1:15 PM, Martin Mohring
<martin.mohring@opensuse.org> wrote:
> Hi,
>
> one of the last commits borked the qemu user mode:
>
> CC i386-linux-user/i386-dis.o
>  AR i386-linux-user/libqemu.a
>  LINK i386-linux-user/qemu-i386
> libqemu.a(op_helper.o): In function `handle_even_inj':
> /usr/src/packages/BUILD/qemu-0.11svn7232/target-i386/op_helper.c:1197:
> undefined reference to `ldl_phys'
> /usr/src/packages/BUILD/qemu-0.11svn7232/target-i386/op_helper.c:1207:
> undefined reference to `stl_phys'
> libqemu.a(op_helper.o): In function `do_interrupt':
> /usr/src/packages/BUILD/qemu-0.11svn7232/target-i386/op_helper.c:1270:
> undefined reference to `ldl_phys'

This is due to commit 7230.

Could you give the attached patch a try?  I just checked it compiled.


Laurent

Signed-off-by: Laurent Desnogues <laurent.desnogues@gmail.com>

[-- Attachment #2: i386-SVMI.patch --]
[-- Type: text/x-patch, Size: 1638 bytes --]

Index: target-i386/op_helper.c
===================================================================
--- target-i386/op_helper.c	(revision 7232)
+++ target-i386/op_helper.c	(working copy)
@@ -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... */