[Xen-changelog] [xen-unstable] [HVM] Replace hvm_prod_vcpu() with calls to generic (and correct) vcpu_kick().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxxx
# Node ID f575d675cda4b150f937bce4fd1647ace5e83324
# Parent  c3602d217110d08321e7f136620acdfa61baddc9
[HVM] Replace hvm_prod_vcpu() with calls to generic (and correct) vcpu_kick().
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/intercept.c      |    5 ++---
 xen/arch/x86/hvm/platform.c       |    7 -------
 xen/arch/x86/hvm/vlapic.c         |    3 ++-
 xen/include/asm-x86/hvm/support.h |    2 --
 4 files changed, 4 insertions(+), 13 deletions(-)

diff -r c3602d217110 -r f575d675cda4 xen/arch/x86/hvm/intercept.c
--- a/xen/arch/x86/hvm/intercept.c      Fri Oct 20 17:52:32 2006 +0100
+++ b/xen/arch/x86/hvm/intercept.c      Sun Oct 22 17:34:24 2006 +0100
@@ -260,12 +260,11 @@ int register_io_handler(unsigned long ad
     return 1;
 }
 
-/* hooks function for the HLT instruction emulation wakeup */
+/* Hook function for the HLT instruction emulation wakeup. */
 void hlt_timer_fn(void *data)
 {
     struct vcpu *v = data;
-
-    hvm_prod_vcpu(v);
+    vcpu_kick(v);
 }
 
 static __inline__ void missed_ticks(struct periodic_time *pt)
diff -r c3602d217110 -r f575d675cda4 xen/arch/x86/hvm/platform.c
--- a/xen/arch/x86/hvm/platform.c       Fri Oct 20 17:52:32 2006 +0100
+++ b/xen/arch/x86/hvm/platform.c       Sun Oct 22 17:34:24 2006 +0100
@@ -732,13 +732,6 @@ static void hvm_send_assist_req(struct v
     notify_via_xen_event_channel(v->arch.hvm_vcpu.xen_port);
 }
 
-
-/* Wake up a vcpu whihc is waiting for interrupts to come in */
-void hvm_prod_vcpu(struct vcpu *v)
-{
-    vcpu_unblock(v);
-}
-
 void send_pio_req(unsigned long port, unsigned long count, int size,
                   long value, int dir, int df, int pvalid)
 {
diff -r c3602d217110 -r f575d675cda4 xen/arch/x86/hvm/vlapic.c
--- a/xen/arch/x86/hvm/vlapic.c Fri Oct 20 17:52:32 2006 +0100
+++ b/xen/arch/x86/hvm/vlapic.c Sun Oct 22 17:34:24 2006 +0100
@@ -231,7 +231,8 @@ static int vlapic_accept_irq(struct vcpu
               "level trig mode for vector %d\n", vector);
             vlapic_set_vector(vector, vlapic->regs + APIC_TMR);
         }
-        hvm_prod_vcpu(v);
+
+        vcpu_kick(v);
 
         result = 1;
         break;
diff -r c3602d217110 -r f575d675cda4 xen/include/asm-x86/hvm/support.h
--- a/xen/include/asm-x86/hvm/support.h Fri Oct 20 17:52:32 2006 +0100
+++ b/xen/include/asm-x86/hvm/support.h Sun Oct 22 17:34:24 2006 +0100
@@ -147,8 +147,6 @@ void hlt_timer_fn(void *data);
 
 void hvm_do_hypercall(struct cpu_user_regs *pregs);
 
-void hvm_prod_vcpu(struct vcpu *v);
-
 void hvm_hlt(unsigned long rflags);
 
 #endif /* __ASM_X86_HVM_SUPPORT_H__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog