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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 BC49CC433EF for ; Tue, 14 Sep 2021 19:30:51 +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 56635610CE for ; Tue, 14 Sep 2021 19:30:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 56635610CE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:51006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQE8o-0002sE-C4 for qemu-devel@archiver.kernel.org; Tue, 14 Sep 2021 15:30:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQE73-0001UG-MN for qemu-devel@nongnu.org; Tue, 14 Sep 2021 15:29:01 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:28907) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQE71-0008TV-3W for qemu-devel@nongnu.org; Tue, 14 Sep 2021 15:29:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-1I6aUjcDNc6A8MGHErAHNA-1; Tue, 14 Sep 2021 15:28:53 -0400 X-MC-Unique: 1I6aUjcDNc6A8MGHErAHNA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 27BFF18A072C; Tue, 14 Sep 2021 19:28:49 +0000 (UTC) Received: from bahia.huguette (unknown [10.39.192.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id E67B11001281; Tue, 14 Sep 2021 19:28:28 +0000 (UTC) Date: Tue, 14 Sep 2021 21:28:27 +0200 From: Greg Kurz To: "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" Subject: Re: [PATCH v2 06/53] hw/core: introduce 'format_state' callback to replace 'dump_state' Message-ID: <20210914212827.65559b21@bahia.huguette> In-Reply-To: <20210914142042.1655100-7-berrange@redhat.com> References: <20210914142042.1655100-1-berrange@redhat.com> <20210914142042.1655100-7-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com 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_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no 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, Laurent Vivier , Max Filippov , Taylor Simpson , Alistair Francis , Gerd Hoffmann , "Edgar E. Iglesias" , Eric Blake , Marek Vasut , Yoshinori Sato , Markus Armbruster , Halil Pasic , Christian Borntraeger , Palmer Dabbelt , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , 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 , Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , 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 Tue, 14 Sep 2021 15:19:55 +0100 Daniel P. Berrang=C3=A9 wrote: > The 'dump_state' callback assumes it will be outputting to a FILE > object. This is fine for HMP, but not so useful for QMP. Introduce > a new 'format_state' callback that returns a formatted GString > instead. >=20 > Signed-off-by: Daniel P. Berrang=C3=A9 > --- Reviewed-by: Greg Kurz > hw/core/cpu-common.c | 15 +++++++++++++++ > include/hw/core/cpu.h | 13 ++++++++++++- > 2 files changed, 27 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c > index e2f5a64604..c2cd33a817 100644 > --- a/hw/core/cpu-common.c > +++ b/hw/core/cpu-common.c > @@ -106,6 +106,21 @@ void cpu_dump_state(CPUState *cpu, FILE *f, int flag= s) > if (cc->dump_state) { > cpu_synchronize_state(cpu); > cc->dump_state(cpu, f, flags); > + } else if (cc->format_state) { > + g_autoptr(GString) buf =3D g_string_new(""); > + cpu_synchronize_state(cpu); > + cc->format_state(cpu, buf, flags); > + qemu_fprintf(f, "%s", buf->str); > + } > +} > + > +void cpu_format_state(CPUState *cpu, GString *buf, int flags) > +{ > + CPUClass *cc =3D CPU_GET_CLASS(cpu); > + > + if (cc->format_state) { > + cpu_synchronize_state(cpu); > + cc->format_state(cpu, buf, flags); > } > } > =20 > diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h > index bc864564ce..1599ef9df3 100644 > --- a/include/hw/core/cpu.h > +++ b/include/hw/core/cpu.h > @@ -91,7 +91,8 @@ struct SysemuCPUOps; > * @reset_dump_flags: #CPUDumpFlags to use for reset logging. > * @has_work: Callback for checking if there is work to do. > * @memory_rw_debug: Callback for GDB memory access. > - * @dump_state: Callback for dumping state. > + * @dump_state: Callback for dumping state. Deprecated, use @format_stat= e. > + * @format_state: Callback for formatting state. > * @get_arch_id: Callback for getting architecture-dependent CPU ID. > * @set_pc: Callback for setting the Program Counter register. This > * should have the semantics used by the target architecture when > @@ -136,6 +137,7 @@ struct CPUClass { > int (*memory_rw_debug)(CPUState *cpu, vaddr addr, > uint8_t *buf, int len, bool is_write); > void (*dump_state)(CPUState *cpu, FILE *, int flags); > + void (*format_state)(CPUState *cpu, GString *buf, int flags); > int64_t (*get_arch_id)(CPUState *cpu); > void (*set_pc)(CPUState *cpu, vaddr value); > int (*gdb_read_register)(CPUState *cpu, GByteArray *buf, int reg); > @@ -537,6 +539,15 @@ enum CPUDumpFlags { > */ > void cpu_dump_state(CPUState *cpu, FILE *f, int flags); > =20 > +/** > + * cpu_format_state: > + * @cpu: The CPU whose state is to be formatted. > + * @buf: buffer to format state into > + * > + * Formats the CPU state. > + */ > +void cpu_format_state(CPUState *cpu, GString *buf, int flags); > + > #ifndef CONFIG_USER_ONLY > /** > * cpu_get_phys_page_attrs_debug: