From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Sarah Harris" <S.E.Harris@kent.ac.uk>, "Chris Wulff" <crwulff@gmail.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "David Hildenbrand" <david@redhat.com>, "Anthony Green" <green@moxielogic.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Thomas Huth" <thuth@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Max Filippov" <jcmvbkbc@gmail.com>, "Alistair Francis" <Alistair.Francis@wdc.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Marek Vasut" <marex@denx.de>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Michael S. Tsirkin" <mst@redhat.com>, "Claudio Fontana" <cfontana@suse.de>, qemu-ppc@nongnu.org, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Greg Kurz" <groug@kaod.org>, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>, "Stafford Horne" <shorne@gmail.com>, "David Gibson" <david@gibson.dropbear.id.au>, qemu-riscv@nongnu.org, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Cornelia Huck" <cohuck@redhat.com>, "Laurent Vivier" <laurent@vivier.eu>, "Michael Walle" <michael@walle.cc>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Paolo Bonzini" <pbonzini@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net> Subject: [PATCH v2 03/17] cpu: Introduce cpu_virtio_is_big_endian() Date: Mon, 1 Mar 2021 22:50:56 +0100 [thread overview] Message-ID: <20210301215110.772346-4-f4bug@amsat.org> (raw) In-Reply-To: <20210301215110.772346-1-f4bug@amsat.org> Introduce the cpu_virtio_is_big_endian() generic helper to avoid calling CPUClass internal virtio_is_big_endian() one. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/core/cpu.h | 9 +++++++++ hw/core/cpu.c | 8 ++++++-- hw/virtio/virtio.c | 4 +--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2d43f78819f..b12028c3c03 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -602,6 +602,15 @@ hwaddr cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); */ int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs); +/** + * cpu_virtio_is_big_endian: + * @cpu: CPU + + * Returns %true if a CPU which supports runtime configurable endianness + * is currently big-endian. + */ +bool cpu_virtio_is_big_endian(CPUState *cpu); + #endif /* CONFIG_USER_ONLY */ /** diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 4dce35f832f..daaff56a79e 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -218,8 +218,13 @@ static int cpu_common_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg) return 0; } -static bool cpu_common_virtio_is_big_endian(CPUState *cpu) +bool cpu_virtio_is_big_endian(CPUState *cpu) { + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->virtio_is_big_endian) { + return cc->virtio_is_big_endian(cpu); + } return target_words_bigendian(); } @@ -438,7 +443,6 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->write_elf64_note = cpu_common_write_elf64_note; k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; - k->virtio_is_big_endian = cpu_common_virtio_is_big_endian; set_bit(DEVICE_CATEGORY_CPU, dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 1fd1917ca0f..fe6a4be99e4 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1973,9 +1973,7 @@ static enum virtio_device_endian virtio_default_endian(void) static enum virtio_device_endian virtio_current_cpu_endian(void) { - CPUClass *cc = CPU_GET_CLASS(current_cpu); - - if (cc->virtio_is_big_endian(current_cpu)) { + if (cpu_virtio_is_big_endian(current_cpu)) { return VIRTIO_DEVICE_ENDIAN_BIG; } else { return VIRTIO_DEVICE_ENDIAN_LITTLE; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Michael Rolnik" <mrolnik@gmail.com>, "Anthony Green" <green@moxielogic.com>, "Jiaxun Yang" <jiaxun.yang@flygoat.com>, "Peter Maydell" <peter.maydell@linaro.org>, qemu-arm@nongnu.org, "Marek Vasut" <marex@denx.de>, "Paolo Bonzini" <pbonzini@redhat.com>, "Stafford Horne" <shorne@gmail.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>, qemu-s390x@nongnu.org, "Chris Wulff" <crwulff@gmail.com>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Aurelien Jarno" <aurelien@aurel32.net>, "David Gibson" <david@gibson.dropbear.id.au>, "Sarah Harris" <S.E.Harris@kent.ac.uk>, "David Hildenbrand" <david@redhat.com>, "Cornelia Huck" <cohuck@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, qemu-riscv@nongnu.org, "Alistair Francis" <Alistair.Francis@wdc.com>, qemu-ppc@nongnu.org, "Laurent Vivier" <laurent@vivier.eu>, "Claudio Fontana" <cfontana@suse.de>, "Michael Walle" <michael@walle.cc>, "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Thomas Huth" <thuth@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Greg Kurz" <groug@kaod.org>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Max Filippov" <jcmvbkbc@gmail.com> Subject: [PATCH v2 03/17] cpu: Introduce cpu_virtio_is_big_endian() Date: Mon, 1 Mar 2021 22:50:56 +0100 [thread overview] Message-ID: <20210301215110.772346-4-f4bug@amsat.org> (raw) In-Reply-To: <20210301215110.772346-1-f4bug@amsat.org> Introduce the cpu_virtio_is_big_endian() generic helper to avoid calling CPUClass internal virtio_is_big_endian() one. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- include/hw/core/cpu.h | 9 +++++++++ hw/core/cpu.c | 8 ++++++-- hw/virtio/virtio.c | 4 +--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 2d43f78819f..b12028c3c03 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -602,6 +602,15 @@ hwaddr cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); */ int cpu_asidx_from_attrs(CPUState *cpu, MemTxAttrs attrs); +/** + * cpu_virtio_is_big_endian: + * @cpu: CPU + + * Returns %true if a CPU which supports runtime configurable endianness + * is currently big-endian. + */ +bool cpu_virtio_is_big_endian(CPUState *cpu); + #endif /* CONFIG_USER_ONLY */ /** diff --git a/hw/core/cpu.c b/hw/core/cpu.c index 4dce35f832f..daaff56a79e 100644 --- a/hw/core/cpu.c +++ b/hw/core/cpu.c @@ -218,8 +218,13 @@ static int cpu_common_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg) return 0; } -static bool cpu_common_virtio_is_big_endian(CPUState *cpu) +bool cpu_virtio_is_big_endian(CPUState *cpu) { + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->virtio_is_big_endian) { + return cc->virtio_is_big_endian(cpu); + } return target_words_bigendian(); } @@ -438,7 +443,6 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->write_elf64_note = cpu_common_write_elf64_note; k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; - k->virtio_is_big_endian = cpu_common_virtio_is_big_endian; set_bit(DEVICE_CATEGORY_CPU, dc->categories); dc->realize = cpu_common_realizefn; dc->unrealize = cpu_common_unrealizefn; diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 1fd1917ca0f..fe6a4be99e4 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -1973,9 +1973,7 @@ static enum virtio_device_endian virtio_default_endian(void) static enum virtio_device_endian virtio_current_cpu_endian(void) { - CPUClass *cc = CPU_GET_CLASS(current_cpu); - - if (cc->virtio_is_big_endian(current_cpu)) { + if (cpu_virtio_is_big_endian(current_cpu)) { return VIRTIO_DEVICE_ENDIAN_BIG; } else { return VIRTIO_DEVICE_ENDIAN_LITTLE; -- 2.26.2
next prev parent reply other threads:[~2021-03-01 21:56 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-01 21:50 [PATCH v2 00/17] cpu: Introduce SysemuCPUOps structure Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:50 ` [PATCH v2 01/17] target: Set CPUClass::vmsd instead of DeviceClass::vmsd Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:50 ` [PATCH v2 02/17] cpu: Un-inline cpu_get_phys_page_debug and cpu_asidx_from_attrs Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé [this message] 2021-03-01 21:50 ` [PATCH v2 03/17] cpu: Introduce cpu_virtio_is_big_endian() Philippe Mathieu-Daudé 2021-03-01 21:50 ` [PATCH v2 04/17] cpu: Directly use cpu_write_elf*() fallback handlers in place Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:50 ` [PATCH v2 05/17] cpu: Directly use get_paging_enabled() " Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:50 ` [PATCH v2 06/17] cpu: Directly use get_memory_mapping() " Philippe Mathieu-Daudé 2021-03-01 21:50 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 07/17] cpu: Introduce SysemuCPUOps structure Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 08/17] cpu: Move CPUClass::vmsd to SysemuCPUOps Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 09/17] cpu: Move CPUClass::virtio_is_big_endian " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 10/17] cpu: Move CPUClass::get_crash_info " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 11/17] cpu: Move CPUClass::write_elf* " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 12/17] cpu: Move CPUClass::asidx_from_attrs " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 13/17] cpu: Move CPUClass::get_phys_page_debug " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 14/17] cpu: Move CPUClass::get_memory_mapping " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 15/17] cpu: Move CPUClass::get_paging_enabled " Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [PATCH v2 16/17] cpu: Restrict cpu_paging_enabled / cpu_get_memory_mapping to sysemu Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-02 12:34 ` Claudio Fontana 2021-03-02 12:34 ` Claudio Fontana 2021-03-02 12:39 ` Philippe Mathieu-Daudé 2021-03-02 12:39 ` Philippe Mathieu-Daudé 2021-03-01 21:51 ` [RFC PATCH v2 17/17] cpu: Restrict "hw/core/sysemu-cpu-ops.h" to target/cpu.c Philippe Mathieu-Daudé 2021-03-01 21:51 ` Philippe Mathieu-Daudé 2021-03-02 7:34 ` Philippe Mathieu-Daudé 2021-03-02 7:34 ` Philippe Mathieu-Daudé 2021-03-02 12:35 ` [PATCH v2 00/17] cpu: Introduce SysemuCPUOps structure Claudio Fontana 2021-03-02 12:35 ` Claudio Fontana
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210301215110.772346-4-f4bug@amsat.org \ --to=f4bug@amsat.org \ --cc=Alistair.Francis@wdc.com \ --cc=S.E.Harris@kent.ac.uk \ --cc=aleksandar.rikalo@syrmia.com \ --cc=atar4qemu@gmail.com \ --cc=aurelien@aurel32.net \ --cc=cfontana@suse.de \ --cc=cohuck@redhat.com \ --cc=crwulff@gmail.com \ --cc=david@gibson.dropbear.id.au \ --cc=david@redhat.com \ --cc=edgar.iglesias@gmail.com \ --cc=ehabkost@redhat.com \ --cc=green@moxielogic.com \ --cc=groug@kaod.org \ --cc=gxt@mprc.pku.edu.cn \ --cc=jcmvbkbc@gmail.com \ --cc=kbastian@mail.uni-paderborn.de \ --cc=laurent@vivier.eu \ --cc=marex@denx.de \ --cc=mark.cave-ayland@ilande.co.uk \ --cc=michael@walle.cc \ --cc=mrolnik@gmail.com \ --cc=mst@redhat.com \ --cc=palmer@dabbelt.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=sagark@eecs.berkeley.edu \ --cc=shorne@gmail.com \ --cc=thuth@redhat.com \ --cc=ysato@users.sourceforge.jp \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.