ia64/xen-unstable

changeset 11927:f575d675cda4

[HVM] Replace hvm_prod_vcpu() with calls to generic (and correct) vcpu_kick().
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@localhost.localdomain
date Sun Oct 22 17:34:24 2006 +0100 (2006-10-22)
parents c3602d217110
children 56f8bf333ef3
files xen/arch/x86/hvm/intercept.c xen/arch/x86/hvm/platform.c xen/arch/x86/hvm/vlapic.c xen/include/asm-x86/hvm/support.h
line diff
     1.1 --- a/xen/arch/x86/hvm/intercept.c	Fri Oct 20 17:52:32 2006 +0100
     1.2 +++ b/xen/arch/x86/hvm/intercept.c	Sun Oct 22 17:34:24 2006 +0100
     1.3 @@ -260,12 +260,11 @@ int register_io_handler(unsigned long ad
     1.4      return 1;
     1.5  }
     1.6  
     1.7 -/* hooks function for the HLT instruction emulation wakeup */
     1.8 +/* Hook function for the HLT instruction emulation wakeup. */
     1.9  void hlt_timer_fn(void *data)
    1.10  {
    1.11      struct vcpu *v = data;
    1.12 -
    1.13 -    hvm_prod_vcpu(v);
    1.14 +    vcpu_kick(v);
    1.15  }
    1.16  
    1.17  static __inline__ void missed_ticks(struct periodic_time *pt)
     2.1 --- a/xen/arch/x86/hvm/platform.c	Fri Oct 20 17:52:32 2006 +0100
     2.2 +++ b/xen/arch/x86/hvm/platform.c	Sun Oct 22 17:34:24 2006 +0100
     2.3 @@ -732,13 +732,6 @@ static void hvm_send_assist_req(struct v
     2.4      notify_via_xen_event_channel(v->arch.hvm_vcpu.xen_port);
     2.5  }
     2.6  
     2.7 -
     2.8 -/* Wake up a vcpu whihc is waiting for interrupts to come in */
     2.9 -void hvm_prod_vcpu(struct vcpu *v)
    2.10 -{
    2.11 -    vcpu_unblock(v);
    2.12 -}
    2.13 -
    2.14  void send_pio_req(unsigned long port, unsigned long count, int size,
    2.15                    long value, int dir, int df, int pvalid)
    2.16  {
     3.1 --- a/xen/arch/x86/hvm/vlapic.c	Fri Oct 20 17:52:32 2006 +0100
     3.2 +++ b/xen/arch/x86/hvm/vlapic.c	Sun Oct 22 17:34:24 2006 +0100
     3.3 @@ -231,7 +231,8 @@ static int vlapic_accept_irq(struct vcpu
     3.4                "level trig mode for vector %d\n", vector);
     3.5              vlapic_set_vector(vector, vlapic->regs + APIC_TMR);
     3.6          }
     3.7 -        hvm_prod_vcpu(v);
     3.8 +
     3.9 +        vcpu_kick(v);
    3.10  
    3.11          result = 1;
    3.12          break;
     4.1 --- a/xen/include/asm-x86/hvm/support.h	Fri Oct 20 17:52:32 2006 +0100
     4.2 +++ b/xen/include/asm-x86/hvm/support.h	Sun Oct 22 17:34:24 2006 +0100
     4.3 @@ -147,8 +147,6 @@ void hlt_timer_fn(void *data);
     4.4  
     4.5  void hvm_do_hypercall(struct cpu_user_regs *pregs);
     4.6  
     4.7 -void hvm_prod_vcpu(struct vcpu *v);
     4.8 -
     4.9  void hvm_hlt(unsigned long rflags);
    4.10  
    4.11  #endif /* __ASM_X86_HVM_SUPPORT_H__ */