[Xen-changelog] A few trivial cleanups from the HVM merge.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 40c152531072c0df380f09e2317887eff166d7be
# Parent  9eb1a1a6e16d2bf766839b55aaa5e8e47337d539
A few trivial cleanups from the HVM merge.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 9eb1a1a6e16d -r 40c152531072 xen/arch/x86/cpu/intel.c
--- a/xen/arch/x86/cpu/intel.c  Mon Feb  6 15:51:06 2006
+++ b/xen/arch/x86/cpu/intel.c  Mon Feb  6 15:55:41 2006
@@ -10,8 +10,6 @@
 #include <asm/mpspec.h>
 #include <asm/apic.h>
 #include <mach_apic.h>
-#include <asm/hvm/vpit.h>
-#include <asm/hvm/vcpu.h>
 #include <asm/hvm/support.h>
 
 #include "cpu.h"
diff -r 9eb1a1a6e16d -r 40c152531072 xen/arch/x86/dom0_ops.c
--- a/xen/arch/x86/dom0_ops.c   Mon Feb  6 15:51:06 2006
+++ b/xen/arch/x86/dom0_ops.c   Mon Feb  6 15:55:41 2006
@@ -454,8 +454,8 @@
 
     if ( HVM_DOMAIN(v) )
     {
-       hvm_store_cpu_guest_regs(v, &c->user_regs);
-       hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
+        hvm_store_cpu_guest_regs(v, &c->user_regs);
+        hvm_store_cpu_guest_ctrl_regs(v, c->ctrlreg);
     }
     else
     {
@@ -476,3 +476,13 @@
 
     c->vm_assist = v->domain->vm_assist;
 }
+
+/*
+ * Local variables:
+ * mode: C
+ * c-set-style: "BSD"
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff -r 9eb1a1a6e16d -r 40c152531072 xen/arch/x86/x86_64/mm.c
--- a/xen/arch/x86/x86_64/mm.c  Mon Feb  6 15:51:06 2006
+++ b/xen/arch/x86/x86_64/mm.c  Mon Feb  6 15:55:41 2006
@@ -188,7 +188,7 @@
     l3_pgentry_t l3e;
     l2_pgentry_t l2e;
     unsigned long mfn, v;
-    unsigned int i = 0;
+    unsigned int i;
     long rc = 0;
 
     switch ( op )

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