[PATCH] x86/p2m: Reposition p2m_teardown_nestedp2m() to avoid its forward declaration

[PATCH] x86/p2m: Reposition p2m_teardown_nestedp2m() to avoid its forward declaration

[Andrew Cooper]

While adjusting these functions, use unsigned int rather than uint8_t for the
loop variable, and fix the whitespace style.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Tim Deegan <tim@xen.org>
CC: George Dunlap <george.dunlap@eu.citrix.com>
---
 xen/arch/x86/mm/p2m.c | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 6548e9f..7675e9c 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -147,15 +147,29 @@ static void p2m_teardown_hostp2m(struct domain *d)
     }
 }
 
-static void p2m_teardown_nestedp2m(struct domain *d);
+static void p2m_teardown_nestedp2m(struct domain *d)
+{
+    unsigned int i;
+    struct p2m_domain *p2m;
+
+    for ( i = 0; i < MAX_NESTEDP2M; i++ )
+    {
+        if ( !d->arch.nested_p2m[i] )
+            continue;
+        p2m = d->arch.nested_p2m[i];
+        list_del(&p2m->np2m_list);
+        p2m_free_one(p2m);
+        d->arch.nested_p2m[i] = NULL;
+    }
+}
 
 static int p2m_init_nestedp2m(struct domain *d)
 {
-    uint8_t i;
+    unsigned int i;
     struct p2m_domain *p2m;
 
     mm_lock_init(&d->arch.nested_p2m_lock);
-    for (i = 0; i < MAX_NESTEDP2M; i++)
+    for ( i = 0; i < MAX_NESTEDP2M; i++ )
     {
         d->arch.nested_p2m[i] = p2m = p2m_init_one(d);
         if ( p2m == NULL )
@@ -171,22 +185,6 @@ static int p2m_init_nestedp2m(struct domain *d)
     return 0;
 }
 
-static void p2m_teardown_nestedp2m(struct domain *d)
-{
-    uint8_t i;
-    struct p2m_domain *p2m;
-
-    for (i = 0; i < MAX_NESTEDP2M; i++)
-    {
-        if ( !d->arch.nested_p2m[i] )
-            continue;
-        p2m = d->arch.nested_p2m[i];
-        list_del(&p2m->np2m_list);
-        p2m_free_one(p2m);
-        d->arch.nested_p2m[i] = NULL;
-    }
-}
-
 static void p2m_teardown_altp2m(struct domain *d)
 {
     unsigned int i;
-- 
2.1.4


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

Re: [PATCH] x86/p2m: Reposition p2m_teardown_nestedp2m() to avoid its forward declaration

[Jan Beulich]

>>> On 07.02.17 at 19:43, <andrew.cooper3@citrix.com> wrote:
> While adjusting these functions, use unsigned int rather than uint8_t for the
> loop variable, and fix the whitespace style.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

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



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

Re: [PATCH] x86/p2m: Reposition p2m_teardown_nestedp2m() to avoid its forward declaration

[George Dunlap]

On 07/02/17 18:43, Andrew Cooper wrote:
> While adjusting these functions, use unsigned int rather than uint8_t for the
> loop variable, and fix the whitespace style.
> 
> No functional change.

I think changing a variable from 8 to 64 bits might count as a
functional change; but anyway:

Reviewed-by: George Dunlap <george.dunlap@citrix.com>

> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> ---
> CC: Jan Beulich <JBeulich@suse.com>
> CC: Tim Deegan <tim@xen.org>
> CC: George Dunlap <george.dunlap@eu.citrix.com>
> ---
>  xen/arch/x86/mm/p2m.c | 36 +++++++++++++++++-------------------
>  1 file changed, 17 insertions(+), 19 deletions(-)
> 
> diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
> index 6548e9f..7675e9c 100644
> --- a/xen/arch/x86/mm/p2m.c
> +++ b/xen/arch/x86/mm/p2m.c
> @@ -147,15 +147,29 @@ static void p2m_teardown_hostp2m(struct domain *d)
>      }
>  }
>  
> -static void p2m_teardown_nestedp2m(struct domain *d);
> +static void p2m_teardown_nestedp2m(struct domain *d)
> +{
> +    unsigned int i;
> +    struct p2m_domain *p2m;
> +
> +    for ( i = 0; i < MAX_NESTEDP2M; i++ )
> +    {
> +        if ( !d->arch.nested_p2m[i] )
> +            continue;
> +        p2m = d->arch.nested_p2m[i];
> +        list_del(&p2m->np2m_list);
> +        p2m_free_one(p2m);
> +        d->arch.nested_p2m[i] = NULL;
> +    }
> +}
>  
>  static int p2m_init_nestedp2m(struct domain *d)
>  {
> -    uint8_t i;
> +    unsigned int i;
>      struct p2m_domain *p2m;
>  
>      mm_lock_init(&d->arch.nested_p2m_lock);
> -    for (i = 0; i < MAX_NESTEDP2M; i++)
> +    for ( i = 0; i < MAX_NESTEDP2M; i++ )
>      {
>          d->arch.nested_p2m[i] = p2m = p2m_init_one(d);
>          if ( p2m == NULL )
> @@ -171,22 +185,6 @@ static int p2m_init_nestedp2m(struct domain *d)
>      return 0;
>  }
>  
> -static void p2m_teardown_nestedp2m(struct domain *d)
> -{
> -    uint8_t i;
> -    struct p2m_domain *p2m;
> -
> -    for (i = 0; i < MAX_NESTEDP2M; i++)
> -    {
> -        if ( !d->arch.nested_p2m[i] )
> -            continue;
> -        p2m = d->arch.nested_p2m[i];
> -        list_del(&p2m->np2m_list);
> -        p2m_free_one(p2m);
> -        d->arch.nested_p2m[i] = NULL;
> -    }
> -}
> -
>  static void p2m_teardown_altp2m(struct domain *d)
>  {
>      unsigned int i;
> 


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