[Xen-changelog] [xen-unstable] x86: Fix PV PIT handler after previous changeset.

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200137164 0
# Node ID 533a8e6cebd0fd28cbef57d4ff622b4f32ea73cd
# Parent  9862217f3c34a8f941cf0b3eaebd3c0b042815d9
x86: Fix PV PIT handler after previous changeset.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/hvm/i8254.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff -r 9862217f3c34 -r 533a8e6cebd0 xen/arch/x86/hvm/i8254.c
--- a/xen/arch/x86/hvm/i8254.c  Sat Jan 12 11:13:57 2008 +0000
+++ b/xen/arch/x86/hvm/i8254.c  Sat Jan 12 11:26:04 2008 +0000
@@ -601,14 +601,20 @@ int pv_pit_handler(int port, int data, i
         .dir  = write ? IOREQ_WRITE : IOREQ_READ,
         .data = data
     };
-    uint32_t val = data;
 
     if ( (current->domain->domain_id == 0) && dom0_pit_access(&ioreq) )
+    {
         /* nothing to do */;
-    else if ( port == 0x61 )
-        handle_speaker_io(ioreq.dir, port, 1, &val);
+    }
     else
-        handle_pit_io(ioreq.dir, port, 1, &val);
+    {
+        uint32_t val = data;
+        if ( port == 0x61 )
+            handle_speaker_io(ioreq.dir, port, 1, &val);
+        else
+            handle_pit_io(ioreq.dir, port, 1, &val);
+        ioreq.data = val;
+    }
 
     return !write ? ioreq.data : 0;
 }

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