Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf1b9ddf authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Juergen Gross
Browse files

x86: xen: remove unnecessary variable in xen_foreach_remap_area() 



Remove unnecessary variable mfn in function xen_foreach_remap_area() and,
refactor the code.

Variable mfn at line 518:mfn = xen_remap_buf.mfns[i];
is only being used to store a value to be passed as
an argument to the xen_update_mem_tables() function.
This value can be passed directly, which makes variable
mfn unnecessary. Also, value assigned to variable mfn
at line 534:mfn = xen_remap_mfn; is never used.

Addresses-Coverity-ID: 1260110
Signed-off-by: default avatarGustavo A. R. Silva <garsilva@embeddedor.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent a5d5f328

arch/x86/xen/setup.c

+2 −5
Original line number Diff line number Diff line
@@ -499,7 +499,7 @@ static unsigned long __init xen_foreach_remap_area(unsigned long nr_pages, 
void __init xen_remap_memory(void)

{

	unsigned long buf = (unsigned long)&xen_remap_buf;

	unsigned long mfn_save, mfn, pfn;

	unsigned long mfn_save, pfn;

	unsigned long remapped = 0;

	unsigned int i;

	unsigned long pfn_s = ~0UL;
@@ -515,8 +515,7 @@ void __init xen_remap_memory(void) 


		pfn = xen_remap_buf.target_pfn;

		for (i = 0; i < xen_remap_buf.size; i++) {

			mfn = xen_remap_buf.mfns[i];

			xen_update_mem_tables(pfn, mfn);

			xen_update_mem_tables(pfn, xen_remap_buf.mfns[i]);

			remapped++;

			pfn++;

		}
@@ -530,8 +529,6 @@ void __init xen_remap_memory(void) 
			pfn_s = xen_remap_buf.target_pfn;

			len = xen_remap_buf.size;

		}



		mfn = xen_remap_mfn;

		xen_remap_mfn = xen_remap_buf.next_area_mfn;

	}