[Xen-changelog] Cleanups to do_callback_op() new hypercall changeset.

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

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID db44b783fe09f22ededdbd383d853364387da918
# Parent  be0a1f376223f23ee3e6cea3a63576ef3822f62c
Cleanups to do_callback_op() new hypercall changeset.

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

diff -r be0a1f376223 -r db44b783fe09 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h    Thu Apr 
 6 15:41:53 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypercall.h    Thu Apr 
 6 16:25:24 2006
@@ -331,8 +331,7 @@
 
 static inline int
 HYPERVISOR_callback_op(
-       int cmd,
-       void *arg)
+       int cmd, void *arg)
 {
        return _hypercall2(int, callback_op, cmd, arg);
 }
diff -r be0a1f376223 -r db44b783fe09 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Thu Apr 
 6 15:41:53 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Thu Apr 
 6 16:25:24 2006
@@ -25,11 +25,11 @@
 static void __init machine_specific_arch_setup(void)
 {
        struct xen_platform_parameters pp;
-       callback_register_t event = {
+       struct callback_register event = {
                .type = CALLBACKTYPE_event,
                .address = { __KERNEL_CS, (unsigned long)hypervisor_callback },
        };
-       callback_register_t failsafe = {
+       struct callback_register failsafe = {
                .type = CALLBACKTYPE_failsafe,
                .address = { __KERNEL_CS, (unsigned long)failsafe_callback },
        };
diff -r be0a1f376223 -r db44b783fe09 
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h        
Thu Apr  6 15:41:53 2006
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h        
Thu Apr  6 16:25:24 2006
@@ -14,15 +14,15 @@
 
 static void __init machine_specific_arch_setup(void)
 {
-       callback_register_t event = {
+       struct callback_register event = {
                .type = CALLBACKTYPE_event,
                .address = (unsigned long) hypervisor_callback,
        };
-       callback_register_t failsafe = {
+       struct callback_register failsafe = {
                .type = CALLBACKTYPE_failsafe,
                .address = (unsigned long)failsafe_callback,
        };
-       callback_register_t syscall = {
+       struct callback_register syscall = {
                .type = CALLBACKTYPE_syscall,
                .address = (unsigned long)system_call,
        };
diff -r be0a1f376223 -r db44b783fe09 xen/arch/x86/x86_32/traps.c
--- a/xen/arch/x86/x86_32/traps.c       Thu Apr  6 15:41:53 2006
+++ b/xen/arch/x86/x86_32/traps.c       Thu Apr  6 16:25:24 2006
@@ -322,8 +322,7 @@
     long ret = 0;
     struct vcpu *v = current;
 
-    if ( reg->address.cs )
-        fixup_guest_code_selector(reg->address.cs);
+    fixup_guest_code_selector(reg->address.cs);
 
     switch ( reg->type )
     {
@@ -355,6 +354,7 @@
         ret = -EINVAL;
         break;
     }
+
     return ret;
 }
 
@@ -370,7 +370,7 @@
         struct callback_register reg;
 
         ret = -EFAULT;
-        if ( copy_from_guest( &reg, arg, 1 ) )
+        if ( copy_from_guest(&reg, arg, 1) )
             break;
 
         ret = register_guest_callback(&reg);
@@ -382,7 +382,7 @@
         struct callback_unregister unreg;
 
         ret = -EFAULT;
-        if ( copy_from_guest( &unreg, arg, 1 ) )
+        if ( copy_from_guest(&unreg, arg, 1) )
             break;
 
         ret = unregister_guest_callback(&unreg);
diff -r be0a1f376223 -r db44b783fe09 xen/arch/x86/x86_64/traps.c
--- a/xen/arch/x86/x86_64/traps.c       Thu Apr  6 15:41:53 2006
+++ b/xen/arch/x86/x86_64/traps.c       Thu Apr  6 16:25:24 2006
@@ -357,6 +357,7 @@
         ret = -EINVAL;
         break;
     }
+
     return ret;
 }
 
@@ -372,7 +373,7 @@
         struct callback_register reg;
 
         ret = -EFAULT;
-        if ( copy_from_guest( &reg, arg, 1 ) )
+        if ( copy_from_guest(&reg, arg, 1) )
             break;
 
         ret = register_guest_callback(&reg);
@@ -384,7 +385,7 @@
         struct callback_unregister unreg;
 
         ret = -EFAULT;
-        if ( copy_from_guest( &unreg, arg, 1 ) )
+        if ( copy_from_guest(&unreg, arg, 1) )
             break;
 
         ret = unregister_guest_callback(&unreg);
@@ -403,15 +404,15 @@
                       unsigned long failsafe_address,
                       unsigned long syscall_address)
 {
-    callback_register_t event = {
+    struct callback_register event = {
         .type = CALLBACKTYPE_event,
         .address = event_address,
     };
-    callback_register_t failsafe = {
+    struct callback_register failsafe = {
         .type = CALLBACKTYPE_failsafe,
         .address = failsafe_address,
     };
-    callback_register_t syscall = {
+    struct callback_register syscall = {
         .type = CALLBACKTYPE_syscall,
         .address = syscall_address,
     };

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