From nobody Wed Feb 11 05:14:53 2026 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 152383656986291.03090306717559; Sun, 15 Apr 2018 16:56:09 -0700 (PDT) Received: from localhost ([::1]:52774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rVB-0006A2-1R for importer@patchew.org; Sun, 15 Apr 2018 19:56:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rJH-0004f4-UW for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7rJG-0000TK-Rr for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:43:51 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:40147) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7rJC-0000Qm-10; Sun, 15 Apr 2018 19:43:46 -0400 Received: by mail-qt0-x241.google.com with SMTP id d12so811818qtp.7; Sun, 15 Apr 2018 16:43:45 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.43.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:43:44 -0700 (PDT) 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=nW4d7ZZdSNBJjTgQllexWpB3A0CF3y/UAP01zb3qVEM=; b=u5Blne92GSDd5XnJJP8AWfFe/BMfBA0K6fb5iMyir8h7rBhwLyKMy/zd/mr7ou7Mo5 W+n8s7s/W9k9pVX5glHEdHTi1m0CoPsBgNUptNapbcZUi3JvFzq1OCTijN6g2XgtNXQr EuNOg+0xhjXFIEyDaUNRWmxy99UZK2CjU5deESTEnyM0NbtMuSNCb9ZwUzxBs2Kt0vMo V5ly1Ca8B07XTodzmBK0TePGjwb35YwZ42NXcjO9AsmMRXIWPreoPmEo/q1vGiONfjfA vX2Mo6uR+lCl1Ih1YRgcila6L0IYIIHzHy/xc/AjCTBIkE7uKtBlkqdPOZ6/fGUkLW0P Q/FQ== 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=nW4d7ZZdSNBJjTgQllexWpB3A0CF3y/UAP01zb3qVEM=; b=AgSOu5sqIvi/DEDzH6V/95l9O4DimEJgC7OAOXjfDKAAMENY5fypOQWW9fnM0C5baI iN6BR84q7aBTOs3wTV8JUEJoC/vUO/mH++x6HCjad0+XjF/rn2G+eK6VpVOiOEl681lV E9go+yDDpbtZCucv7mgxcUX8QKvYeYcwsCae+kgxFkKQg1Ws8Gd12WbmMowQRTDT9y1a aZH3YdoUNRaofqDH+iUKXi1CnPtX5Uh6ytPnoxieWqDmkRKSn52oL+tTegof/gU/oBK1 z/MGR0GvpX8SZBkN9zIHkda4zJI3aMzu1mMQ8yPxqywlosVn+EN7QyPyn+khU+Ri8m2Q FpmQ== X-Gm-Message-State: ALQs6tAKAjjyvCqvtnoKWmQ8y3CcDgAzc/1uWh2qknqhOVFGoXTkVR/e Z+16QyhxdqJDTHI1VQqaMGzzRQbU X-Google-Smtp-Source: AIpwx485dG6+8OVc2CUQUYwh1EzFB0S4BZsH+b8JpHKHDhxBZWJDRF3zwLR/De/Q2MhfuZprxhETqg== X-Received: by 10.237.62.25 with SMTP id l25mr4653218qtf.143.1523835825425; Sun, 15 Apr 2018 16:43:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-trivial@nongnu.org, Thomas Huth Date: Sun, 15 Apr 2018 20:42:36 -0300 Message-Id: <20180415234307.28132-11-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180415234307.28132-1-f4bug@amsat.org> References: <20180415234307.28132-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::241 Subject: [Qemu-devel] [PATCH v3 10/41] 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 , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org 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 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=C3=A9 --- 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..a72f35d9f5 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -16,6 +16,7 @@ */ =20 #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; } =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 +637,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 +665,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 +704,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 +866,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.17.0