From patchwork Tue Nov 2 23:22:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1550038 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 4HkQw527Srz9sRK for ; Wed, 3 Nov 2021 10:24:21 +1100 (AEDT) Received: from localhost ([::1]:49728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mi38d-0001KE-4u for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2021 19:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36l-000651-OV; Tue, 02 Nov 2021 19:22:24 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:45709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36j-0006LW-4e; Tue, 02 Nov 2021 19:22:23 -0400 Received: from quad ([82.142.14.190]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MNfgZ-1n6Sx31jRb-00P2is; Wed, 03 Nov 2021 00:22:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/4] monitor: Trim some trailing space from human-readable output Date: Wed, 3 Nov 2021 00:22:09 +0100 Message-Id: <20211102232212.2911638-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102232212.2911638-1-laurent@vivier.eu> References: <20211102232212.2911638-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1://SXqXViTJ4iA5UKvOINnm6kPvhrBXQ390ll20Jg0y1fYvenOJQ sbGMFg+4WZM5nvgwfjNlFJP60VAWh29LvYBsd6MnR93plJJsRyvBnyYqBRczC1AKnJvrEp5 36okjyy8sa4nESALSA5hfuNHBStsEQAzMM3xWBQWDIcOfaX9JBwli5GCLizuRF6N58ojIem pBM6VEmYwDlTG7K7oz3PA== X-UI-Out-Filterresults: notjunk:1;V03:K0:d7PDms3bwBM=:wnOsjs467ldhQpBMbx7RJY lhZKoMaQ+Jv8/l4GboCeQYJb4zxf/OJbZACMnsA5DXV9LmElSQKUPFksL0YkFTjsTI0qVz/sJ tLPkiHt/89sFWiVDEhgQ+OoxAGBEuch/qEMFzMVp0hrUrzGRSMoSNhN3thoIkhNiZILESQ/yb 2bQD8pd2H+D5RSH2n2/4MhM/ubJMrlciFncWFW8XqwmuA9PHJt9ihGKYLH9Z9qXxNDkm+/zYn d9CnD1pUrp5tPjPjQXmtXO4Eus+PVXy25Tw42WLMqK2+rUY7pMD3Mx9hLroHEPaAGzxd2/yni 3hC6v4LZcANCDaHiVLAgQHzhrKdAiXNGR54uuVz606yOohja6DkRsnANds9IU/nsdiYx8/UcT JqczhOW7NG6EZ+51kTtXP/JNdWyVqAFzcZN8SV2i2h5p6scV3NeqnV6JJHcwBgCHCBxXdpabE kOGk7LrvZvm1SwPqICn+15l9b5XtnDi0T1I66ZWGnooJYJAvi7n+xy/Ut7WBwZthwN/xIdI9S R4f56xk27Mm7rEAnmxWFeoQRsrweGSZilMRHlMYshcJgPWEORZFDhM5WChqTZwGpcCOTPKcyy bgJ3l+mHvz/MEB6YByu0THcnCtEp1DEBT0fSGbH/uftfRLInuunAjzd6ZLA4DMNfElwVK0egF Z+2OoAnWeu0kVkxsIWdgYwJD78HDQYyImNb+HdJstTJnQwNxf5Xdo3iUPaf4jjs0LuEY= Received-SPF: none client-ip=212.227.126.134; 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, From patchwork Tue Nov 2 23:22:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1550042 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 4HkR0N358Jz9t54 for ; Wed, 3 Nov 2021 10:28:04 +1100 (AEDT) Received: from localhost ([::1]:58924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mi3CE-0007ke-7z for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2021 19:28:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36s-0006B3-VI; Tue, 02 Nov 2021 19:22:30 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:36219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36q-0006NM-OK; Tue, 02 Nov 2021 19:22:30 -0400 Received: from quad ([82.142.14.190]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M6YEz-1moNpu1SqP-006xdk; Wed, 03 Nov 2021 00:22:15 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/4] hw/core/machine: Add the missing delimiter in cpu_slot_to_string() Date: Wed, 3 Nov 2021 00:22:10 +0100 Message-Id: <20211102232212.2911638-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102232212.2911638-1-laurent@vivier.eu> References: <20211102232212.2911638-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:5FXlvVb3/zzi+MOmf9tLnjbW3xIQ5WTPKKqmY9fkazwz2S6RpOT UCFo6Z+ZX6kDBhepqp7k6U7O0sh13wVBXiQrWnhc2/tcBdIxw2PVR20xntNq74R5NZRGRRe /8H+IGXhSdnqOmtLSZrBuZmXPeFrvjLMctdThqeT8WG3j72xNWzsFQO59iy41/Vhyob9saC onu1sa8jeRqXJ9kMV9zHA== X-UI-Out-Filterresults: notjunk:1;V03:K0:p7XltI9PD00=:2hN4eQqHqb7Bc6BspdnyRj 92VsyesoYq+3WmKhR0KoODrHrsr9RL1UMIpZqVm59bHvXS1HAvQKt1QilyJCwKm6ONU/k3I0K gadUMfhv8cO0T2g0kQY/yMJ6xviLP1f4ecq5ktb90P0DhM8hMc7lp0GtnzdcE7lsDyXF4kgGN TpfsDbwX6DINiZbqAXvs5EmcmROobHKNVesq+/J7nxohPIU7az5GUE8MzMFjhm/wRfmxvb5tN WGw/1run8CEsZHlutk0giWKojm6fSm99UDgfF2DHmxl+Nv0Dk1fpPYwVAiAZsHu0SLU9Z1ENP +Q0pDknbLt0bMae4uDB62EfGc2ufpyee2HrBmoitYaiDWM13JfugOsM9MVWkYY5hpaXP/Ryxn VN36V+Ifu5q3G/r9jzOHT5DbiPrTEIsKqyhkRYTf5O+RSAYaIV6ZFSsXAU3B0P9rs5xaopmGl oPpfgndMgxXDaqB9S4bLCikiLRshNwnIKlzZAYEd0CqMUuSoJlUJ6Ou33K3nsXfNngwddYksQ 3btz/AKseMtaWbd7day9Mz5EC9ctxNHi43958JForbJAsR2K2nujW4py8dLwsMpvhkHoysK8z RuYGemaeg5R+u2XCeljaqRpPo6ZKM5kiLn12ApM6++V+5u4zT03+5MkYBC2spKPoQEa7rTStD V9FM5fMhpVY+ar8/e0zJLGVl4VsFCBSs6pHzMjiUO+DKrxYrEsjxcAHfiZ2l1pATVYR0= Received-SPF: none client-ip=212.227.126.130; 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_H4=0.001, RCVD_IN_MSPIKE_WL=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, Yanan Wang , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yanan Wang The expected output string from cpu_slot_to_string() ought to be like "socket-id: *, die-id: *, core-id: *, thread-id: *", so add the missing ", " before "die-id". This affects the readability of the error message. Fixes: 176d2cda0d ("i386/cpu: Consolidate die-id validity in smp context") Signed-off-by: Yanan Wang Reviewed-by: Laurent Vivier Message-Id: <20211008075040.18028-1-wangyanan55@huawei.com> Signed-off-by: Laurent Vivier --- hw/core/machine.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index b8d95eec32d4..0a23ae310606 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1157,6 +1157,9 @@ static char *cpu_slot_to_string(const CPUArchId *cpu) g_string_append_printf(s, "socket-id: %"PRId64, cpu->props.socket_id); } if (cpu->props.has_die_id) { + if (s->len) { + g_string_append_printf(s, ", "); + } g_string_append_printf(s, "die-id: %"PRId64, cpu->props.die_id); } if (cpu->props.has_core_id) { From patchwork Tue Nov 2 23:22:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1550041 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 4HkQzj6PnJz9sRK for ; Wed, 3 Nov 2021 10:27:28 +1100 (AEDT) Received: from localhost ([::1]:57094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mi3Bd-0006T9-2g for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2021 19:27:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36s-00069w-Ga; Tue, 02 Nov 2021 19:22:30 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:42217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36p-0006NE-Fi; Tue, 02 Nov 2021 19:22:29 -0400 Received: from quad ([82.142.14.190]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MN67J-1n0PTJ0TS9-00IzEu; Wed, 03 Nov 2021 00:22:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/4] MAINTAINERS: Split HPPA TCG vs HPPA machines/hardware Date: Wed, 3 Nov 2021 00:22:11 +0100 Message-Id: <20211102232212.2911638-4-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102232212.2911638-1-laurent@vivier.eu> References: <20211102232212.2911638-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:inS8CtjNlwZN4cDbdUd+BAzLk/ume97wbLwIAFEWcghQpKR/sRq Fq7FaoWcOsL4wz7xbv7SvfrTghALc3lKNN1JKb1RHLg/Ao/zxMlhVLVudy6nCZdp85rGTCj fg+T4XjwFZqcWjWhIRkBmuHi5tuxryg8BeLj3J5InGA6wcXdWAtKOCN5BYjgHDKe4/FTvga mBaemwAZBthEC4ErkR7Aw== X-UI-Out-Filterresults: notjunk:1;V03:K0:rnQTg6SxeeI=:JQ3NXbmQH2XihSPKlQOkEX bqMpI1vhT2P8+pD4BCuCLCdnR9hLE3lTdN4ejg09BwsRbJqg0XZV/viY5fcB2JFQQAxhcFuHj OceuJOMJBIXSTH6JyPSmCQfPMFaC/GPN5CTD0V05YNPA9Xc/3a279RCnNeYs7UGCfPH9nImLB AhGch1XgifKqudBCwltMEd275KuQxkNZoCeTtKAP9hRhGjRcMhda5UDLtoS2pYLxL1jzM5UOm KXF6cXt4zq3mTzaafCO0oziTNQhRg/zU4eQiwppsWWQ/bppZRY8NE8QqloSMPidSggva85Yi1 FMn4ova2UqO7Ro2eYan0BNdNsU5sXQBCGpm/QrWgCvpDeLeAYhl3W86TwX49xiJbTIdPc7YrF gw2eJzDS1Es0fQBEBPZD0xtbX0wbaVzow/7aX9VuupOpt15JHv3opazFx684MLUsNnAnkFj5D ktUVL461XpaTSkLTUD15DCvZhZGws10HJ5nsAykcg9YEu8HXObkY6188ozTz2ItJn4UZAdl2V 9N3c2ovBoqcLUsqOZkxoRJdf2aOUmcUVCEKteVe3i1tGC6uczeKax3uAf2mZAm/yBujft63RA Fz2vm0kYRLK/BaCPeSY6Ue2IPNfG4uk2l9hCG1I5kATqx2pKCeOIUquub+iryW13HQj6tEah2 RJs+o4AsJnWXRuzhANlGAXoJeXOHwtfJTXUJsfQcE9bpwCtEhYtgWOyX/sFoOWoPXkBg= Received-SPF: none client-ip=212.227.126.130; 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_H4=0.001, RCVD_IN_MSPIKE_WL=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, Helge Deller , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Hardware emulated models don't belong to the TCG MAINTAINERS section. Move them to the 'HP-PARISC Machines' section. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Helge Deller Message-Id: <20211004083835.3802961-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- MAINTAINERS | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 894dc4310526..6f2b20078032 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -205,10 +205,7 @@ HPPA (PA-RISC) TCG CPUs M: Richard Henderson S: Maintained F: target/hppa/ -F: hw/hppa/ F: disas/hppa.c -F: hw/net/*i82596* -F: include/hw/net/lasi_82596.h M68K TCG CPUs M: Laurent Vivier @@ -1099,6 +1096,8 @@ R: Helge Deller S: Odd Fixes F: configs/devices/hppa-softmmu/default.mak F: hw/hppa/ +F: hw/net/*i82596* +F: include/hw/net/lasi_82596.h F: pc-bios/hppa-firmware.img M68K Machines From patchwork Tue Nov 2 23:22:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1550037 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 4HkQvc3MVKz9sRK for ; Wed, 3 Nov 2021 10:23:56 +1100 (AEDT) Received: from localhost ([::1]:48824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mi38E-0000j5-9H for incoming@patchwork.ozlabs.org; Tue, 02 Nov 2021 19:23:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36o-000676-Nt; Tue, 02 Nov 2021 19:22:28 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:48497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi36m-0006Mt-3V; Tue, 02 Nov 2021 19:22:26 -0400 Received: from quad ([82.142.14.190]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1My6xz-1mYEf12yfH-00zU0A; Wed, 03 Nov 2021 00:22:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/4] hw/input/lasips2: Fix typos in function names Date: Wed, 3 Nov 2021 00:22:12 +0100 Message-Id: <20211102232212.2911638-5-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211102232212.2911638-1-laurent@vivier.eu> References: <20211102232212.2911638-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1Va5+AUHsEKCs5nJcxLCECMp9gMOKNWhVv4EI9CVyzEfFqFOzO4 OeGcSoyf3SliP709XeHLpKvBmu1B7n8nQhKlhVh0pkCz6aN0Q5mqIBnTZEPkueHTBf7fOW6 biHFfMOpGsXUfcZxDVYeWFy1J5+XicBOE5oaM1nXIiIsPQqrVB07Bf5GzmYvvGwMPW4+oi+ p1KT8647KyqHpc41h3/LQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:Ac3bDVIYQcQ=:8httf/N825RT7G/2wjZ65G va9D6WEVIYXf0odfjYEf5SIjyAyOdA7SJZRZVPru1BqofDLvSnzgzZug3mGcg3FqnoZlh5Khh 2G2MC9dpEbP6p0d05NQoejxiU50QZOSUTUrVG/r53vHSKWh88h81/anFBiOHMoL1z8dpoOOyN Yjksh3dONPAh/tNux8wLfaK77L54Ux0jWKsS8qwYr3igsTC1BNl9E6kGaFHgl8chp73HUGR8x RB9duYai+kulHFmVb6EkOOS9Cn2wHAmAFfzErUyqVKlUF6VLM7oHy/6V+rPhzWvlkG7z6KfMI AKA+TqebcpGPLhaMcAsXyXbxRG6Pm6i5zux1Z294UGYbwcx7IUMTx3SqngtfFWUThVkK+/dnd 7Mi94ouycG4TFdhghGAxXRVC9iYs6n+XiTZSzD4vMBHaUo8KT6QD+s+qm+4TCBkHf21U/XVSJ hOG879OBbjYGhJUNBJ1p5S595J7YKjIpSl1juTsAm5YBldQXrQkZv7G/6PQAI1aY2dh+SXhRI PlnhNcTO61tZvr1taXCaM2n70xY49rToHqQ8fNPhuBrX5A4l9ncPO9wJIxTsF+86/UtzfnbRN 6gBxwS4LXcp+X8XCtyA5Gv0rBCKlzJsrWx7tfjLRLRqGdztrVg0b3zO5P5D2tKB4ZvGrdJKSm VZKTGG0dZja4swHo9oHfsCv0/uuJqAKyN/K2rsIjPaXSJxz2RNA7AMsu4Pf/3DnMxsmU= Received-SPF: none client-ip=212.227.126.134; 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, Damien Hedde , =?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: Philippe Mathieu-Daudé Artist is another device, this one is the Lasi PS/2. Rename the functions accordingly. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Damien Hedde Message-Id: <20210920064048.2729397-2-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/input/lasips2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c index e7faf24058b4..68d741d34215 100644 --- a/hw/input/lasips2.c +++ b/hw/input/lasips2.c @@ -96,7 +96,7 @@ typedef enum { LASIPS2_STATUS_CLKSHD = 0x80, } lasips2_status_reg_t; -static const char *artist_read_reg_name(uint64_t addr) +static const char *lasips2_read_reg_name(uint64_t addr) { switch (addr & 0xc) { case REG_PS2_ID: @@ -116,7 +116,7 @@ static const char *artist_read_reg_name(uint64_t addr) } } -static const char *artist_write_reg_name(uint64_t addr) +static const char *lasips2_write_reg_name(uint64_t addr) { switch (addr & 0x0c) { case REG_PS2_RESET: @@ -145,7 +145,7 @@ static void lasips2_reg_write(void *opaque, hwaddr addr, uint64_t val, LASIPS2Port *port = opaque; trace_lasips2_reg_write(size, port->id, addr, - artist_write_reg_name(addr), val); + lasips2_write_reg_name(addr), val); switch (addr & 0xc) { case REG_PS2_CONTROL: @@ -239,7 +239,7 @@ static uint64_t lasips2_reg_read(void *opaque, hwaddr addr, unsigned size) break; } trace_lasips2_reg_read(size, port->id, addr, - artist_read_reg_name(addr), ret); + lasips2_read_reg_name(addr), ret); return ret; }