From nobody Wed Feb 11 05:11:49 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 1523838211221259.19782624556683; Sun, 15 Apr 2018 17:23:31 -0700 (PDT) Received: from localhost ([::1]:53846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rve-0004UC-E9 for importer@patchew.org; Sun, 15 Apr 2018 20:23:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7rL2-0006Yi-2s for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:45:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7rL0-0001tS-FS for qemu-devel@nongnu.org; Sun, 15 Apr 2018 19:45:40 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:38600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7rKv-0001qQ-Fh; Sun, 15 Apr 2018 19:45:33 -0400 Received: by mail-qt0-x244.google.com with SMTP id z23so13564646qti.5; Sun, 15 Apr 2018 16:45:33 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id d1sm1081394qtk.57.2018.04.15.16.45.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 16:45:32 -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=+WqG1Y6FRlxIu3Tc3DagXW6yWpRzWHsMpc65faz12FM=; b=nxf+k5MZE1QpewKo5fb8kgTmZ+DujcgU6jlO7ineY9FuacO1h3AU+ZRWCsYwKEadyF wjFMZOBJojjk8l6/prvZgzKobcEmW9JnZ9BH9aQhZugYgoR7HOctQFF6FtuenSwwnwsA dIDC7/lWAz2i63ieITpHLrEJ3gxbpeIwzfUnCF22mlsZaOkYH4Vdx0sSW8WpFKJc8qAL 2ozAVR83p/9ZvjlmMGLBvfxrOW2Szp66oWKXE3bRgZmgGnOVsgVqbcCqTFQaLMrKCJ7l v8KOB0UL4no+usctW2pvhxOzArICVP/YAxl3ocMrU7t+/jO518TJaG+PgBQxQGsRxtpc ZSRA== 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=+WqG1Y6FRlxIu3Tc3DagXW6yWpRzWHsMpc65faz12FM=; b=L5IypdJM9Y6UK8vLeQBvNoNXsDIaEgepRpv6GnPHYEYt7fw3gmll1Hv/TQ8b0OQjug hWPmtfLIG58r2tRQ6nfr5mDSzqHF6hDvWtttV7rwO54xuzFAG9ctTopj4b0NzShfyF3b TOewQovHrjDYInUP+p6dtBqHMD0CkK98WKcSGLwPyaWeL86jEk+B08rJS1Sd5ucneBhh owrrwErTZSUKMzdYkDpc8F721NXn0k1oe4Hta/evNdUMMBxJcK3DSrQGickiX/Iy1k6H eQj0PJKpGoZfHT9q/hfJHsBbVYqdtz0b2nH/bIGBCvbN92VrS4/91ViQGSomoA/YrpE5 T8wg== X-Gm-Message-State: ALQs6tBC0qLRd7yQ3HwyajerbGDWnI3fMVRLS+PdqvepQWruAqvPKVt6 GEljuG3uZmY/dDNuDi9G00j3eoIqUgg= X-Google-Smtp-Source: AIpwx48lAP+KbY3j10M4RnrkmTlNrf3rvE35Wk6lhr/TL8UWnp8DcXnYVE7y4u58kcPCbYOdx5+Z7g== X-Received: by 10.237.62.25 with SMTP id l25mr4658023qtf.143.1523835932828; Sun, 15 Apr 2018 16:45:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-trivial@nongnu.org, Thomas Huth Date: Sun, 15 Apr 2018 20:43:06 -0300 Message-Id: <20180415234307.28132-41-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::244 Subject: [Qemu-devel] [PATCH v3 40/41] hw/loader: 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: Paul Burton , =?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 --- include/hw/loader.h | 5 +++-- hw/core/loader-fit.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/hw/loader.h b/include/hw/loader.h index 5ed3fd8ae6..2222ca4184 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -1,5 +1,6 @@ #ifndef LOADER_H #define LOADER_H +#include "qemu/units.h" #include "hw/nvram/fw_cfg.h" =20 /* loader.c */ @@ -52,7 +53,7 @@ int load_image_mr(const char *filename, MemoryRegion *mr); * load_image_gzipped_buffer() and load_image_gzipped() will read. It prev= ents * g_malloc() in those functions from allocating a huge amount of memory. */ -#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20) +#define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 * M_BYTE) =20 int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, uint8_t **buffer); @@ -253,6 +254,6 @@ int rom_add_option(const char *file, int32_t bootindex); =20 /* This is the usual maximum in uboot, so if a uImage overflows this, it w= ould * overflow on real hardware too. */ -#define UBOOT_MAX_GUNZIP_BYTES (64 << 20) +#define UBOOT_MAX_GUNZIP_BYTES (64 * M_BYTE) =20 #endif diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c index 0c4a7207f4..0117104d69 100644 --- a/hw/core/loader-fit.c +++ b/hw/core/loader-fit.c @@ -22,7 +22,7 @@ #include "exec/memory.h" #include "hw/loader.h" #include "hw/loader-fit.h" -#include "qemu/cutils.h" +#include "qemu/units.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" #include "sysemu/sysemu.h" --=20 2.17.0