From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] do_xen_version() cleanup Date: Thu, 5 Mar 2015 15:10:17 +0000 Message-ID: <54F871D9.6050302@citrix.com> References: <54F87B5E0200007800066A4F@mail.emea.novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1736752280427336791==" Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YTXQC-00057J-Ud for xen-devel@lists.xenproject.org; Thu, 05 Mar 2015 15:10:45 +0000 In-Reply-To: <54F87B5E0200007800066A4F@mail.emea.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich , xen-devel Cc: Ian Campbell , Ian Jackson , Keir Fraser , Tim Deegan List-Id: xen-devel@lists.xenproject.org --===============1736752280427336791== Content-Type: multipart/alternative; boundary="------------040500060408070608040001" --------------040500060408070608040001 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit On 05/03/15 14:50, Jan Beulich wrote: > - use exisiting latched value of current->domain where available > - use __copy_to_guest() instead of copy_to_guest() where possible > - drop redundant inclusion of xen/config.h > - drop pointless braces > - consistenly use typedef names > - formatting > > Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper If you are feeling more adventurous with cleanup, there are 4 bits of tailing whitespace which could go, and the prototype could change a signed "cmd" to an unsigned one. > > --- a/xen/common/kernel.c > +++ b/xen/common/kernel.c > @@ -4,7 +4,6 @@ > * Copyright (c) 2002-2005 K A Fraser > */ > > -#include > #include > #include > #include > @@ -233,9 +232,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL > switch ( cmd ) > { > case XENVER_version: > - { > return (xen_major_version() << 16) | xen_minor_version(); > - } > > case XENVER_extraversion: > { > @@ -250,7 +247,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL > > case XENVER_compile_info: > { > - struct xen_compile_info info; > + xen_compile_info_t info; > > memset(&info, 0, sizeof(info)); > safe_strcpy(info.compiler, xen_compiler()); > @@ -279,6 +276,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL > xen_platform_parameters_t params = { > .virt_start = HYPERVISOR_VIRT_START > }; > + > if ( copy_to_guest(arg, ¶ms, 1) ) > return -EFAULT; > return 0; > @@ -310,11 +308,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL > fi.submap = 0; > if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) ) > fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb); > - if ( paging_mode_translate(current->domain) ) > + if ( paging_mode_translate(d) ) > fi.submap |= > (1U << XENFEAT_writable_page_tables) | > (1U << XENFEAT_auto_translated_physmap); > - if ( is_hardware_domain(current->domain) ) > + if ( is_hardware_domain(d) ) > fi.submap |= 1U << XENFEAT_dom0; > #ifdef CONFIG_X86 > switch ( d->guest_type ) > @@ -341,31 +339,25 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL > return -EINVAL; > } > > - if ( copy_to_guest(arg, &fi, 1) ) > + if ( __copy_to_guest(arg, &fi, 1) ) > return -EFAULT; > return 0; > } > > case XENVER_pagesize: > - { > return (!guest_handle_is_null(arg) ? -EINVAL : PAGE_SIZE); > - } > > case XENVER_guest_handle: > - { > if ( copy_to_guest(arg, current->domain->handle, > ARRAY_SIZE(current->domain->handle)) ) > return -EFAULT; > return 0; > - } > > case XENVER_commandline: > - { > if ( copy_to_guest(arg, saved_cmdline, ARRAY_SIZE(saved_cmdline)) ) > return -EFAULT; > return 0; > } > - } > > return -ENOSYS; > } > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel --------------040500060408070608040001 Content-Type: text/html; charset="windows-1252" Content-Transfer-Encoding: 7bit
On 05/03/15 14:50, Jan Beulich wrote:
- use exisiting latched value of current->domain where available
- use __copy_to_guest() instead of copy_to_guest() where possible
- drop redundant inclusion of xen/config.h
- drop pointless braces
- consistenly use typedef names
- formatting

Signed-off-by: Jan Beulich <jbeulich@suse.com>

Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

If you are feeling more adventurous with cleanup, there are 4 bits of tailing whitespace which could go, and the prototype could change a signed "cmd" to an unsigned one.


--- a/xen/common/kernel.c
+++ b/xen/common/kernel.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2002-2005 K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
@@ -233,9 +232,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
     switch ( cmd )
     {
     case XENVER_version:
-    {
         return (xen_major_version() << 16) | xen_minor_version();
-    }
 
     case XENVER_extraversion:
     {
@@ -250,7 +247,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
 
     case XENVER_compile_info:
     {
-        struct xen_compile_info info;
+        xen_compile_info_t info;
 
         memset(&info, 0, sizeof(info));
         safe_strcpy(info.compiler,       xen_compiler());
@@ -279,6 +276,7 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
         xen_platform_parameters_t params = {
             .virt_start = HYPERVISOR_VIRT_START
         };
+
         if ( copy_to_guest(arg, &params, 1) )
             return -EFAULT;
         return 0;
@@ -310,11 +308,11 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
             fi.submap = 0;
             if ( VM_ASSIST(d, VMASST_TYPE_pae_extended_cr3) )
                 fi.submap |= (1U << XENFEAT_pae_pgdir_above_4gb);
-            if ( paging_mode_translate(current->domain) )
+            if ( paging_mode_translate(d) )
                 fi.submap |= 
                     (1U << XENFEAT_writable_page_tables) |
                     (1U << XENFEAT_auto_translated_physmap);
-            if ( is_hardware_domain(current->domain) )
+            if ( is_hardware_domain(d) )
                 fi.submap |= 1U << XENFEAT_dom0;
 #ifdef CONFIG_X86
             switch ( d->guest_type )
@@ -341,31 +339,25 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDL
             return -EINVAL;
         }
 
-        if ( copy_to_guest(arg, &fi, 1) )
+        if ( __copy_to_guest(arg, &fi, 1) )
             return -EFAULT;
         return 0;
     }
 
     case XENVER_pagesize:
-    {
         return (!guest_handle_is_null(arg) ? -EINVAL : PAGE_SIZE);
-    }
 
     case XENVER_guest_handle:
-    {
         if ( copy_to_guest(arg, current->domain->handle,
                            ARRAY_SIZE(current->domain->handle)) )
             return -EFAULT;
         return 0;
-    }
 
     case XENVER_commandline:
-    {
         if ( copy_to_guest(arg, saved_cmdline, ARRAY_SIZE(saved_cmdline)) )
             return -EFAULT;
         return 0;
     }
-    }
 
     return -ENOSYS;
 }






_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------040500060408070608040001-- --===============1736752280427336791== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --===============1736752280427336791==--