[Xen-changelog] [xen-unstable] hvm: hvm_io_assist() doesn't preoperly make use of its vcpu

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1175681773 -3600
# Node ID 6cfc491631d59abafe4bba5936f7dc32165f190d
# Parent  0dabddd7787909204d898c6e9155e7ba26136f43
hvm: hvm_io_assist() doesn't preoperly make use of its vcpu
parameter. Remove it to make it obvious that it can only be called for
the currently-executing vcpu.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c       |    2 +-
 xen/arch/x86/hvm/io.c        |    3 ++-
 xen/arch/x86/hvm/platform.c  |    4 ++--
 xen/include/asm-x86/hvm/io.h |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff -r 0dabddd77879 -r 6cfc491631d5 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Wed Apr 04 11:13:20 2007 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Wed Apr 04 11:16:13 2007 +0100
@@ -131,7 +131,7 @@ void hvm_do_resume(struct vcpu *v)
         switch ( p->state )
         {
         case STATE_IORESP_READY: /* IORESP_READY -> NONE */
-            hvm_io_assist(v);
+            hvm_io_assist();
             break;
         case STATE_IOREQ_READY:  /* IOREQ_{READY,INPROCESS} -> IORESP_READY */
         case STATE_IOREQ_INPROCESS:
diff -r 0dabddd77879 -r 6cfc491631d5 xen/arch/x86/hvm/io.c
--- a/xen/arch/x86/hvm/io.c     Wed Apr 04 11:13:20 2007 +0100
+++ b/xen/arch/x86/hvm/io.c     Wed Apr 04 11:16:13 2007 +0100
@@ -764,13 +764,14 @@ static void hvm_mmio_assist(struct cpu_u
     }
 }
 
-void hvm_io_assist(struct vcpu *v)
+void hvm_io_assist(void)
 {
     vcpu_iodata_t *vio;
     ioreq_t *p;
     struct cpu_user_regs *regs;
     struct hvm_io_op *io_opp;
     unsigned long gmfn;
+    struct vcpu *v = current;
     struct domain *d = v->domain;
 
     io_opp = &v->arch.hvm_vcpu.io_op;
diff -r 0dabddd77879 -r 6cfc491631d5 xen/arch/x86/hvm/platform.c
--- a/xen/arch/x86/hvm/platform.c       Wed Apr 04 11:13:20 2007 +0100
+++ b/xen/arch/x86/hvm/platform.c       Wed Apr 04 11:16:13 2007 +0100
@@ -865,7 +865,7 @@ void send_pio_req(unsigned long port, un
     if ( hvm_portio_intercept(p) )
     {
         p->state = STATE_IORESP_READY;
-        hvm_io_assist(v);
+        hvm_io_assist();
         return;
     }
 
@@ -914,7 +914,7 @@ static void send_mmio_req(unsigned char 
     if ( hvm_mmio_intercept(p) || hvm_buffered_io_intercept(p) )
     {
         p->state = STATE_IORESP_READY;
-        hvm_io_assist(v);
+        hvm_io_assist();
         return;
     }
 
diff -r 0dabddd77879 -r 6cfc491631d5 xen/include/asm-x86/hvm/io.h
--- a/xen/include/asm-x86/hvm/io.h      Wed Apr 04 11:13:20 2007 +0100
+++ b/xen/include/asm-x86/hvm/io.h      Wed Apr 04 11:16:13 2007 +0100
@@ -149,7 +149,7 @@ void send_timeoffset_req(unsigned long t
 void send_timeoffset_req(unsigned long timeoff);
 extern void handle_mmio(unsigned long gpa);
 extern void hvm_interrupt_post(struct vcpu *v, int vector, int type);
-extern void hvm_io_assist(struct vcpu *v);
+extern void hvm_io_assist(void);
 
 #endif /* __ASM_X86_HVM_IO_H__ */
 

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