From nobody Thu Jan 8 13:17:18 2026 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1767050240; cv=none; d=zohomail.com; s=zohoarc; b=TElE36d0LsjwY7Uh6SFJceKylS2kTMjcsvrlRgf8iWj7ptAnN759/YJNyGzNJNEgb0GFJXV8BL8P3RbTzH0Drs1XOKGaJIkh/sxkrOvTFllBfRrMqznTvaibZs0voYLi5JzK9UGP9hiT856Ww5RnB/IG4sWLnChX/Q7usYY/Rbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767050240; h=Content-Type: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=++uoMdw5tHPHy/4X3ZDqK/V4wErwg5CIxJRV4pUz1eg=; b=nCpCA9Bc5pvuxrmjEFP9/QePUYHMiv6ecoDNuBNCS47hCHVS71HimLNDRxZo3XfQBQPfYVPtilja/45uHW/PqOseEXK783QjoiLBZ0912rIsVNvIFmOdUoN+sZbgLqe5hwit2AfhVddEzrgKmMuEmURA9GSY+eDRnvoJ5Qkd5ok= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1767050240851686.8928643050141; Mon, 29 Dec 2025 15:17:20 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vaMTc-0007AX-17; Mon, 29 Dec 2025 18:16:36 -0500 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 1vaMTa-0007A8-6y for qemu-devel@nongnu.org; Mon, 29 Dec 2025 18:16:34 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vaMTY-0004Uz-8i for qemu-devel@nongnu.org; Mon, 29 Dec 2025 18:16:33 -0500 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-477a2ab455fso90455445e9.3 for ; Mon, 29 Dec 2025 15:16:31 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be27b749esm616998525e9.14.2025.12.29.15.16.28 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 29 Dec 2025 15:16:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767050190; x=1767654990; 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=++uoMdw5tHPHy/4X3ZDqK/V4wErwg5CIxJRV4pUz1eg=; b=OkUN+6mq+7xm+2Vs6zxRV3AehoB/o7zGvA9vQMoCO/9yFQMLMo8sCpbE/KYL644qcU qkppcKn4UVTQlau5mWBAkovJxYr5YH6ZnAQVINJqYZGyfh0WO9A0ZzJMYTWJbRNKwCqP Epxysil9zdjdeOQxWZ5JMT0PLZ2xUlZlYvHcr/tVnAu6k48Vqqhqrx5sOAnzNaBAxV39 FaLrcvlXqVizSQlKf7CS3SWj29yyKAoV7549a7R1t+M3v8iLqQNtlN7Rn4qjbANFZmdd Tiit8ku8J3N/uOz+BbxscZNUOi1E9jf90cru1J1XmBlvJLFAnwsiFY9CztsjV/EebXnH 6JYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767050190; x=1767654990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=++uoMdw5tHPHy/4X3ZDqK/V4wErwg5CIxJRV4pUz1eg=; b=nErhvK3VCoDzszg18Pl6jSE16k/Wkrf68Xi/rLSdtgqzTUW9hXeU7IgA1PbwWG6SWh kmNZks81TLrC8JYbNK+fi8Vl/flvkOsrzCcNOFUZLbxgYHCOWIAgL7KKqMn1GCAu62ZR XGOneK/xkHyCQ+hmL0VVQkhVi1zmI88jK3siGWY3OpW8TJWWYv5YUSfaeYz5CnwxQ0Mw UbiJaYKjuYTMTEDOFVA53fuf0Iy4veDJfPcoLgbpVL+xH4PPJ0bHihn9O+R+QppTCc5O Ldf/LlH/uMT0j8BP4ddpSw5CpeE+EnlyiujYUNkitn/bLMCMuarRX2LyzbWZi/5MTWwp 4c0g== X-Gm-Message-State: AOJu0Yz6B0HR5TFFWW9nc1u1BMC/li9/5b42lVvseQFERO0KywnT/6Cr CCCGPTKqr1qKteHEbFNSLdzxv/DOOrI+i6duLUon/PdprvsAmDFpnE+ERjlU3dpL5yzci6keHKU lp37DcPg= X-Gm-Gg: AY/fxX6Oqz6mXBZVlNlbrBgbWJ1OdaUjTNPHA23CtJrxruns2DknrsfvpFhaKcNXQIm X2S1chl7ozj66yBv/wuMUofa7ddEDstCJvn6ilPPxjSK679Yo73bjw3E/40IvJX+xPUpp1sgQ2f HZtIdfet1nCmOx9F822ZZlEvdJ0yQU6lYtdjlUOLDzPStRCMKxI3MsTgfp21YfSeelmHjO30joy +jJjKx2jxF7WlJEcXYiERSUraFYkLuaW+H33Tv6tA8FeOGG97jgdJ9seW7ph5vfdP3g7KkVgq+5 V1wFp1iePRh3nDW1q9oDU+APJBdr/A8+FpQGaRbtv8W6Sw1DxC4E8SBdp/zdUygHG11/6dou0j/ 47Ez1c5VHErp94lN5QuyykGSMJPiqwTjeMtK/74LLWguEK/igPYYkQPLfLuiZEJMowyAqpdgIFK If2UxouqOMzUFrEoFFbaO/wq7yZ4gnCKGKuAKjYEbAZxBUeyb7SZaOEJ7RkgygIe8CpX4fmX4= X-Google-Smtp-Source: AGHT+IHybWv7omPALcBbooy4ivZnJt2kREcR3f2Z7ommtTqLeQ2uYJJ4oJWZsL6uELpLoXj5jXTQ4w== X-Received: by 2002:a05:600c:4e42:b0:47b:de05:aa28 with SMTP id 5b1f17b1804b1-47d1956eb65mr291724075e9.2.1767050190198; Mon, 29 Dec 2025 15:16:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , Anton Johansson , Manos Pitsidianakis , "Dr. David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 6/7] monitor/hmp: Fix coding style in hmp-cmds-target.c Date: Tue, 30 Dec 2025 00:15:44 +0100 Message-ID: <20251229231546.50604-7-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251229231546.50604-1-philmd@linaro.org> References: <20251229231546.50604-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 (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=2a00:1450:4864:20::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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=ham 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 @linaro.org) X-ZM-MESSAGEID: 1767050242404158500 Previous to moving code contained in hmp-cmds-target.c, fix the coding style. Otherwise the checkpatch.pl script would report: ERROR: space required before the open parenthesis '(' #134: FILE: monitor/hmp-cmds-target.c:152: + switch(format) { ERROR: braces {} are necessary for all arms of this statement #154: FILE: monitor/hmp-cmds-target.c:172: + if (l > line_size) [...] ERROR: space required before the open parenthesis '(' #172: FILE: monitor/hmp-cmds-target.c:190: + switch(wsize) { ERROR: space required before the open parenthesis '(' #188: FILE: monitor/hmp-cmds-target.c:206: + switch(format) { ERROR: Don't use '#' flag of printf format ('%#') in format strings, use = '0x' prefix instead #190: FILE: monitor/hmp-cmds-target.c:208: + monitor_printf(mon, "%#*" PRIo64, max_digits, v); WARNING: line over 80 characters #240: FILE: monitor/hmp-cmds-target.c:258: + error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRI= x, addr); WARNING: line over 80 characters #245: FILE: monitor/hmp-cmds-target.c:263: + error_setg(errp, "Memory at address 0x%" HWADDR_PRIx " is not RA= M", addr); ERROR: Don't use '#' flag of printf format ('%#') in format strings, use = '0x' prefix instead #297: FILE: monitor/hmp-cmds-target.c:315: + monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n", WARNING: line over 80 characters #329: FILE: monitor/hmp-cmds-target.c:347: + ret =3D ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (page= size - 1)); Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Manos Pitsidianakis Reviewed-by: Dr. David Alan Gilbert --- monitor/hmp-cmds-target.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c index e782259c3e6..b4360f1f807 100644 --- a/monitor/hmp-cmds-target.c +++ b/monitor/hmp-cmds-target.c @@ -149,7 +149,7 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, } max_digits =3D 0; =20 - switch(format) { + switch (format) { case 'o': max_digits =3D DIV_ROUND_UP(wsize * 8, 3); break; @@ -169,8 +169,9 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, while (len > 0) { monitor_printf(mon, "%0*" PRIx64 ":", addr_width, addr); l =3D len; - if (l > line_size) + if (l > line_size) { l =3D line_size; + } if (is_physical) { AddressSpace *as =3D cs ? cs->as : &address_space_memory; MemTxResult r =3D address_space_read(as, addr, @@ -187,7 +188,7 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, } i =3D 0; while (i < l) { - switch(wsize) { + switch (wsize) { default: case 1: v =3D ldub_p(buf + i); @@ -203,9 +204,9 @@ static void memory_dump(Monitor *mon, int count, int fo= rmat, int wsize, break; } monitor_printf(mon, " "); - switch(format) { + switch (format) { case 'o': - monitor_printf(mon, "%#*" PRIo64, max_digits, v); + monitor_printf(mon, "0%*" PRIo64, max_digits, v); break; case 'x': monitor_printf(mon, "0x%0*" PRIx64, max_digits, v); @@ -255,12 +256,14 @@ void *gpa2hva(MemoryRegion **p_mr, hwaddr addr, uint6= 4_t size, Error **errp) addr, size); =20 if (!mrs.mr) { - error_setg(errp, "No memory is mapped at address 0x%" HWADDR_PRIx,= addr); + error_setg(errp, + "No memory is mapped at address 0x%" HWADDR_PRIx, addr); return NULL; } =20 if (!memory_region_is_ram(mrs.mr) && !memory_region_is_romd(mrs.mr)) { - error_setg(errp, "Memory at address 0x%" HWADDR_PRIx " is not RAM"= , addr); + error_setg(errp, + "Memory at address 0x%" HWADDR_PRIx " is not RAM", addr= ); memory_region_unref(mrs.mr); return NULL; } @@ -312,7 +315,7 @@ void hmp_gva2gpa(Monitor *mon, const QDict *qdict) if (gpa =3D=3D -1) { monitor_printf(mon, "Unmapped\n"); } else { - monitor_printf(mon, "gpa: %#" HWADDR_PRIx "\n", + monitor_printf(mon, "gpa: 0x%" HWADDR_PRIx "\n", gpa + (addr & ~TARGET_PAGE_MASK)); } } @@ -344,7 +347,8 @@ static uint64_t vtop(void *ptr, Error **errp) error_setg(errp, "Page not present"); goto out; } - ret =3D ((pinfo & 0x007fffffffffffffull) * pagesize) | (addr & (pagesi= ze - 1)); + ret =3D (pinfo & 0x007fffffffffffffull) * pagesize; + ret |=3D addr & (pagesize - 1); =20 out: close(fd); --=20 2.52.0