qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Markus Armbruster" <armbru@redhat.com>,
	"David Hildenbrand" <david@redhat.com>
Subject: [PULL 08/10] system: Use &error_abort in memory_region_init_ram_[device_]ptr()
Date: Fri, 24 Nov 2023 16:24:06 +0100	[thread overview]
Message-ID: <20231124152408.140936-9-pbonzini@redhat.com> (raw)
In-Reply-To: <20231124152408.140936-1-pbonzini@redhat.com>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

If an unexpected error condition happens, we have to abort
(&fatal_error is meant for expected errors).

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20231120133112.82447-1-philmd@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 system/memory.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/memory.c b/system/memory.c
index 304fa843ea1..4d9cb0a7fff 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -1692,7 +1692,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr,
 
     /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL.  */
     assert(ptr != NULL);
-    mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);
+    mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort);
 }
 
 void memory_region_init_ram_device_ptr(MemoryRegion *mr,
@@ -1711,7 +1711,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr,
 
     /* qemu_ram_alloc_from_ptr cannot fail with ptr != NULL.  */
     assert(ptr != NULL);
-    mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_fatal);
+    mr->ram_block = qemu_ram_alloc_from_ptr(size, ptr, mr, &error_abort);
 }
 
 void memory_region_init_alias(MemoryRegion *mr,
-- 
2.43.0



  parent reply	other threads:[~2023-11-24 15:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-24 15:23 [PULL 00/10] Misc bug fixes for QEMU 8.2.0-rc2 Paolo Bonzini
2023-11-24 15:23 ` [PULL 01/10] coverity: physmem: use simple assertions instead of modelling Paolo Bonzini
2023-11-24 15:24 ` [PULL 02/10] tests: respect --enable/--disable-download for Avocado Paolo Bonzini
2023-11-24 15:24 ` [PULL 03/10] docs: document what configure does with virtual environments Paolo Bonzini
2023-11-24 15:24 ` [PULL 04/10] buildsys: Bump known good meson version to v1.2.3 Paolo Bonzini
2023-11-24 15:24 ` [PULL 05/10] .gitlab-ci.d/cirrus: Add manual testing of macOS 14 (Sonoma) Paolo Bonzini
2023-11-24 15:24 ` [PULL 06/10] audio: Free consumed default audio devices Paolo Bonzini
2023-11-24 15:24 ` [PULL 07/10] disas/cris: Pass buffer size to format_dec() to avoid overflow warning Paolo Bonzini
2023-11-24 15:24 ` Paolo Bonzini [this message]
2023-11-24 15:24 ` [PULL 09/10] configure: Make only once with pseudo-"in source tree" builds Paolo Bonzini
2023-11-24 15:24 ` [PULL 10/10] scripts: adjust url to Coverity tools Paolo Bonzini
2023-11-28 13:01 ` [PULL 00/10] Misc bug fixes for QEMU 8.2.0-rc2 Stefan Hajnoczi

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=20231124152408.140936-9-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=armbru@redhat.com \
    --cc=david@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).