]> xenbits.xensource.com Git - people/royger/xen.git/commitdiff
x86/hvm: Don't shadow the domain parameter in hvm_save_cpu_msrs()
authorAndrew Cooper <andrew.cooper3@citrix.com>
Tue, 20 Feb 2018 11:08:32 +0000 (11:08 +0000)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Mon, 26 Feb 2018 17:48:44 +0000 (17:48 +0000)
c/s d2f86bf604 which introduced "struct hvm_save_descriptor *d" accidentally
ended up shadowing the "struct domain *d" function parameter.  Rename the
former to desc.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
xen/arch/x86/hvm/hvm.c

index 91bc3e8b27eef4820f6d016233e432a6650e6be5..5d3921051b0d96f294c020529efdd6f0de691407 100644 (file)
@@ -1338,7 +1338,7 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h)
 
     for_each_vcpu ( d, v )
     {
-        struct hvm_save_descriptor *d = _p(&h->data[h->cur]);
+        struct hvm_save_descriptor *desc = _p(&h->data[h->cur]);
         struct hvm_msr *ctxt;
         unsigned int i;
 
@@ -1386,7 +1386,7 @@ static int hvm_save_cpu_msrs(struct domain *d, hvm_domain_context_t *h)
         if ( ctxt->count )
         {
             /* Rewrite length to indicate how much space we actually used. */
-            d->length = HVM_CPU_MSR_SIZE(ctxt->count);
+            desc->length = HVM_CPU_MSR_SIZE(ctxt->count);
             h->cur += HVM_CPU_MSR_SIZE(ctxt->count);
         }
         else