From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Paolo Bonzini" <pbonzini@redhat.com>, kvm@vger.kernel.org, qemu-arm@nongnu.org, "Richard Henderson" <rth@twiddle.net>, "Philippe Mathieu-Daudé" <f4bug@amsat.org> Subject: [PATCH v2 3/7] disas: Let disas::read_memory() handler return EIO on error Date: Mon, 18 May 2020 17:53:04 +0200 [thread overview] Message-ID: <20200518155308.15851-4-f4bug@amsat.org> (raw) In-Reply-To: <20200518155308.15851-1-f4bug@amsat.org> Both cpu_memory_rw_debug() and address_space_read() return an error on failed transaction. Check the returned value, and return EIO in case of error. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- disas.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/disas.c b/disas.c index 45285d3f63..c1397d3933 100644 --- a/disas.c +++ b/disas.c @@ -39,9 +39,11 @@ target_read_memory (bfd_vma memaddr, struct disassemble_info *info) { CPUDebug *s = container_of(info, CPUDebug, info); + int r; - cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - return 0; + r = cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); + + return r ? EIO : 0; } /* Print an error message. We can assume that this is in response to @@ -718,10 +720,11 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) { CPUDebug *s = container_of(info, CPUDebug, info); + MemTxResult res; - address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, - myaddr, length); - return 0; + res = address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, + myaddr, length); + return res == MEMTX_OK ? 0 : EIO; } /* Disassembler for the monitor. */ -- 2.21.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Richard Henderson" <rth@twiddle.net> Subject: [PATCH v2 3/7] disas: Let disas::read_memory() handler return EIO on error Date: Mon, 18 May 2020 17:53:04 +0200 [thread overview] Message-ID: <20200518155308.15851-4-f4bug@amsat.org> (raw) In-Reply-To: <20200518155308.15851-1-f4bug@amsat.org> Both cpu_memory_rw_debug() and address_space_read() return an error on failed transaction. Check the returned value, and return EIO in case of error. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- disas.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/disas.c b/disas.c index 45285d3f63..c1397d3933 100644 --- a/disas.c +++ b/disas.c @@ -39,9 +39,11 @@ target_read_memory (bfd_vma memaddr, struct disassemble_info *info) { CPUDebug *s = container_of(info, CPUDebug, info); + int r; - cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); - return 0; + r = cpu_memory_rw_debug(s->cpu, memaddr, myaddr, length, 0); + + return r ? EIO : 0; } /* Print an error message. We can assume that this is in response to @@ -718,10 +720,11 @@ physical_read_memory(bfd_vma memaddr, bfd_byte *myaddr, int length, struct disassemble_info *info) { CPUDebug *s = container_of(info, CPUDebug, info); + MemTxResult res; - address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, - myaddr, length); - return 0; + res = address_space_read(s->cpu->as, memaddr, MEMTXATTRS_UNSPECIFIED, + myaddr, length); + return res == MEMTX_OK ? 0 : EIO; } /* Disassembler for the monitor. */ -- 2.21.3
next prev parent reply other threads:[~2020-05-18 15:53 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-18 15:53 [PATCH v2 0/7] exec/memory: Enforce checking MemTxResult values Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 15:53 ` [PATCH v2 1/7] exec: Let address_space_read/write_cached() propagate MemTxResult Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 16:13 ` Peter Maydell 2020-05-18 16:13 ` Peter Maydell 2020-05-18 15:53 ` [PATCH v2 2/7] exec: Propagate cpu_memory_rw_debug() error Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé [this message] 2020-05-18 15:53 ` [PATCH v2 3/7] disas: Let disas::read_memory() handler return EIO on error Philippe Mathieu-Daudé 2020-05-18 15:53 ` [PATCH v2 4/7] hw/elf_ops: Do not ignore write failures when loading ELF Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-19 7:58 ` Stefano Garzarella 2020-05-19 7:58 ` Stefano Garzarella 2020-05-18 15:53 ` [PATCH v2 5/7] hw/arm/boot: Abort if set_kernel_args() fails Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 16:08 ` Peter Maydell 2020-05-18 16:08 ` Peter Maydell 2020-05-18 15:53 ` [RFC PATCH v2 6/7] accel/kvm: Let KVM_EXIT_MMIO return error Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 16:01 ` Peter Maydell 2020-05-18 16:01 ` Peter Maydell 2020-05-18 16:06 ` Philippe Mathieu-Daudé 2020-05-21 15:39 ` Paolo Bonzini 2020-05-21 15:39 ` Paolo Bonzini 2020-05-21 15:45 ` Peter Maydell 2020-05-21 15:45 ` Peter Maydell 2020-05-18 15:53 ` [RFC PATCH v2 7/7] hw/core/loader: Assert loading ROM regions succeeds at reset Philippe Mathieu-Daudé 2020-05-18 15:53 ` Philippe Mathieu-Daudé 2020-05-18 16:12 ` Peter Maydell 2020-05-18 16:12 ` Peter Maydell 2020-05-18 16:25 ` Philippe Mathieu-Daudé 2020-05-21 15:40 ` [PATCH v2 0/7] exec/memory: Enforce checking MemTxResult values Paolo Bonzini 2020-05-21 15:40 ` Paolo Bonzini
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=20200518155308.15851-4-f4bug@amsat.org \ --to=f4bug@amsat.org \ --cc=kvm@vger.kernel.org \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=rth@twiddle.net \ /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.