[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [Qemu-devel] [PATCH v5 10/46] hw/smbios: Use the IEC
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-trivial] [Qemu-devel] [PATCH v5 10/46] hw/smbios: Use the IEC binary prefix definitions |
Date: |
Wed, 27 Jun 2018 16:03:14 +0200 |
On Mon, 25 Jun 2018 09:42:02 -0300
Philippe Mathieu-Daudé <address@hidden> 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é <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> hw/smbios/smbios.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 27a07e96f4..a27e54b2fa 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -16,6 +16,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/units.h"
> #include "qapi/error.h"
> #include "qemu/config-file.h"
> #include "qemu/error-report.h"
> @@ -625,10 +626,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 +637,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, KiB) / KiB;
> 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 +665,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, MiB) / MiB;
> if (size_mb < MAX_T17_STD_SZ) {
> t->size = cpu_to_le16(size_mb);
> t->extended_size = cpu_to_le32(0);
> @@ -707,8 +704,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 / KiB;
> + end_kb = end / KiB;
> 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 +866,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 * GiB)
> #define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \
> : ((ram_size - 1) % MAX_DIMM_SZ) + 1)
>
- [Qemu-trivial] [PATCH v5 07/46] hw/ivshmem: Use the IEC binary prefix definitions, (continued)
- [Qemu-trivial] [PATCH v5 07/46] hw/ivshmem: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 06/46] hw: Directly use "qemu/units.h" instead of "qemu/cutils.h", Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 05/46] hw: Use IEC binary prefix definitions from "qemu/units.h", Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 09/46] hw/scsi: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 08/46] hw/ipack: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 10/46] hw/smbios: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 12/46] hw/tpm: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 11/46] hw/xen: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 13/46] hw/block: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 15/46] hw/misc: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 16/46] hw/riscv: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 17/46] hw/m68k: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25
- [Qemu-trivial] [PATCH v5 14/46] hw/display: Use the IEC binary prefix definitions, Philippe Mathieu-Daudé, 2018/06/25