From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Claudio Fontana" <cfontana@suse.de>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Markus Armbruster" <armbru@redhat.com>
Subject: [PULL 12/12] accel: abort if we fail to load the accelerator plugin
Date: Sun, 6 Nov 2022 09:51:15 +0100 [thread overview]
Message-ID: <20221106085115.257018-13-pbonzini@redhat.com> (raw)
In-Reply-To: <20221106085115.257018-1-pbonzini@redhat.com>
From: Claudio Fontana <cfontana@suse.de>
if QEMU is configured with modules enabled, it is possible that the
load of an accelerator module will fail.
Exit in this case, relying on module_object_class_by_name to report
the specific load error if any.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
[claudio: changed abort() to exit(1)]
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20220929093035.4231-6-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
accel/accel-softmmu.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/accel/accel-softmmu.c b/accel/accel-softmmu.c
index 67276e4f5222..f9cdafb148ac 100644
--- a/accel/accel-softmmu.c
+++ b/accel/accel-softmmu.c
@@ -66,6 +66,7 @@ void accel_init_ops_interfaces(AccelClass *ac)
{
const char *ac_name;
char *ops_name;
+ ObjectClass *oc;
AccelOpsClass *ops;
ac_name = object_class_get_name(OBJECT_CLASS(ac));
@@ -73,8 +74,13 @@ void accel_init_ops_interfaces(AccelClass *ac)
ops_name = g_strdup_printf("%s" ACCEL_OPS_SUFFIX, ac_name);
ops = ACCEL_OPS_CLASS(module_object_class_by_name(ops_name));
+ oc = module_object_class_by_name(ops_name);
+ if (!oc) {
+ error_report("fatal: could not load module for type '%s'", ops_name);
+ exit(1);
+ }
g_free(ops_name);
-
+ ops = ACCEL_OPS_CLASS(oc);
/*
* all accelerators need to define ops, providing at least a mandatory
* non-NULL create_vcpu_thread operation.
--
2.38.1
next prev parent reply other threads:[~2022-11-06 8:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-06 8:51 [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2 Paolo Bonzini
2022-11-06 8:51 ` [PULL 01/12] util/main-loop: Fix maximum number of wait objects for win32 Paolo Bonzini
2022-11-06 8:51 ` [PULL 02/12] util/main-loop: Avoid adding the same HANDLE twice Paolo Bonzini
2022-11-06 8:51 ` [PULL 03/12] util/aio-win32: Correct the event array size in aio_poll() Paolo Bonzini
2022-11-06 8:51 ` [PULL 04/12] gdb-xml: Fix size of EFER register on i386 architecture when debugged by GDB Paolo Bonzini
2022-11-06 8:51 ` [PULL 05/12] Fix broken configure with -Wunused-parameter Paolo Bonzini
2022-11-06 8:51 ` [PULL 06/12] meson: avoid unused arguments of main() in compiler tests Paolo Bonzini
2022-11-06 8:51 ` [PULL 07/12] Add missing include statement for global xml_builtin Paolo Bonzini
2022-11-06 8:51 ` [PULL 08/12] module: removed unused function argument "mayfail" Paolo Bonzini
2022-11-06 8:51 ` [PULL 09/12] module: rename module_load_one to module_load Paolo Bonzini
2022-11-06 8:51 ` [PULL 10/12] module: add Error arguments to module_load and module_load_qom Paolo Bonzini
2022-11-06 8:51 ` [PULL 11/12] dmg: warn when opening dmg images containing blocks of unknown type Paolo Bonzini
2022-11-06 8:51 ` Paolo Bonzini [this message]
2022-11-07 8:35 ` [PULL 12/12] accel: abort if we fail to load the accelerator plugin Claudio Fontana
2022-11-07 20:03 ` [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2 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=20221106085115.257018-13-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=armbru@redhat.com \
--cc=cfontana@suse.de \
--cc=f4bug@amsat.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).