From nobody Thu May 16 21:57:35 2024 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=1591257687; cv=none; d=zohomail.com; s=zohoarc; b=JV/ufN3qNYbTZDw9iwTpmrGiW1AR8fg+VrUZWKDxKC4AqoaehLrL84GHe+kOoSizO/0sxTxPygpywjpjF021yCBZdxhWp2gVeAB/CXHxveRNy1Riipj5jyA2no59D5hqmwXPOHPfh/MWmvlsxki6H/usheSD8jMRYCP2WaKaq1I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591257687; 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=euGnZ0mXkpDbiIB3+J12v18JKo31fmptKFHyZ0Hs2b8=; b=F6woeI1p5Ab+V260fKfkSgUcxRNJg/teH5TQPp6wGxp0Zk/OWS1feihqQLlwvjqO0QCnFlx6frm2GJB8SMntu4pX6TxdNmhSkX1/2uVDK/PT4jwkshonFQfZIuVYHxT3OIeHL1hpL5Mw+TBmqlUueLkOw4YYSl9P8I4kS/WobYY= 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 1591257686758574.1178031827031; Thu, 4 Jun 2020 01:01:26 -0700 (PDT) Received: from localhost ([::1]:47596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgkoX-0002o9-F7 for importer@patchew.org; Thu, 04 Jun 2020 04:01:25 -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 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 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) 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= X-MC-Unique: VFgQ8H7KN9-J6rrW2Suy9Q-1 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 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.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+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" 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 *listene= r); */ bool qdev_should_hide_device(QemuOpts *opts); =20 +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) =20 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 *n= ame) return dev; } =20 +/* + * 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[] =3D { +}; + +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 =3D 0; i < ARRAY_SIZE(hwmodules); i++) { + if (strcmp(hwmodules[i].type, type) =3D=3D 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 =3D 0; i < ARRAY_SIZE(hwmodules); i++) { + hw_module_load_one(hwmodules[i].mod); + } + qdev_module_loaded_all =3D true; +} + DeviceState *qdev_try_create(BusState *bus, const char *type) { DeviceState *dev; =20 + if (object_class_by_name(type) =3D=3D NULL) { + qdev_module_load_type(type); + } if (object_class_by_name(type) =3D=3D 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; =20 + qdev_module_load_all(); list =3D object_class_get_list_sorted(TYPE_DEVICE, false); =20 for (i =3D 0; i <=3D DEVICE_CATEGORY_MAX; i++) { @@ -224,6 +225,10 @@ static DeviceClass *qdev_get_device_class(const char *= *driver, Error **errp) oc =3D object_class_by_name(*driver); } } + if (!oc) { + qdev_module_load_type(*driver); + oc =3D object_class_by_name(*driver); + } =20 if (!object_class_dynamic_cast(oc, TYPE_DEVICE)) { if (*driver !=3D original_name) { --=20 2.18.4 From nobody Thu May 16 21:57:35 2024 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=1591257787; cv=none; d=zohomail.com; s=zohoarc; b=G8f/Mw2IjlsXWwzPlsinznQsmzleMLVA0wBT4+W0rCykKxmivRmam4tB8sVpGSBJJAVSz00tXWORfvrX0m/DPqP0dEh0rBxNPR6zfWEggeoOCXbeQsIYCiKfZijt0IBXJJpCU2jzPsTQU/A01K9IfPxiAb6yiosF7muXi7gnOs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591257787; 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=3CtbA+4hlMXeh/iv82sEaLpTQP7GlES7G01nS7YMO54=; b=YOjqi7PPfavFbzQ6qjSJi6LwHWPIsRbyYBMRkmrxyt2ooGMbtsDrBC3eax8RZ+sIwKVwcHAB3BpnISHIWkfe7HMJE6rFuTvFfIS/Lfsym7h8j6LYqdAuANWDzvo7nCubA6CjX8WVDiGIoRiSa3EEcGAuMZvjJnxa0325STppMA4= 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 1591257787347750.3578802476458; Thu, 4 Jun 2020 01:03:07 -0700 (PDT) Received: from localhost ([::1]:51580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgkqA-0004XJ-65 for importer@patchew.org; Thu, 04 Jun 2020 04:03:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgknA-0001ph-1z for qemu-devel@nongnu.org; Thu, 04 Jun 2020 04:00:00 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52014 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 1jgkn6-0007dW-7R for qemu-devel@nongnu.org; Thu, 04 Jun 2020 03:59:59 -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-313-WvkOUdG-OI6vn8A62gTvqQ-1; Thu, 04 Jun 2020 03:59:51 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDD9318FE86D 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 3C2A610013C0; Thu, 4 Jun 2020 07:59:44 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 6067C17510; Thu, 4 Jun 2020 09:59:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591257595; 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=3CtbA+4hlMXeh/iv82sEaLpTQP7GlES7G01nS7YMO54=; b=fAuZ0EG9DjzvO4uRvbSZJqKOxoF37xZ7nob3dYX4g5lOt+6Sko2bEyKZeRqMwuU607FKzm Mwi5mQrbm32gbPyjxuuRv+6VoNVg4yx6hx8aSwlDfM0UjGMXmU/xJrGqVVDYsSErcGWxYP 6fTiTy2wRhp7CM2Mj/Q21/eP2+c6Aq4= X-MC-Unique: WvkOUdG-OI6vn8A62gTvqQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH 2/2] vga: build qxl as module Date: Thu, 4 Jun 2020 09:59:43 +0200 Message-Id: <20200604075943.7001-3-kraxel@redhat.com> In-Reply-To: <20200604075943.7001-1-kraxel@redhat.com> References: <20200604075943.7001-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/04 01:14:08 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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+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" Open questions: * Do we want this be contigurable? If so, how? Does our miniconf support tristate Kconfig options? * The Makefile.target chunk feels quite hackish. Better ideas anyone? Signed-off-by: Gerd Hoffmann --- Makefile.objs | 1 + Makefile.target | 7 +++++++ hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 4 +++- 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Makefile.objs b/Makefile.objs index 99774cfd2545..28c165c0e623 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -59,6 +59,7 @@ common-obj-y +=3D migration/ common-obj-y +=3D audio/ common-obj-m +=3D audio/ common-obj-y +=3D hw/ +common-obj-m +=3D hw/ =20 common-obj-y +=3D replay/ =20 diff --git a/Makefile.target b/Makefile.target index 8ed1eba95b9c..c70325df5796 100644 --- a/Makefile.target +++ b/Makefile.target @@ -179,6 +179,13 @@ endif # CONFIG_SOFTMMU dummy :=3D $(call unnest-vars,,obj-y) all-obj-y :=3D $(obj-y) =20 +# +# common-obj-m has some crap here, probably as side effect from +# filling obj-y. Clear it. Fixes suspious dependency errors when +# building devices as modules. +# +common-obj-m :=3D + include $(SRC_PATH)/Makefile.objs dummy :=3D $(call unnest-vars,.., \ authz-obj-y \ diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 20e5c4cbafd8..9ab30676fff7 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -156,6 +156,8 @@ static struct { const char *type; const char *mod; } const hwmodules[] =3D { + { .type =3D "qxl-vga", .mod =3D "display-qxl" }, + { .type =3D "qxl", .mod =3D "display-qxl" }, }; =20 static bool qdev_module_loaded_all; diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 660e2b437348..fdbc7b017487 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,4 +43,5 @@ devices-dirs-y +=3D smbios/ endif =20 common-obj-y +=3D $(devices-dirs-y) +common-obj-m +=3D display/ obj-y +=3D $(devices-dirs-y) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 77a7d622bd2d..e2003d7083c2 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -44,7 +44,9 @@ common-obj-$(CONFIG_ARTIST) +=3D artist.o =20 obj-$(CONFIG_VGA) +=3D vga.o =20 -common-obj-$(CONFIG_QXL) +=3D qxl.o qxl-logger.o qxl-render.o +#common-obj-$(CONFIG_QXL) +=3D qxl.mo +common-obj-m +=3D qxl.mo +qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o =20 obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o virtio-gpu-3d= .o obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o --=20 2.18.4