From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C11BC433EF for ; Wed, 15 Sep 2021 09:03:23 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1558461178 for ; Wed, 15 Sep 2021 09:03:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1558461178 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQQp8-0007nM-41 for qemu-devel@archiver.kernel.org; Wed, 15 Sep 2021 05:03:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQQki-0004EK-U0; Wed, 15 Sep 2021 04:58:49 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37656) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQQkh-0008Vi-6L; Wed, 15 Sep 2021 04:58:48 -0400 Received: by mail-wm1-x32b.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso4177596wmb.2; Wed, 15 Sep 2021 01:58:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=eZFL7i8c9qKc9reRulcEYtlBt/zONQyoe4tTRCz55rg=; b=NGF3v66UbleUAkyU1K3sl8VO5FVVkJSbBfc259zvkwIEQnIxA6T4aay+QmkOFp3kF1 3x/qjKol9/9gqEMHPMV24fNDeKtsWCgqOApGV/B9uCk3d0yaauIiXhlJ8vvHPcKN5VwB dEBIkhdewRIYWghEoxwYi/gAJegYb8CVxGcpXc8pMveY6fVYrKEZB/FBQ0ev6o/wsqo/ 1fipKwBuQkFWgvtCd+Kcj3GJ2Ffy9fcOcBb4FxWdxiYnLUs2juE/IbaMSZhpBuLukX2E zBvepx2yOw+VSY+SzxJ5r/8cB+nRZq962Sp6TIrBxC7p3vmiSxwlL8VpKESgBxELmnsp dzSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=eZFL7i8c9qKc9reRulcEYtlBt/zONQyoe4tTRCz55rg=; b=Tz8kTsTEcjSxg1nH9f5O8jk6d62IitYIWrp1sZNWJJaBM5E15bbiDjMJwMgqf0dXVo pn+TV3SyLopXIa3GwvCHcP0MO4LHQ/nwtRVQaALqALwwZcMnbsF686R2CMNv+J6RnJk2 XcT93b+RrGIoqMXh7xOb9nf4Mr93b18T8kt3d/J5CQ6uz6P56YpqxaSzD/ZAHKG2F8Ov c/S15MXzhrGFOhFIRDlyEn/MOItgYjClpTjtkslb9zJDMeKPvSpxfaOeOhW1fLmdrpXv GAXyB7mu3az8P2qjf1KKYWc5TZ/uiLu6+bgJ5n2d+lelzloRlFVv7I5L0BFkJAYJvW5B S12A== X-Gm-Message-State: AOAM533Jcd1khH9LMpWxHiSVbjQ4B8U4XEKPM7DaZi8rurzwUvd/NUXq VqrAG0+IkZ0gLHLvI+NfHHk= X-Google-Smtp-Source: ABdhPJzW6quBDSPMhbODLSz+WuFicKOsnHLvQdN3Q76pBlwej9qYgs/hLAqV6KPsFD3MenADpSgDZA== X-Received: by 2002:a05:600c:1d05:: with SMTP id l5mr1090662wms.119.1631696324437; Wed, 15 Sep 2021 01:58:44 -0700 (PDT) Received: from [192.168.1.36] (14.red-83-35-25.dynamicip.rima-tde.net. [83.35.25.14]) by smtp.gmail.com with ESMTPSA id f3sm3481989wmj.28.2021.09.15.01.58.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Sep 2021 01:58:43 -0700 (PDT) Subject: Re: [PATCH v2 09/53] target/avr: convert to use format_state instead of dump_state To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-10-berrange@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Wed, 15 Sep 2021 10:58:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.969, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Chris Wulff , David Hildenbrand , Bin Meng , Mark Cave-Ayland , qemu-devel@nongnu.org, Max Filippov , Taylor Simpson , Alistair Francis , Gerd Hoffmann , Eric Blake , Marek Vasut , "Dr. David Alan Gilbert" , Yoshinori Sato , Markus Armbruster , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , Greg Kurz , Yuval Shaia , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Michael Rolnik , Peter Xu , Stafford Horne , David Gibson , qemu-riscv@nongnu.org, Bastian Koppelmann , Cornelia Huck , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , Aleksandar Rikalo , Aurelien Jarno Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/15/21 10:49 AM, Daniel P. Berrangé wrote: > On Wed, Sep 15, 2021 at 09:13:14AM +0200, Philippe Mathieu-Daudé wrote: >> On 9/14/21 4:19 PM, Daniel P. Berrangé wrote: >>> Signed-off-by: Daniel P. Berrangé >>> --- >>> target/avr/cpu.c | 57 ++++++++++++++++++++++++------------------------ >>> 1 file changed, 29 insertions(+), 28 deletions(-) >>> >>> diff --git a/target/avr/cpu.c b/target/avr/cpu.c >>> index ea14175ca5..17ff21f8be 100644 >>> --- a/target/avr/cpu.c >>> +++ b/target/avr/cpu.c >>> @@ -145,43 +145,44 @@ static ObjectClass *avr_cpu_class_by_name(const char *cpu_model) >>> return oc; >>> } >>> >>> -static void avr_cpu_dump_state(CPUState *cs, FILE *f, int flags) >>> +static void avr_cpu_format_state(CPUState *cs, GString *buf, int flags) >>> { >>> AVRCPU *cpu = AVR_CPU(cs); >>> CPUAVRState *env = &cpu->env; >>> int i; >>> >>> - qemu_fprintf(f, "\n"); >>> - qemu_fprintf(f, "PC: %06x\n", env->pc_w * 2); /* PC points to words */ >>> - qemu_fprintf(f, "SP: %04x\n", env->sp); >>> - qemu_fprintf(f, "rampD: %02x\n", env->rampD >> 16); >>> - qemu_fprintf(f, "rampX: %02x\n", env->rampX >> 16); >>> - qemu_fprintf(f, "rampY: %02x\n", env->rampY >> 16); >>> - qemu_fprintf(f, "rampZ: %02x\n", env->rampZ >> 16); >>> - qemu_fprintf(f, "EIND: %02x\n", env->eind >> 16); >>> - qemu_fprintf(f, "X: %02x%02x\n", env->r[27], env->r[26]); >>> - qemu_fprintf(f, "Y: %02x%02x\n", env->r[29], env->r[28]); >>> - qemu_fprintf(f, "Z: %02x%02x\n", env->r[31], env->r[30]); >>> - qemu_fprintf(f, "SREG: [ %c %c %c %c %c %c %c %c ]\n", >>> - env->sregI ? 'I' : '-', >>> - env->sregT ? 'T' : '-', >>> - env->sregH ? 'H' : '-', >>> - env->sregS ? 'S' : '-', >>> - env->sregV ? 'V' : '-', >>> - env->sregN ? '-' : 'N', /* Zf has negative logic */ >>> - env->sregZ ? 'Z' : '-', >>> - env->sregC ? 'I' : '-'); >>> - qemu_fprintf(f, "SKIP: %02x\n", env->skip); >>> - >>> - qemu_fprintf(f, "\n"); >>> + g_string_append_printf(buf, "\n"); >> >> This would be g_string_append_c(buf, '\n') but in this particular case >> it doesn't seem helpful so I'd directly remove it. > > I don't want to change output format of the commands, with exception of > error reporting, as this is intended to be just refactoring patch, not > a cleanup patch. I misread cpu_dump_state(), I thought it was already appending a newline, but it is not: @@ -106,6 +106,21 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flags) if (cc->dump_state) { cpu_synchronize_state(cpu); cc->dump_state(cpu, f, flags); + } else if (cc->format_state) { + g_autoptr(GString) buf = g_string_new(""); + cpu_synchronize_state(cpu); + cc->format_state(cpu, buf, flags); + qemu_fprintf(f, "%s", buf->str); So we are fine. > I'm not convinced it is worth special casing single byte strings to > use g_string_append_c either really. OK. R-b stands ;)