On Mon, 5 Mar 2018 08:27:28 -0300
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> It eases code review, unit is explicit.
>
> Patch generated using:
>
> $ git grep -E '(1024|2048|4096|8192|(<<|>>).?(10|20|30))' hw/ include/hw/
>
> and modified manually.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
> hw/smbios/smbios.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 27a07e96f4..fa02f9ce3f 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -625,10 +625,6 @@ static void smbios_build_type_11_table(void)
> SMBIOS_BUILD_TABLE_POST;
> }
>
> -#define ONE_KB ((ram_addr_t)1 << 10)
> -#define ONE_MB ((ram_addr_t)1 << 20)
> -#define ONE_GB ((ram_addr_t)1 << 30)
> -
> #define MAX_T16_STD_SZ 0x80000000 /* 2T in Kilobytes */
>
> static void smbios_build_type_16_table(unsigned dimm_cnt)
> @@ -640,7 +636,7 @@ static void smbios_build_type_16_table(unsigned dimm_cnt)
> t->location = 0x01; /* Other */
> t->use = 0x03; /* System memory */
> t->error_correction = 0x06; /* Multi-bit ECC (for Microsoft, per SeaBIOS) */
> - size_kb = QEMU_ALIGN_UP(ram_size, ONE_KB) / ONE_KB;
> + size_kb = QEMU_ALIGN_UP(ram_size, K_BYTE) / K_BYTE;
> if (size_kb < MAX_T16_STD_SZ) {
> t->maximum_capacity = cpu_to_le32(size_kb);
> t->extended_maximum_capacity = cpu_to_le64(0);
> @@ -668,7 +664,7 @@ static void smbios_build_type_17_table(unsigned instance, uint64_t size)
> t->memory_error_information_handle = cpu_to_le16(0xFFFE); /* Not provided */
> t->total_width = cpu_to_le16(0xFFFF); /* Unknown */
> t->data_width = cpu_to_le16(0xFFFF); /* Unknown */
> - size_mb = QEMU_ALIGN_UP(size, ONE_MB) / ONE_MB;
> + size_mb = QEMU_ALIGN_UP(size, M_BYTE) / M_BYTE;
> if (size_mb < MAX_T17_STD_SZ) {
> t->size = cpu_to_le16(size_mb);
> t->extended_size = cpu_to_le32(0);
> @@ -707,8 +703,8 @@ static void smbios_build_type_19_table(unsigned instance,
>
> end = start + size - 1;
> assert(end > start);
> - start_kb = start / ONE_KB;
> - end_kb = end / ONE_KB;
> + start_kb = start / K_BYTE;
> + end_kb = end / K_BYTE;
> if (start_kb < UINT32_MAX && end_kb < UINT32_MAX) {
> t->starting_address = cpu_to_le32(start_kb);
> t->ending_address = cpu_to_le32(end_kb);
> @@ -869,7 +865,7 @@ void smbios_get_tables(const struct smbios_phys_mem_area *mem_array,
>
> smbios_build_type_11_table();
>
> -#define MAX_DIMM_SZ (16ll * ONE_GB)
> +#define MAX_DIMM_SZ (16 * G_BYTE)
> #define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \
> : ((ram_size - 1) % MAX_DIMM_SZ) + 1)
>