From nobody Sun Nov 16 01:00:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1745406584; cv=none; d=zohomail.com; s=zohoarc; b=PfJnaYQEhheZzBsyPVrMs4o1ga3wapy/3ZkanpOCWL/7DWNaAZ8+Tgxpal8216M30Vle7KZT7Anc2yjnCRriH9RRQme43WNM70BZm/iyNpamtn7EkHiWP/SnJOAV3E32lDadAZJ6KPp3rIu7dscQpU4HLq6wwdNhOQv2ukwc4cw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745406584; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=u5Psp4Ree/vPw4pMJqdqWJWCdkKqLYqIDsIUdQtlPpw=; b=kp/A9fOob/leyc5/4sF0E9zTBfRfzJLOWrFDZfJ6juGEgZX17NcVbJyef1yi4WnBcLlCzbmdyOSThb7O1EDSshhYEZM64wb6Zaosxug62fL9ykduZ1/XhsPqltVjvJFiaaz2WtK1sMYIrOqHVt5DnQc4i/p8INtur7UxmPriVSA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1745406584333686.5358716674946; Wed, 23 Apr 2025 04:09:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u7Xwi-0004Xz-Hf; Wed, 23 Apr 2025 07:07:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u7Xwb-0004VZ-Iw for qemu-devel@nongnu.org; Wed, 23 Apr 2025 07:07:10 -0400 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u7XwZ-0000P8-N9 for qemu-devel@nongnu.org; Wed, 23 Apr 2025 07:07:09 -0400 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2254e0b4b79so95671925ad.2 for ; Wed, 23 Apr 2025 04:07:07 -0700 (PDT) Received: from localhost.localdomain ([2804:7f0:bcc0:89f4:3b90:a265:963d:8357]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22c50fdf3b1sm101509895ad.248.2025.04.23.04.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 04:07:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1745406425; x=1746011225; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=u5Psp4Ree/vPw4pMJqdqWJWCdkKqLYqIDsIUdQtlPpw=; b=Ul12k7rn/+kReCn0kqf7mLwJuaLrAiaC8Rridzb0u0aGR71bYbJHWy6nXUCnNUD9sz QMtRvZB0mjnyt4V/HQHRyvfjPotIKs3Y3ysZjasL610mIhHzj5YPHYzHtZuVYQlnduPC mAWPzJ3G1d1vNvRkM3evvrXxXQ7M56kj5RybOuJkCq1c6LfL7AhlL5/qmBSNNyVPKwYg 3BnNG8x7MatSPiH16ZWwZdyhBT7+X77+AbmMV415fYBhIEfeOSUAO6xiyvYRR8XQ1tgj 6C4XEtmJkEY0wdSuVHEKkmjp+AFWFGrg8Hj5hyHxQF7RRDpdBOBWeMXdHD5V4PpFH9dp Krfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745406425; x=1746011225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=u5Psp4Ree/vPw4pMJqdqWJWCdkKqLYqIDsIUdQtlPpw=; b=LX6gdqCUksPb43PFK003R0l2lPVD8Y44NF0PSRaaQ4Hx8MV62fMxw8tBg7DJzdXUKz IjcRtl6KJ4Yf9l7wN5ObMs51J5iZNWVA7D7u/3UdOSqFnz6jeEIb9whqhvWMPUQ56avZ 0WEvjfOzH/TAL0SyqS8ZvpybWmFa36kjiHI5+X/nx5Yzo6jCjKdkFH93OcdUMlAjKq47 YlZEOrXHbjAAm9SbSKHGmxv8MY9cCI0X7NMX7GmfV6r/unSQu264RqQs5mFnytQvG30P eYDHLb/O8dM4x0xm7lxuj4+KlEBvbtpwAvcO2P0tlmnsxiwUICra160bfpPk9AR1uq0M H+Zg== X-Gm-Message-State: AOJu0YyUjwMAnq3Ws12YIcTO6yA2Y6rCqZ6CFJh8i+kQPbMP1Jm4+skm 67JF+uqu0E42+BHeL+q5F3yvEpx6ImA5DNN1LN3//mblAw3PtHPJJsfF7oj/dWvUK9s5XrzZGSs R X-Gm-Gg: ASbGnctVz7rvDUsHOhIq+6uakTe7m6C6H9FnQvxfpQ9TtZbFO6yN4CCv97gFJBgNfgt GZIO9BhVMizIJfNinG1N334CU4/ZT+cUrcQhoKpfzMVuvhkOQua16YGX7gExvxO6JGiQp55y9Xn 24+5tmCKhWmreR7p+b3Ts9JVt9niGBDmqgPr1B8FWXrxPWH9+p3aeozg25kas4aKV8w/VixXirE ZeZ5vIWnnTZP9KYJ4WBN39a62Y/hZXpVToxFW5R5a2xLOkw6dj+abYZqh1r++WthUYMBPhtrG4w 3b98yBGQ0oVDAHbBZYyBqWuineQqmxN+Tz35WP2UAJElyyFyjM4oDHQOZ3gsmLc= X-Google-Smtp-Source: AGHT+IF6Inc6mDQrdrkHImmY/8/y3AkKsxDDsyuDlmS5Lwx3sp0zcl1hhPiAWjd7yjpRz/hrOzHBvA== X-Received: by 2002:a17:903:410a:b0:223:536d:f67b with SMTP id d9443c01a7336-22c53607c21mr251042415ad.38.1745406425563; Wed, 23 Apr 2025 04:07:05 -0700 (PDT) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, Daniel Henrique Barboza Subject: [PATCH 9/9] hw/riscv/virt.c: remove 'long' casts in fmt strings Date: Wed, 23 Apr 2025 08:06:30 -0300 Message-ID: <20250423110630.2249904-10-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423110630.2249904-1-dbarboza@ventanamicro.com> References: <20250423110630.2249904-1-dbarboza@ventanamicro.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=dbarboza@ventanamicro.com; helo=mail-pl1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ventanamicro.com) X-ZM-MESSAGEID: 1745406585469019000 Content-Type: text/plain; charset="utf-8" We can avoid the 'long' casts by using PRIx64 and HWADDR_PRIx on the fmt strings for uint64_t and hwaddr types. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/riscv/virt.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 036a0a9bfb..075c035f25 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -309,7 +309,7 @@ static void create_fdt_socket_memory(RISCVVirtState *s,= int socket) =20 addr =3D s->memmap[VIRT_DRAM].base + riscv_socket_mem_offset(ms, socke= t); size =3D riscv_socket_mem_size(ms, socket); - mem_name =3D g_strdup_printf("/memory@%lx", (long)addr); + mem_name =3D g_strdup_printf("/memory@%"PRIx64, addr); qemu_fdt_add_subnode(ms->fdt, mem_name); qemu_fdt_setprop_cells(ms->fdt, mem_name, "reg", addr >> 32, addr, size >> 32, size); @@ -880,8 +880,8 @@ static void create_fdt_pcie(RISCVVirtState *s, g_autofree char *name =3D NULL; MachineState *ms =3D MACHINE(s); =20 - name =3D g_strdup_printf("/soc/pci@%lx", - (long) s->memmap[VIRT_PCIE_ECAM].base); + name =3D g_strdup_printf("/soc/pci@%"HWADDR_PRIx, + s->memmap[VIRT_PCIE_ECAM].base); qemu_fdt_setprop_cell(ms->fdt, name, "#address-cells", FDT_PCI_ADDR_CELLS); qemu_fdt_setprop_cell(ms->fdt, name, "#interrupt-cells", @@ -925,8 +925,8 @@ static void create_fdt_reset(RISCVVirtState *s, uint32_= t *phandle) MachineState *ms =3D MACHINE(s); =20 test_phandle =3D (*phandle)++; - name =3D g_strdup_printf("/soc/test@%lx", - (long)s->memmap[VIRT_TEST].base); + name =3D g_strdup_printf("/soc/test@%"HWADDR_PRIx, + s->memmap[VIRT_TEST].base); qemu_fdt_add_subnode(ms->fdt, name); { static const char * const compat[3] =3D { @@ -964,8 +964,8 @@ static void create_fdt_uart(RISCVVirtState *s, g_autofree char *name =3D NULL; MachineState *ms =3D MACHINE(s); =20 - name =3D g_strdup_printf("/soc/serial@%lx", - (long)s->memmap[VIRT_UART0].base); + name =3D g_strdup_printf("/soc/serial@%"HWADDR_PRIx, + s->memmap[VIRT_UART0].base); qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_setprop_string(ms->fdt, name, "compatible", "ns16550a"); qemu_fdt_setprop_cells(ms->fdt, name, "reg", @@ -989,7 +989,8 @@ static void create_fdt_rtc(RISCVVirtState *s, g_autofree char *name =3D NULL; MachineState *ms =3D MACHINE(s); =20 - name =3D g_strdup_printf("/soc/rtc@%lx", (long)s->memmap[VIRT_RTC].bas= e); + name =3D g_strdup_printf("/soc/rtc@%"HWADDR_PRIx, + s->memmap[VIRT_RTC].base); qemu_fdt_add_subnode(ms->fdt, name); qemu_fdt_setprop_string(ms->fdt, name, "compatible", "google,goldfish-rtc"); @@ -1042,8 +1043,8 @@ static void create_fdt_virtio_iommu(RISCVVirtState *s= , uint16_t bdf) g_autofree char *iommu_node =3D NULL; g_autofree char *pci_node =3D NULL; =20 - pci_node =3D g_strdup_printf("/soc/pci@%lx", - (long) s->memmap[VIRT_PCIE_ECAM].base); + pci_node =3D g_strdup_printf("/soc/pci@%"HWADDR_PRIx, + s->memmap[VIRT_PCIE_ECAM].base); iommu_node =3D g_strdup_printf("%s/virtio_iommu@%x,%x", pci_node, PCI_SLOT(bdf), PCI_FUNC(bdf)); iommu_phandle =3D qemu_fdt_alloc_phandle(fdt); @@ -1111,8 +1112,8 @@ static void create_fdt_iommu(RISCVVirtState *s, uint1= 6_t bdf) g_autofree char *iommu_node =3D NULL; g_autofree char *pci_node =3D NULL; =20 - pci_node =3D g_strdup_printf("/soc/pci@%lx", - (long) s->memmap[VIRT_PCIE_ECAM].base); + pci_node =3D g_strdup_printf("/soc/pci@%"HWADDR_PRIx, + s->memmap[VIRT_PCIE_ECAM].base); iommu_node =3D g_strdup_printf("%s/iommu@%x", pci_node, bdf); iommu_phandle =3D qemu_fdt_alloc_phandle(fdt); qemu_fdt_add_subnode(fdt, iommu_node); @@ -1181,8 +1182,8 @@ static void create_fdt(RISCVVirtState *s) * The "/soc/pci@..." node is needed for PCIE hotplugs * that might happen before finalize_fdt(). */ - name =3D g_strdup_printf("/soc/pci@%lx", - (long) s->memmap[VIRT_PCIE_ECAM].base); + name =3D g_strdup_printf("/soc/pci@%"HWADDR_PRIx, + s->memmap[VIRT_PCIE_ECAM].base); qemu_fdt_add_subnode(ms->fdt, name); =20 qemu_fdt_add_subnode(ms->fdt, "/chosen"); --=20 2.49.0