From patchwork Mon Nov 1 08:27:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1549022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HjR570Lwjz9sXM for ; Mon, 1 Nov 2021 19:28:42 +1100 (AEDT) Received: from localhost ([::1]:36606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mhSgK-0005yz-Ko for incoming@patchwork.ozlabs.org; Mon, 01 Nov 2021 04:28:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhSfe-0005v8-BY; Mon, 01 Nov 2021 04:27:58 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:44745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mhSfc-00086J-4n; Mon, 01 Nov 2021 04:27:58 -0400 Received: from quad ([82.142.14.190]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MFb38-1mQOz203DC-00HB8Q; Mon, 01 Nov 2021 09:27:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/6] monitor: Trim some trailing space from human-readable output Date: Mon, 1 Nov 2021 09:27:42 +0100 Message-Id: <20211101082747.2524909-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211101082747.2524909-1-laurent@vivier.eu> References: <20211101082747.2524909-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:uKGNeJnaNMjzS72yERCQlhOgHt3P3Qf8bUqkpsxi61YLpgElKP2 4PSiFM2FmctiOrOBjxVK7SrOG/fFZVfzquoH+QpyC6FmEW4JKFmL9jBwjh493L/YladORtn kVToRJEymbUP1bGooU4YDTGLjYa/f70P75k28w55KRz8vULGXXCN5H70f2KiFCuo7g5rOdc hiSZYccttX74AdcnLXUSg== X-UI-Out-Filterresults: notjunk:1;V03:K0:8FGewMwOW6c=:7u4CILcK/TYz7QCLfy6Vzo gaodSnQlEo3p3zykaUH1p1yuk7oPSeClB6A1ell31tLlTkziRrXZlHpAWYs4ai7J6ajJgYjhg EWX1JLKzBVzl8ipesr31VmJZaVr0L3tge4frgQecI3Ou6vjBgOulwKymqkj0kJoqY0RKE4gW3 KQhUpoE2O6cqzB967hUG7NqbNunKFHICfKjkxLC8lH5ph7h5eoq2aG6qAWUJpdtJbmWAi9pXu AYyV4t+qBhTau7fj/gCO+gaQfxArpzT14hkenrtWrWP4RjE/wG0MjE/y65tVrXNzsKbR0+LKv +o/FBB3ZqIH0SwygmS8nwNVWkbq5kbsU8gQe291yT3LHing7qi1svaPJemSyBSZwbl2WyGOPM nVm1S1X6c59f4mdWx1w3mP/yJbnLfSuSzGIxemixnJwkO9WQuNJiM59bPB0VBuah+x9Z35l17 kqDQhfkE7nB0Nfmet1zQdu6H6Jbai+Yf+xlJn4ecNcwS6fT2H3XYackUqUgQbPCBBn07mEupF 0rDi4ap7UqMvpT273lMmBYWqIjs7eD6+8UcNYUvUNhF1JmJLiL7yXAsNIRt4MEtMcv1rARWJV an04ZbEBfrZ6FgxwXqmqx4pXbfmt2tCn5UcV6vvAwKW3cPBk6trpkdNcO82NQh+RsU77pCaIq lRNrw7tspuRWf5t+0Tf3hJ8L2f4XFWWdWUdXHFdM78mDUs2KkVoO85hCqCh0mWtyab+U= Received-SPF: none client-ip=212.227.126.131; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Richard Henderson , Markus Armbruster , Greg Kurz , Max Filippov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster I noticed -cpu help printing enough trailing spaces to make the output at least 84 characters wide. Looks ugly unless the terminal is wider. Ugly or not, trailing spaces are stupid. The culprit is this line in x86_cpu_list_entry(): qemu_printf("x86 %-20s %-58s\n", name, desc); This prints a string with minimum field left-justified right before a newline. Change it to qemu_printf("x86 %-20s %s\n", name, desc); which avoids the trailing spaces and is simpler to boot. A search for the pattern with "git-grep -E '%-[0-9]+s\\n'" found a few more instances. Change them similarly. Signed-off-by: Markus Armbruster Reviewed-by: Richard Henderson Acked-by: Greg Kurz Reviewed-by: Philippe Mathieu-Daudé Acked-by: Max Filippov Message-Id: <20211009152401.2982862-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- monitor/hmp-cmds.c | 2 +- target/i386/cpu-dump.c | 4 ++-- target/i386/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/s390x/cpu_models.c | 4 ++-- target/xtensa/mmu_helper.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index bcaa41350e9a..9e45a138a505 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -1945,7 +1945,7 @@ void hmp_rocker_ports(Monitor *mon, const QDict *qdict) monitor_printf(mon, " port link duplex neg?\n"); for (port = list; port; port = port->next) { - monitor_printf(mon, "%10s %-4s %-3s %2s %-3s\n", + monitor_printf(mon, "%10s %-4s %-3s %2s %s\n", port->value->name, port->value->enabled ? port->value->link_up ? "up" : "down" : "!ena", diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index 02b635a52cff..08ac957e99cf 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -464,13 +464,13 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, int flags) snprintf(cc_op_name, sizeof(cc_op_name), "[%d]", env->cc_op); #ifdef TARGET_X86_64 if (env->hflags & HF_CS64_MASK) { - qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%-8s\n", + qemu_fprintf(f, "CCS=%016" PRIx64 " CCD=%016" PRIx64 " CCO=%s\n", env->cc_src, env->cc_dst, cc_op_name); } else #endif { - qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%-8s\n", + qemu_fprintf(f, "CCS=%08x CCD=%08x CCO=%s\n", (uint32_t)env->cc_src, (uint32_t)env->cc_dst, cc_op_name); } diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 598d451dcf04..c5744ce08cf9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4878,7 +4878,7 @@ static void x86_cpu_list_entry(gpointer data, gpointer user_data) desc = g_strdup_printf("%s", model_id); } - qemu_printf("x86 %-20s %-58s\n", name, desc); + qemu_printf("x86 %-20s %s\n", name, desc); } /* list available CPU models and flags */ diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 65545ba9ca8d..ba384a592bc1 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -8734,7 +8734,7 @@ void ppc_cpu_list(void) #ifdef CONFIG_KVM qemu_printf("\n"); - qemu_printf("PowerPC %-16s\n", "host"); + qemu_printf("PowerPC %s\n", "host"); #endif } diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 4e4598cc774c..11e06cc51fab 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -398,14 +398,14 @@ void s390_cpu_list(void) for (feat = 0; feat < S390_FEAT_MAX; feat++) { const S390FeatDef *def = s390_feat_def(feat); - qemu_printf("%-20s %-50s\n", def->name, def->desc); + qemu_printf("%-20s %s\n", def->name, def->desc); } qemu_printf("\nRecognized feature groups:\n"); for (group = 0; group < S390_FEAT_GROUP_MAX; group++) { const S390FeatGroupDef *def = s390_feat_group_def(group); - qemu_printf("%-20s %-50s\n", def->name, def->desc); + qemu_printf("%-20s %s\n", def->name, def->desc); } } diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index b01ff9399ae6..57e319a1af3a 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1098,7 +1098,7 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb) qemu_printf("\tVaddr Paddr ASID Attr RWX Cache\n" "\t---------- ---------- ---- ---- --- -------\n"); } - qemu_printf("\t0x%08x 0x%08x 0x%02x 0x%02x %c%c%c %-7s\n", + qemu_printf("\t0x%08x 0x%08x 0x%02x 0x%02x %c%c%c %s\n", entry->vaddr, entry->paddr, entry->asid,