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>, "Laurent Vivier" <laurent@vivier.eu>, "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>, "Palmer Dabbelt" <palmer@dabbelt.com>, "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>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Michael Walle" <michael@walle.cc>, qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net> Subject: [PATCH 03/16] cpu: Introduce cpu_virtio_is_big_endian() Date: Fri, 26 Feb 2021 17:32:14 +0100 [thread overview] Message-ID: <20210226163227.4097950-4-f4bug@amsat.org> (raw) In-Reply-To: <20210226163227.4097950-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: qemu-arm@nongnu.org, "Sarah Harris" <S.E.Harris@kent.ac.uk>, "Paolo Bonzini" <pbonzini@redhat.com>, "Max Filippov" <jcmvbkbc@gmail.com>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, qemu-s390x@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>, qemu-ppc@nongnu.org, "Marek Vasut" <marex@denx.de>, "Eduardo Habkost" <ehabkost@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Alistair Francis" <Alistair.Francis@wdc.com>, "Michael Walle" <michael@walle.cc>, "Guan Xuetao" <gxt@mprc.pku.edu.cn>, "Laurent Vivier" <laurent@vivier.eu>, "Anthony Green" <green@moxielogic.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "David Hildenbrand" <david@redhat.com>, qemu-riscv@nongnu.org, "David Gibson" <david@gibson.dropbear.id.au>, "Peter Maydell" <peter.maydell@linaro.org>, "Cornelia Huck" <cohuck@redhat.com>, "Jiaxun Yang" <jiaxun.yang@flygoat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Chris Wulff" <crwulff@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>, "Sagar Karandikar" <sagark@eecs.berkeley.edu>, "Claudio Fontana" <cfontana@suse.de>, "Thomas Huth" <thuth@redhat.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Greg Kurz" <groug@kaod.org>, "Stafford Horne" <shorne@gmail.com>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com> Subject: [PATCH 03/16] cpu: Introduce cpu_virtio_is_big_endian() Date: Fri, 26 Feb 2021 17:32:14 +0100 [thread overview] Message-ID: <20210226163227.4097950-4-f4bug@amsat.org> (raw) In-Reply-To: <20210226163227.4097950-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-02-26 16:44 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-26 16:32 [PATCH 00/16] cpu: Introduce CPUSystemOperations structure Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 01/16] target: Set CPUClass::vmsd instead of DeviceClass::vmsd Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 02/16] cpu: Un-inline cpu_get_phys_page_debug and cpu_asidx_from_attrs Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé [this message] 2021-02-26 16:32 ` [PATCH 03/16] cpu: Introduce cpu_virtio_is_big_endian() Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 04/16] cpu: Directly use cpu_write_elf*() fallback handlers in place Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 05/16] cpu: Directly use get_paging_enabled() " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 06/16] cpu: Directly use get_memory_mapping() " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 07/16] cpu: Introduce CPUSystemOperations structure Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-27 18:49 ` Claudio Fontana 2021-02-27 18:49 ` Claudio Fontana 2021-02-27 18:52 ` Claudio Fontana 2021-02-27 18:52 ` Claudio Fontana 2021-02-26 16:32 ` [PATCH 08/16] cpu: Move CPUClass::vmsd to CPUSystemOperations Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 09/16] cpu: Move CPUClass::virtio_is_big_endian " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 10/16] cpu: Move CPUClass::get_crash_info " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 11/16] cpu: Move CPUClass::write_elf* " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 12/16] cpu: Move CPUClass::asidx_from_attrs " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 13/16] cpu: Move CPUClass::get_phys_page_debug " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 14/16] cpu: Move CPUClass::get_memory_mapping " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 15/16] cpu: Move CPUClass::get_paging_enabled " Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé 2021-02-26 16:32 ` [PATCH 16/16] cpu: Restrict cpu_paging_enabled / cpu_get_memory_mapping to sysemu Philippe Mathieu-Daudé 2021-02-26 16:32 ` Philippe Mathieu-Daudé
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=20210226163227.4097950-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.