From nobody Mon Feb 9 16:12:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1593004527; cv=none; d=zohomail.com; s=zohoarc; b=bj5uGJLjZfAyLjYs7JpzFEQi5CdPExG0qNhPWrdA2JfJIpOLgNSjQowOEoAowmEQl62Os0cBsQgjbZgagkd6JmS1NnBTXltpesddjWpCMNrw5AaZHor+UHGfpi3WFiK+6BMdOIMlADMeAJreeG62GldJ880kBZL9ka/GCi/swoI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593004527; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=3arQYzUakvsEsZj46IHWx5U5R2JTza3tPTR92n9R/ag=; b=jE+XP/iiRXHd9aVkYF40pcO/3Ft5iyjeD0eCeW4z5BXsPrxqd9q78m8IwJcjGvRkVCBNNTlTo/VDZ91bNrVxoAqlrMizwDxtDXSWgRyCgjBfnzG3zqTfDsioD9YFV6oTDId82v7EkzHbC1p7OOhuce048IgvMjd1j8BhMMNgra4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593004527467452.69029320147445; Wed, 24 Jun 2020 06:15:27 -0700 (PDT) Received: from localhost ([::1]:36652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jo5FO-0000Eb-HB for importer@patchew.org; Wed, 24 Jun 2020 09:15:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jo5BB-0002Oo-Sl for qemu-devel@nongnu.org; Wed, 24 Jun 2020 09:11:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58851 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jo5B5-0001S7-H3 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 09:11:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-174-juzJG9ksMGWUmeYhD7FfrA-1; Wed, 24 Jun 2020 09:10:56 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B7B63805EE5 for ; Wed, 24 Jun 2020 13:10:55 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 818A979317; Wed, 24 Jun 2020 13:10:46 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B530D59CC; Wed, 24 Jun 2020 15:10:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593004258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=3arQYzUakvsEsZj46IHWx5U5R2JTza3tPTR92n9R/ag=; b=Gxu7cECBpMDp7ei5WpAK20IEnFpsj0iHft76pMSYgBnUm/0yu3VA9Kjho0hP039nEgQJpR 6845u9pBkLsdVU7Zxt5IWSbjSzrlUHXwiIuadlUPc9hsULyXJ8HEBltn98XNY1WHTi0QRb E67WwwnjLMBCdmPv+JTNeBd64VpmaTs= X-MC-Unique: juzJG9ksMGWUmeYhD7FfrA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v5 03/10] qdev: device module support Date: Wed, 24 Jun 2020 15:10:38 +0200 Message-Id: <20200624131045.14512-4-kraxel@redhat.com> In-Reply-To: <20200624131045.14512-1-kraxel@redhat.com> References: <20200624131045.14512-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dinechin@redhat.com, Paolo Bonzini , philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hook module loading into the places where we need it when building devices as modules. Signed-off-by: Gerd Hoffmann --- 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 *bu= s) */ DeviceState *qdev_new(const char *name) { + if (!object_class_by_name(name)) { + module_load_qom_one(name); + } return DEVICE(object_new(name)); } =20 @@ -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)); } =20 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; =20 + module_load_qom_all(); list =3D object_class_get_list_sorted(TYPE_DEVICE, false); =20 for (i =3D 0; i <=3D 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 =3D *driver; =20 - oc =3D object_class_by_name(*driver); + oc =3D module_object_class_by_name(*driver); if (!oc) { const char *typename =3D find_typename_by_alias(*driver); =20 if (typename) { *driver =3D typename; - oc =3D object_class_by_name(*driver); + oc =3D module_object_class_by_name(*driver); } } =20 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_impleme= nts, { ObjectTypeInfoList *ret =3D NULL; =20 + module_load_qom_all(); object_class_foreach(qom_list_types_tramp, implements, abstract, &ret); =20 return ret; @@ -130,7 +131,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(cons= t char *typename, ObjectPropertyIterator iter; ObjectPropertyInfoList *prop_list =3D NULL; =20 - klass =3D object_class_by_name(typename); + klass =3D module_object_class_by_name(typename); if (klass =3D=3D 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) =20 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]); } =20 static const char * --=20 2.18.4