Re: [PATCH v3 2/5] hw/arm/virt: Rename variable size to region_size in virt_set_high_memmap()
On 9/22/22 01:13, Gavin Shan wrote: > This renames variable 'size' to 'region_size' in virt_set_high_memmap(). > Its counterpart ('region_base') will be introduced in next patch. > > No functional change intended. > > Signed-off-by: Gavin Shan Reviewed-by: Eric Auger Eric > --- > hw/arm/virt.c | 15 --- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 4dab528b82..187b3ee0e2 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1692,15 +1692,16 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState > *vms, int idx) > static void virt_set_high_memmap(VirtMachineState *vms, > hwaddr base, int pa_bits) > { > +hwaddr region_size; > +bool fits; > int i; > > for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { > -hwaddr size = extended_memmap[i].size; > -bool fits; > +region_size = extended_memmap[i].size; > > -base = ROUND_UP(base, size); > +base = ROUND_UP(base, region_size); > vms->memmap[i].base = base; > -vms->memmap[i].size = size; > +vms->memmap[i].size = region_size; > > /* > * Check each device to see if they fit in the PA space, > @@ -1708,9 +1709,9 @@ static void virt_set_high_memmap(VirtMachineState *vms, > * > * For each device that doesn't fit, disable it. > */ > -fits = (base + size) <= BIT_ULL(pa_bits); > +fits = (base + region_size) <= BIT_ULL(pa_bits); > if (fits) { > -vms->highest_gpa = base + size - 1; > +vms->highest_gpa = base + region_size - 1; > } > > switch (i) { > @@ -1725,7 +1726,7 @@ static void virt_set_high_memmap(VirtMachineState *vms, > break; > } > > -base += size; > +base += region_size; > } > } >
[PATCH v3 2/5] hw/arm/virt: Rename variable size to region_size in virt_set_high_memmap()
This renames variable 'size' to 'region_size' in virt_set_high_memmap(). Its counterpart ('region_base') will be introduced in next patch. No functional change intended. Signed-off-by: Gavin Shan --- hw/arm/virt.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4dab528b82..187b3ee0e2 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1692,15 +1692,16 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) static void virt_set_high_memmap(VirtMachineState *vms, hwaddr base, int pa_bits) { +hwaddr region_size; +bool fits; int i; for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { -hwaddr size = extended_memmap[i].size; -bool fits; +region_size = extended_memmap[i].size; -base = ROUND_UP(base, size); +base = ROUND_UP(base, region_size); vms->memmap[i].base = base; -vms->memmap[i].size = size; +vms->memmap[i].size = region_size; /* * Check each device to see if they fit in the PA space, @@ -1708,9 +1709,9 @@ static void virt_set_high_memmap(VirtMachineState *vms, * * For each device that doesn't fit, disable it. */ -fits = (base + size) <= BIT_ULL(pa_bits); +fits = (base + region_size) <= BIT_ULL(pa_bits); if (fits) { -vms->highest_gpa = base + size - 1; +vms->highest_gpa = base + region_size - 1; } switch (i) { @@ -1725,7 +1726,7 @@ static void virt_set_high_memmap(VirtMachineState *vms, break; } -base += size; +base += region_size; } } -- 2.23.0