diff mbox

x86/PoD: drop a pointless local variable

Message ID 592E9265020000780015E085@prv-mh.provo.novell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jan Beulich May 31, 2017, 7:52 a.m. UTC 
... and move another one into a more narrow scope.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
x86/PoD: drop a pointless local variable

... and move another one into a more narrow scope.

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

--- a/xen/arch/x86/mm/p2m-pod.c
+++ b/xen/arch/x86/mm/p2m-pod.c
@@ -1180,8 +1180,6 @@ guest_physmap_mark_populate_on_demand(st
 {
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
     unsigned long i, n, pod_count = 0;
-    p2m_type_t ot;
-    mfn_t omfn;
     int rc = 0;
 
     if ( !paging_mode_translate(d) )
@@ -1194,10 +1192,11 @@ guest_physmap_mark_populate_on_demand(st
     /* Make sure all gpfns are unused */
     for ( i = 0; i < (1UL << order); i += n )
     {
+        p2m_type_t ot;
         p2m_access_t a;
         unsigned int cur_order;
 
-        omfn = p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
+        p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
         n = 1UL << min(order, cur_order);
         if ( p2m_is_ram(ot) )
         {

Comments

George Dunlap June 5, 2017, 9:53 a.m. UTC | #1 
On Wed, May 31, 2017 at 8:52 AM, Jan Beulich <JBeulich@suse.com> wrote:
> ... and move another one into a more narrow scope.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

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

>
> --- a/xen/arch/x86/mm/p2m-pod.c
> +++ b/xen/arch/x86/mm/p2m-pod.c
> @@ -1180,8 +1180,6 @@ guest_physmap_mark_populate_on_demand(st
>  {
>      struct p2m_domain *p2m = p2m_get_hostp2m(d);
>      unsigned long i, n, pod_count = 0;
> -    p2m_type_t ot;
> -    mfn_t omfn;
>      int rc = 0;
>
>      if ( !paging_mode_translate(d) )
> @@ -1194,10 +1192,11 @@ guest_physmap_mark_populate_on_demand(st
>      /* Make sure all gpfns are unused */
>      for ( i = 0; i < (1UL << order); i += n )
>      {
> +        p2m_type_t ot;
>          p2m_access_t a;
>          unsigned int cur_order;
>
> -        omfn = p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
> +        p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
>          n = 1UL << min(order, cur_order);
>          if ( p2m_is_ram(ot) )
>          {
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel
>
diff mbox

Patch

--- a/xen/arch/x86/mm/p2m-pod.c
+++ b/xen/arch/x86/mm/p2m-pod.c
@@ -1180,8 +1180,6 @@  guest_physmap_mark_populate_on_demand(st
 {
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
     unsigned long i, n, pod_count = 0;
-    p2m_type_t ot;
-    mfn_t omfn;
     int rc = 0;
 
     if ( !paging_mode_translate(d) )
@@ -1194,10 +1192,11 @@  guest_physmap_mark_populate_on_demand(st
     /* Make sure all gpfns are unused */
     for ( i = 0; i < (1UL << order); i += n )
     {
+        p2m_type_t ot;
         p2m_access_t a;
         unsigned int cur_order;
 
-        omfn = p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
+        p2m->get_entry(p2m, gfn + i, &ot, &a, 0, &cur_order, NULL);
         n = 1UL << min(order, cur_order);
         if ( p2m_is_ram(ot) )
         {