From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D614C433DF for ; Thu, 4 Jun 2020 08:01:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DBE2E206DC for ; Thu, 4 Jun 2020 08:01:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="D+d/0bFI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBE2E206DC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgkoT-0002o9-TC for qemu-devel@archiver.kernel.org; Thu, 04 Jun 2020 04:01:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgkn6-0001kz-9w for qemu-devel@nongnu.org; Thu, 04 Jun 2020 03:59:56 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:33123 helo=us-smtp-delivery-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 1jgkn4-0007cu-Jw for qemu-devel@nongnu.org; Thu, 04 Jun 2020 03:59:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591257592; 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=euGnZ0mXkpDbiIB3+J12v18JKo31fmptKFHyZ0Hs2b8=; b=D+d/0bFIg44SKX+HzjalZ6SqsKaNGsRReDrJEWiZ8pc3/ku9FjcsIKvu9uTsy2i1DXq4bE JVnBRG3EHOUmk1uED6IDQMHkQdG6A8NMgY9D6uzR9Rvf6b65phdhCnTJYQNBRUPrmLQSX3 YE0raaFaRNmkWf8VEMneO1EUpdCb0M0= 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-268-VFgQ8H7KN9-J6rrW2Suy9Q-1; Thu, 04 Jun 2020 03:59:51 -0400 X-MC-Unique: VFgQ8H7KN9-J6rrW2Suy9Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A2A0C8018A5 for ; Thu, 4 Jun 2020 07:59:50 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-113-50.ams2.redhat.com [10.36.113.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BE771BCBE; Thu, 4 Jun 2020 07:59:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 51A361750A; Thu, 4 Jun 2020 09:59:43 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 1/2] qdev: add support for device module loading Date: Thu, 4 Jun 2020 09:59:42 +0200 Message-Id: <20200604075943.7001-2-kraxel@redhat.com> In-Reply-To: <20200604075943.7001-1-kraxel@redhat.com> References: <20200604075943.7001-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Received-SPF: pass client-ip=205.139.110.61; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/04 01:08:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_H2=-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: dinechin@redhat.com, Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Gerd Hoffmann Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When compiling devices as modules we'll need some infrastrtucture to actually load those modules. This patch adds it. FIXME: Probably need to sprinkle a qdev_module_load_all() call somewhere into monitor code to make QOM introspection work properly for modular devices. Didn't manage yet to find the place. Signed-off-by: Gerd Hoffmann --- include/hw/qdev-core.h | 3 +++ include/qemu/module.h | 1 + hw/core/qdev.c | 47 ++++++++++++++++++++++++++++++++++++++++++ qdev-monitor.c | 5 +++++ 4 files changed, 56 insertions(+) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index b870b279661a..a96c890bb95b 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -552,4 +552,7 @@ void device_listener_unregister(DeviceListener *listener); */ bool qdev_should_hide_device(QemuOpts *opts); +void qdev_module_load_type(const char *type); +void qdev_module_load_all(void); + #endif diff --git a/include/qemu/module.h b/include/qemu/module.h index 011ae1ae7605..077a6b09bca7 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -64,6 +64,7 @@ typedef enum { #define block_module_load_one(lib) module_load_one("block-", lib) #define ui_module_load_one(lib) module_load_one("ui-", lib) #define audio_module_load_one(lib) module_load_one("audio-", lib) +#define hw_module_load_one(lib) module_load_one("hw-", lib) void register_module_init(void (*fn)(void), module_init_type type); void register_dso_module_init(void (*fn)(void), module_init_type type); diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 9e5538aeaebd..20e5c4cbafd8 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -146,10 +146,57 @@ DeviceState *qdev_create(BusState *bus, const char *name) return dev; } +/* + * Building devices modular is mostly useful in case they have + * dependencies to external libraries. Which is the case for very few + * devices. So with the expecration that this will be rather the + * exception than to rule go with a simple hardcoded list for now ... + */ +static struct { + const char *type; + const char *mod; +} const hwmodules[] = { +}; + +static bool qdev_module_loaded_all; + +void qdev_module_load_type(const char *type) +{ + int i; + + fprintf(stderr, "%s: %s\n", __func__, type); + if (qdev_module_loaded_all) { + return; + } + for (i = 0; i < ARRAY_SIZE(hwmodules); i++) { + if (strcmp(hwmodules[i].type, type) == 0) { + hw_module_load_one(hwmodules[i].mod); + return; + } + } +} + +void qdev_module_load_all(void) +{ + int i; + + fprintf(stderr, "%s\n", __func__); + if (qdev_module_loaded_all) { + return; + } + for (i = 0; i < ARRAY_SIZE(hwmodules); i++) { + hw_module_load_one(hwmodules[i].mod); + } + qdev_module_loaded_all = true; +} + DeviceState *qdev_try_create(BusState *bus, const char *type) { DeviceState *dev; + if (object_class_by_name(type) == NULL) { + qdev_module_load_type(type); + } if (object_class_by_name(type) == NULL) { return NULL; } diff --git a/qdev-monitor.c b/qdev-monitor.c index a4735d3bb190..55dddeb2f978 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; + qdev_module_load_all(); list = object_class_get_list_sorted(TYPE_DEVICE, false); for (i = 0; i <= DEVICE_CATEGORY_MAX; i++) { @@ -224,6 +225,10 @@ static DeviceClass *qdev_get_device_class(const char **driver, Error **errp) oc = object_class_by_name(*driver); } } + if (!oc) { + qdev_module_load_type(*driver); + oc = object_class_by_name(*driver); + } if (!object_class_dynamic_cast(oc, TYPE_DEVICE)) { if (*driver != original_name) { -- 2.18.4