From nobody Fri Oct 24 20:16:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518670112370665.8345254174637; Wed, 14 Feb 2018 20:48:32 -0800 (PST) Received: from localhost ([::1]:37647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBTC-0007VU-Mm for importer@patchew.org; Wed, 14 Feb 2018 23:48:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emBBh-0008QZ-Jl for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emBBg-0004YR-GU for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:25 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1emBBg-0004Xd-CR for qemu-devel@nongnu.org; Wed, 14 Feb 2018 23:30:24 -0500 Received: by mail-qt0-x243.google.com with SMTP id d14so10487051qtg.1 for ; Wed, 14 Feb 2018 20:30:24 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id t33sm10680312qtc.14.2018.02.14.20.30.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 20:30:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4qu1vRUPT+kT3qJ5s4pNSuwaEOiiNVddagmnnbqz0t8=; b=LTjKn4cl3T/5I3viN748ONyUduEeKRaCE5igDPm9o6YKlvfuyGdktb7zvTLk+q0yIG 1Po8k3z7tU3dqQGtyLGU6ETgFRxMMofEWDo3BxHCQOetHnz1uT+LZa7QyPOO8l9ZKxK+ KisQaBIp7debPiU6PhV93gTwh2hPCbYZtSEVlajN56fWUgBzDDZbmj0IH2Wy2MUt4vkJ uGYfETpdNvpQntxWhowNObC/as8A68qGE8vb7EAOdb/w9eZuy2nTv5c7A4u8w+3gWkoQ Dw8KIgB8mv58UYHrLWyzgasHd0ZMoFTZO2oknppNo2/PfhmwnySIiyadN6x/LN2tP3lo eGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4qu1vRUPT+kT3qJ5s4pNSuwaEOiiNVddagmnnbqz0t8=; b=WmDjxc0O31K4sV24Ds5RGNLUtYZncIuNV4JrTrTyK/MpXXnWPhCvk2+daMtXvz9N5M J6f6vWAz4/2enkFrjlRKDmwsvZB+8GsClDO8Udkf9+YDokeAOSb28uW+zgwZ915iDrdw rmdojpE11PGCQkMcM4Zu5kC/WNcrVZvCa0ouK/vrVGNa5KED0bE4gYIUArRVAKnOAOcH EjH1+TQBzafTJPigXUVzydwRgJN2LrOAu+h5ySMbumOvmonkONvjWZklMNxIglDiYoEK FACs69KsdcH5anwLQlScfucKu8m6PeGrAg8dUXsYnVIZofth1q6Olw6kbLmWhUlEAMS1 9PPw== X-Gm-Message-State: APf1xPD3IvCgTjVKtR75yPkGEG8EYLRZZkgK2rNFkxj8Ea97ul2XHyO3 dIa6Ny4AEWJ/7ASGnIprnCjOlwEx X-Google-Smtp-Source: AH8x22647ONF4q5b4T7xIQl4l7Orlw8JbdAQ+sZJqnWUdkuKzwUCA4cfnY4UlL+CGe/akFN9zdmuaQ== X-Received: by 10.200.4.159 with SMTP id s31mr2312168qtg.144.1518669023807; Wed, 14 Feb 2018 20:30:23 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Thu, 15 Feb 2018 01:28:56 -0300 Message-Id: <20180215042900.16078-27-f4bug@amsat.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180215042900.16078-1-f4bug@amsat.org> References: <20180215042900.16078-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH 26/30] hw/smbios: use the BYTE-based definitions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 It ease code review, unit is explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov --- 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; } =20 -#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 */ =20 static void smbios_build_type_16_table(unsigned dimm_cnt) @@ -640,7 +636,7 @@ static void smbios_build_type_16_table(unsigned dimm_cn= t) t->location =3D 0x01; /* Other */ t->use =3D 0x03; /* System memory */ t->error_correction =3D 0x06; /* Multi-bit ECC (for Microsoft, per Sea= BIOS) */ - size_kb =3D QEMU_ALIGN_UP(ram_size, ONE_KB) / ONE_KB; + size_kb =3D QEMU_ALIGN_UP(ram_size, K_BYTE) / K_BYTE; if (size_kb < MAX_T16_STD_SZ) { t->maximum_capacity =3D cpu_to_le32(size_kb); t->extended_maximum_capacity =3D cpu_to_le64(0); @@ -668,7 +664,7 @@ static void smbios_build_type_17_table(unsigned instanc= e, uint64_t size) t->memory_error_information_handle =3D cpu_to_le16(0xFFFE); /* Not pro= vided */ t->total_width =3D cpu_to_le16(0xFFFF); /* Unknown */ t->data_width =3D cpu_to_le16(0xFFFF); /* Unknown */ - size_mb =3D QEMU_ALIGN_UP(size, ONE_MB) / ONE_MB; + size_mb =3D QEMU_ALIGN_UP(size, M_BYTE) / M_BYTE; if (size_mb < MAX_T17_STD_SZ) { t->size =3D cpu_to_le16(size_mb); t->extended_size =3D cpu_to_le32(0); @@ -707,8 +703,8 @@ static void smbios_build_type_19_table(unsigned instanc= e, =20 end =3D start + size - 1; assert(end > start); - start_kb =3D start / ONE_KB; - end_kb =3D end / ONE_KB; + start_kb =3D start / K_BYTE; + end_kb =3D end / K_BYTE; if (start_kb < UINT32_MAX && end_kb < UINT32_MAX) { t->starting_address =3D cpu_to_le32(start_kb); t->ending_address =3D cpu_to_le32(end_kb); @@ -869,7 +865,7 @@ void smbios_get_tables(const struct smbios_phys_mem_are= a *mem_array, =20 smbios_build_type_11_table(); =20 -#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) =20 --=20 2.16.1