From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
dinechin@redhat.com, "Paolo Bonzini" <pbonzini@redhat.com>,
philmd@redhat.com
Subject: [PATCH v5 03/10] qdev: device module support
Date: Wed, 24 Jun 2020 15:10:38 +0200 [thread overview]
Message-ID: <20200624131045.14512-4-kraxel@redhat.com> (raw)
In-Reply-To: <20200624131045.14512-1-kraxel@redhat.com>
Hook module loading into the places where we
need it when building devices as modules.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/core/qdev.c | 6 ++++--
qdev-monitor.c | 5 +++--
qom/qom-qmp-cmds.c | 3 ++-
softmmu/vl.c | 4 ++--
4 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 2131c7f951dd..9de16eae05b7 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -137,6 +137,9 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
*/
DeviceState *qdev_new(const char *name)
{
+ if (!object_class_by_name(name)) {
+ module_load_qom_one(name);
+ }
return DEVICE(object_new(name));
}
@@ -147,10 +150,9 @@ DeviceState *qdev_new(const char *name)
*/
DeviceState *qdev_try_new(const char *name)
{
- if (!object_class_by_name(name)) {
+ if (!module_object_class_by_name(name)) {
return NULL;
}
-
return DEVICE(object_new(name));
}
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 22da107484c5..8e7a7f7bbdbc 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -147,6 +147,7 @@ static void qdev_print_devinfos(bool show_no_user)
int i;
bool cat_printed;
+ module_load_qom_all();
list = object_class_get_list_sorted(TYPE_DEVICE, false);
for (i = 0; i <= DEVICE_CATEGORY_MAX; i++) {
@@ -215,13 +216,13 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp)
DeviceClass *dc;
const char *original_name = *driver;
- oc = object_class_by_name(*driver);
+ oc = module_object_class_by_name(*driver);
if (!oc) {
const char *typename = find_typename_by_alias(*driver);
if (typename) {
*driver = typename;
- oc = object_class_by_name(*driver);
+ oc = module_object_class_by_name(*driver);
}
}
diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c
index c5249e44d020..5e2c8cbf333f 100644
--- a/qom/qom-qmp-cmds.c
+++ b/qom/qom-qmp-cmds.c
@@ -116,6 +116,7 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_implements,
{
ObjectTypeInfoList *ret = NULL;
+ module_load_qom_all();
object_class_foreach(qom_list_types_tramp, implements, abstract, &ret);
return ret;
@@ -130,7 +131,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(const char *typename,
ObjectPropertyIterator iter;
ObjectPropertyInfoList *prop_list = NULL;
- klass = object_class_by_name(typename);
+ klass = module_object_class_by_name(typename);
if (klass == NULL) {
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
"Device '%s' not found", typename);
diff --git a/softmmu/vl.c b/softmmu/vl.c
index f669c06ede4a..1297815a5f5b 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -1772,8 +1772,8 @@ static bool vga_interface_available(VGAInterfaceType t)
assert(t < VGA_TYPE_MAX);
return !ti->class_names[0] ||
- object_class_by_name(ti->class_names[0]) ||
- object_class_by_name(ti->class_names[1]);
+ module_object_class_by_name(ti->class_names[0]) ||
+ module_object_class_by_name(ti->class_names[1]);
}
static const char *
--
2.18.4
next prev parent reply other threads:[~2020-06-24 13:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-24 13:10 [PATCH v5 00/10] build some devices as modules Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 01/10] module: qom module support Gerd Hoffmann
2020-07-20 14:16 ` Christophe de Dinechin
2020-07-21 14:16 ` Gerd Hoffmann
2022-09-05 9:17 ` Claudio Fontana
2022-09-05 14:21 ` Philippe Mathieu-Daudé via
2020-06-24 13:10 ` [PATCH v5 02/10] object: " Gerd Hoffmann
2020-07-20 14:20 ` Christophe de Dinechin
2020-07-21 14:26 ` Gerd Hoffmann
2020-07-21 14:35 ` Daniel P. Berrangé
2020-07-22 8:06 ` Christophe de Dinechin
2020-07-22 11:07 ` Gerd Hoffmann
2020-06-24 13:10 ` Gerd Hoffmann [this message]
2020-07-20 14:25 ` [PATCH v5 03/10] qdev: device " Christophe de Dinechin
2020-07-21 14:27 ` Gerd Hoffmann
2020-07-22 8:05 ` Christophe de Dinechin
2020-07-22 11:05 ` Gerd Hoffmann
2020-07-22 14:39 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 04/10] build: fix device module builds Gerd Hoffmann
2020-07-20 14:00 ` Christophe de Dinechin
2020-07-21 14:30 ` Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 05/10] ccid: build smartcard as module Gerd Hoffmann
2020-07-20 14:30 ` Christophe de Dinechin
2020-07-21 14:33 ` Gerd Hoffmann
2020-07-22 8:08 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 06/10] usb: build usb-redir " Gerd Hoffmann
2020-07-20 14:43 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 07/10] vga: build qxl " Gerd Hoffmann
2020-07-20 15:01 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 08/10] vga: build virtio-gpu only once Gerd Hoffmann
2020-06-24 13:10 ` [PATCH v5 09/10] vga: build virtio-gpu as module Gerd Hoffmann
2020-07-20 15:03 ` Christophe de Dinechin
2020-06-24 13:10 ` [PATCH v5 10/10] chardev: enable modules, use for braille Gerd Hoffmann
2020-07-20 15:06 ` Christophe de Dinechin
2020-07-21 14:35 ` Gerd Hoffmann
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=20200624131045.14512-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=berrange@redhat.com \
--cc=dinechin@redhat.com \
--cc=ehabkost@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--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).