ia64/xen-unstable

changeset 3356:ec21acd5e1a1

bitkeeper revision 1.1159.1.519 (41d44957j43cN3y5xTzmQ9SDquPlbQ)

Fix extern declarations in VMX code. They looked okay to me, but GCC
sometimes barfed on them.
author kaf24@scramble.cl.cam.ac.uk
date Thu Dec 30 18:30:47 2004 +0000 (2004-12-30)
parents d1e0d9a8fde0
children 2098a2ab519f
files xen/arch/x86/vmx.c xen/arch/x86/vmx_io.c
line diff
     1.1 --- a/xen/arch/x86/vmx.c	Thu Dec 30 18:27:56 2004 +0000
     1.2 +++ b/xen/arch/x86/vmx.c	Thu Dec 30 18:30:47 2004 +0000
     1.3 @@ -38,6 +38,9 @@
     1.4  int vmcs_size;
     1.5  unsigned int opt_vmx_debug_level;
     1.6  
     1.7 +extern long evtchn_send(int lport);
     1.8 +extern long do_block(void);
     1.9 +
    1.10  int start_vmx()
    1.11  {
    1.12      struct vmcs_struct *vmcs;
    1.13 @@ -307,9 +310,6 @@ static void vmx_io_instruction(struct xe
    1.14      unsigned long addr;
    1.15      unsigned long eip;
    1.16  
    1.17 -    extern long evtchn_send(int lport);
    1.18 -    extern long do_block(void);
    1.19 -
    1.20      __vmread(GUEST_EIP, &eip);
    1.21  
    1.22      VMX_DBG_LOG(DBG_LEVEL_1, 
    1.23 @@ -618,7 +618,6 @@ static inline void vmx_do_msr_read(struc
    1.24   */
    1.25  static inline void vmx_vmexit_do_hlt()
    1.26  {
    1.27 -    extern long do_block(void);
    1.28  #if VMX_DEBUG
    1.29      unsigned long eip;
    1.30      __vmread(GUEST_EIP, &eip);
     2.1 --- a/xen/arch/x86/vmx_io.c	Thu Dec 30 18:27:56 2004 +0000
     2.2 +++ b/xen/arch/x86/vmx_io.c	Thu Dec 30 18:30:47 2004 +0000
     2.3 @@ -30,6 +30,8 @@
     2.4  #include <xen/event.h>
     2.5  #include <public/io/ioreq.h>
     2.6  
     2.7 +extern long do_block();
     2.8 +
     2.9  void vmx_io_assist(struct exec_domain *ed) 
    2.10  {
    2.11      vcpu_iodata_t *vio;
    2.12 @@ -37,7 +39,6 @@ void vmx_io_assist(struct exec_domain *e
    2.13      struct domain *d = ed->domain;
    2.14      execution_context_t *ec = get_execution_context();
    2.15      unsigned long old_eax;
    2.16 -    extern long do_block();
    2.17      unsigned long eflags;
    2.18      int dir;
    2.19  
    2.20 @@ -208,8 +209,6 @@ void vmx_intr_assist(struct exec_domain 
    2.21  
    2.22  void vmx_do_resume(struct exec_domain *d) 
    2.23  {
    2.24 -    extern long do_block();
    2.25 -
    2.26      __vmwrite(HOST_CR3, pagetable_val(d->mm.monitor_table));
    2.27      __vmwrite(GUEST_CR3, pagetable_val(d->mm.shadow_table));
    2.28      __vmwrite(HOST_ESP, (unsigned long) get_stack_top());