From nobody Tue Nov 4 18:42:06 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530339528601872.3914116881358; Fri, 29 Jun 2018 23:18:48 -0700 (PDT) Received: from localhost ([::1]:45704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ9Db-0002Di-Qh for importer@patchew.org; Sat, 30 Jun 2018 02:18:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37840) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZ964-00045k-9O for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZ960-0001su-AU for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:11:00 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:41188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZ960-0001r9-29 for qemu-devel@nongnu.org; Sat, 30 Jun 2018 02:10:56 -0400 Received: by mail-wr0-x241.google.com with SMTP id h10-v6so10635236wrq.8 for ; Fri, 29 Jun 2018 23:10:56 -0700 (PDT) Received: from donizetti.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 24-v6sm563454wrz.94.2018.06.29.23.10.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Jun 2018 23:10:54 -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=ooxk8Lq0S5uWusor019OFFu0Yf3KP91shLnSI32amJA=; b=OwT+c3q622lV0WSrmRnhOMj5XsRZj8bWyNqsjLyDXyZ7vte5n5NzxMsTmMzChzKsDs bsaZ48+iY+udOh9g763OLtalLphe0eHheXFs6NBeGncNndOz7uhsnRFaA6vdQaC+F2O5 APMzVApSQEYq1fyda8P+IQmFmyYwf/VqejTvqZYJFe2dyfQgFHZHxbU15GMNpCSP15Sh 1ALbapLOy7Ah1Ml0eO8XhIAtHGHcmHrg1j3bQoBuZGdvaIjk9f/bYEML6ilV8FNw9dYk 3CM8uZrt1TkcvxPkNNfMITvayDSUc/VzhOGAlwax7anIqEmRH7eWy54x2uvaQ56COTzG WYxw== 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=ooxk8Lq0S5uWusor019OFFu0Yf3KP91shLnSI32amJA=; b=UgDw9oA4WBMoxTmw3iK6aXto3+TAs82eerDQaLP+50qeh6ZngJS7vhF3ooH/YrlBTm vI1buBKdg1+vGeRd/SRUb5zEu308OYWY15JfTjDVUXHQuq8LkdmbqoPEgWqxAjHnGeOD VvX7IhDXsxCSNnq5RlfckBNFKSxF1wnxzKhlnFjEwfR+copDjTddWtxAP6CH9LJU35yT hm/tEoM48vjcNFxHT/moZzfvYeI6Ip2fdFljyvnDyhrAcxi5K2xB6DWxAbBB1pbIh9D3 iVBc789ZtT3UmA60ep9F/b0cDIp3dfrsa7YEPUikPoUzET3xwtgWPcABRnOMPHvgmXc5 6aXA== X-Gm-Message-State: APt69E3LOLHOnjjZhT10SAQlr7Q73UMu2hvjQvjGopWRzYHeirGETuWg SawFPCrxpA37Ym9OjhS7ldcAGjWD X-Google-Smtp-Source: AAOMgpe/WMvOFB7AjyzCst6el5eNCltJgfkx25DMfbbnfC8iavL7hrzIpaP3gwSTQmCfB4yH4Vh+1Q== X-Received: by 2002:adf:e841:: with SMTP id d1-v6mr549182wrn.269.1530339054938; Fri, 29 Jun 2018 23:10:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 30 Jun 2018 08:10:05 +0200 Message-Id: <20180630061040.6018-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180630061040.6018-1-pbonzini@redhat.com> References: <20180630061040.6018-1-pbonzini@redhat.com> 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: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PULL 12/47] hw/smbios: Use the IEC binary prefix 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= 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 From: Philippe Mathieu-Daud=C3=A9 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 Message-Id: <20180625124238.25339-11-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- 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 27a07e9..a27e54b 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, KiB) / KiB; 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, MiB) / MiB; 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 / KiB; + end_kb =3D end / KiB; 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 * GiB) #define GET_DIMM_SZ ((i < dimm_cnt - 1) ? MAX_DIMM_SZ \ : ((ram_size - 1) % MAX_DIMM_SZ) += 1) =20 --=20 1.8.3.1