From nobody Tue May 7 00:41:10 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=1592834319; cv=none; d=zohomail.com; s=zohoarc; b=QceQoZKsltj1MX6lZ4rjASXrc9H3hktJAmX3u0u5TSU4XT2TaaJZhnQbHOQ3YZZxgo/v5qWPRB2/0Kl4is0maCbVROh8vKwsClKAy9sDTnB1zjjmrb5ZWNsflp0tBr61sy8dct3tx90A0JJGCckLn2fZCsl3QZt9/ARbLVlQDPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834319; 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=qPB343KyU7kxiThl8E/iCJi0KCxYplSXSK26Hiy/p00=; b=WZHnCqMBDUHO9Oi/nrR0WUxwdzKrj+0StTPhgP99IWGL3HJmV6/MAp0qrbHiu7mgv6IRH1UXm/2ssw2W9WS0vwpImaQsQRWRoqLV7YgNEGmbO7eZZCeLQaBIQFLWZ3n2wcpgBQMKmrN7Xb7dk0tFZ8Yr8jyK0V1B5o8KQXLQxpY= 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 1592834319692853.322971792691; Mon, 22 Jun 2020 06:58:39 -0700 (PDT) Received: from localhost ([::1]:40180 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnMy6-0008Ik-F9 for importer@patchew.org; Mon, 22 Jun 2020 09:58:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvl-0005JR-Ms for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41839 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 1jnMvj-0007iP-SR for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:13 -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-463-MDB3GZqrOZqSm5_343yTLA-1; Mon, 22 Jun 2020 09:56:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8D0BC18A072C for ; Mon, 22 Jun 2020 13:56:08 +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 56F207C1FE; Mon, 22 Jun 2020 13:56:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 311101750C; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834171; 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=qPB343KyU7kxiThl8E/iCJi0KCxYplSXSK26Hiy/p00=; b=SkhwQ7PCHZ33a15/aJkCrPuusoPj91Q/bozSlmmUk1xMAeswplbtV/9cWOKBSULTKkI9p0 5z2RZzQCWu0zpY+9yty6c0ACMzMduUSY0pUdqLvJqDko42n8fTnkoua2vE1WgsLas2+orE htpneVP06NTjW5WbuIofST95ra+2CFk= X-MC-Unique: MDB3GZqrOZqSm5_343yTLA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 1/7] qdev: add support for device module loading Date: Mon, 22 Jun 2020 15:55:55 +0200 Message-Id: <20200622135601.12433-2-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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/22 02:57:26 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: dinechin@redhat.com, Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost 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 if needed. This patch adds it. Signed-off-by: Gerd Hoffmann Reviewed-by: Richard Henderson --- include/hw/qdev-core.h | 3 +++ include/qemu/module.h | 1 + hw/core/qdev.c | 55 ++++++++++++++++++++++++++++++++++++++++++ qdev-monitor.c | 5 ++++ qom/qom-qmp-cmds.c | 5 ++++ softmmu/vl.c | 4 +++ stubs/hw-module.c | 10 ++++++++ stubs/Makefile.objs | 1 + 8 files changed, 84 insertions(+) create mode 100644 stubs/hw-module.c diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 7dc10be46f8c..0a33939f4855 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -557,4 +557,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 2131c7f951dd..6119e25e0eeb 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)) { + qdev_module_load_type(name); + } return DEVICE(object_new(name)); } =20 @@ -147,6 +150,9 @@ DeviceState *qdev_new(const char *name) */ DeviceState *qdev_try_new(const char *name) { + if (!object_class_by_name(name)) { + qdev_module_load_type(name); + } if (!object_class_by_name(name)) { return NULL; } @@ -154,6 +160,55 @@ DeviceState *qdev_try_new(const char *name) return DEVICE(object_new(name)); } =20 +/* + * Building devices modular is mostly useful in case they have + * dependencies to external shared libraries, so we can cut down the + * core qemu library dependencies. Which is the case for only a very + * few devices. So with the expectation that this will be rather the + * exception than to rule go with a simple hardcoded list for now + * (instead of generating it automatically somehow). + */ +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; + + 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; + + if (qdev_module_loaded_all) { + return; + } + for (i =3D 0; i < ARRAY_SIZE(hwmodules); i++) { + if (i > 0 && strcmp(hwmodules[i - 1].mod, + hwmodules[i].mod) =3D=3D 0) { + /* one module implementing multiple devices -> load only once = */ + continue; + } + hw_module_load_one(hwmodules[i].mod); + } + qdev_module_loaded_all =3D true; +} + static QTAILQ_HEAD(, DeviceListener) device_listeners =3D QTAILQ_HEAD_INITIALIZER(device_listeners); =20 diff --git a/qdev-monitor.c b/qdev-monitor.c index 22da107484c5..86f29daa7469 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) { diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index c5249e44d020..4e0d7e53cd16 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 + qdev_module_load_all(); object_class_foreach(qom_list_types_tramp, implements, abstract, &ret); =20 return ret; @@ -131,6 +132,10 @@ ObjectPropertyInfoList *qmp_device_list_properties(con= st char *typename, ObjectPropertyInfoList *prop_list =3D NULL; =20 klass =3D object_class_by_name(typename); + if (klass =3D=3D NULL) { + qdev_module_load_type(typename); + klass =3D 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..8d753ead5983 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1770,6 +1770,10 @@ static bool vga_interface_available(VGAInterfaceType= t) { const VGAInterfaceInfo *ti =3D &vga_interfaces[t]; =20 + if (ti->class_names[0] && !object_class_by_name(ti->class_names[0])) { + qdev_module_load_type(ti->class_names[0]); + } + assert(t < VGA_TYPE_MAX); return !ti->class_names[0] || object_class_by_name(ti->class_names[0]) || diff --git a/stubs/hw-module.c b/stubs/hw-module.c new file mode 100644 index 000000000000..58b2160b97fe --- /dev/null +++ b/stubs/hw-module.c @@ -0,0 +1,10 @@ +#include "qemu/osdep.h" +#include "hw/qdev-core.h" + +void qdev_module_load_all(void) +{ +} + +void qdev_module_load_type(const char *type) +{ +} diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 28e48171d1f3..7a9f38f60b78 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -5,6 +5,7 @@ stub-obj-y +=3D dump.o stub-obj-y +=3D error-printf.o stub-obj-y +=3D fdset.o stub-obj-y +=3D gdbstub.o +stub-obj-y +=3D hw-module.o stub-obj-y +=3D iothread-lock.o stub-obj-y +=3D is-daemonized.o stub-obj-$(CONFIG_LINUX_AIO) +=3D linux-aio.o --=20 2.18.4 From nobody Tue May 7 00:41:10 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=1592834269; cv=none; d=zohomail.com; s=zohoarc; b=Cg4tBbpQkDny3dcOSVwsEZwGuLJc8XgR9SURrphTtrbpk7q6pqgiCLlfL5QXMZu+tzbYoTfgU3vRch2Ds/67a2JoA1kCj7mHTy3mVcatxbKwzuxmdCZJJPYCUhcIz2gE/xBwHHkBl6slJzbIsWZ+I3ED1OntZv7HLTVlS0nOCUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834269; 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=4+/WITPq33oOuq4ULbgpiAQx/AA+X0qzxS870TvpddY=; b=flvDrWyhX0O7qLZNf8/iCdhTPswHbM+RzZrjcFjiaFlhk3cj4PewaBDmRNZYafcyCY9JgJA2gZEvlayVGCpMGTOaAeGBe0/s9WLkH8EMJU+wOtfkWuC6PBuOgEHrz7KwaeOcX08RKjMqrMjsxXFbTl22YdNL+BtYOr4gRFBzhkw= 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 1592834269929821.2738675177192; Mon, 22 Jun 2020 06:57:49 -0700 (PDT) Received: from localhost ([::1]:37862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnMxI-0007Nj-Pu for importer@patchew.org; Mon, 22 Jun 2020 09:57:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvn-0005NA-R5 for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:15 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22822 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 1jnMvm-0007ii-9k for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:15 -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-367-hbTFzSpDNsm3E1dnbxv89Q-1; Mon, 22 Jun 2020 09:56:09 -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 74AFA801503 for ; Mon, 22 Jun 2020 13:56:08 +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 5353F10013D7; Mon, 22 Jun 2020 13:56:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 399B41753C; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834173; 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=4+/WITPq33oOuq4ULbgpiAQx/AA+X0qzxS870TvpddY=; b=YPzP9DxuRImIggSQOKYnti09OKSCYCgzi60ajGliv9VPZ1aGuKkXDzHEeuTKJp/X6+loiz Y4VLQHvO5HMVdk0NdAyx1PyM7xVMfaYX/unonfC+kkCvHk/ba4Z8qL7qeoEZAW4GBCJ41Z Rp1RNebmr2MVIdorB1OP/KXlObXGIyI= X-MC-Unique: hbTFzSpDNsm3E1dnbxv89Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 2/7] build: fix device module builds Date: Mon, 22 Jun 2020 15:55:56 +0200 Message-Id: <20200622135601.12433-3-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-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.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 02:57:26 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, 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?= , Gerd Hoffmann , Eduardo Habkost 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" See comment. Feels quite hackish. Better ideas anyone? Signed-off-by: Gerd Hoffmann --- Makefile.target | 7 +++++++ 1 file changed, 7 insertions(+) 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 \ --=20 2.18.4 From nobody Tue May 7 00:41:10 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=1592834700; cv=none; d=zohomail.com; s=zohoarc; b=a724qArAARWur6ohNvHnmsMurqNlwlBRXYWG0fRlyOf/hAckJwVpCNv0kUHU61qy6McQPpBqCNRWshNUXKEK58FwFT/JiIYMZzQLurssjzFqHMMiXFxJlGgw9sg7qLhlHnSKTeANLCIzND1X/XjcRM2mJUuCzdWW/fFQ86sK8kA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834700; 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=vhTeCajKC2nULXLiXiNaBtZWkN7Tx6hzRVNzLfPfrAc=; b=jmun0Bbe9lDA70zal4I2HFnUh9DGTQShLPxhc9LE87jgNXY15FOqQJcxyTBweQB2lktsgP55aH6nomw2jqbySknFcFWnScYvVEABPYD3h1xkLzMrnJdqFCwe6B+kofA8/Dp1Q4yMna6foP3RaeDp0mH1yxyoMrqasgolCmIBb0o= 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 1592834700134250.63812869916296; Mon, 22 Jun 2020 07:05:00 -0700 (PDT) Received: from localhost ([::1]:58376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnN4E-0007bb-QY for importer@patchew.org; Mon, 22 Jun 2020 10:04:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvu-0005ZH-Rq for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24723 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 1jnMvo-0007jK-HJ for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:22 -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-497-RjxYKOTLNEiMCb94DBk_eg-1; Mon, 22 Jun 2020 09:56:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B3A9100CC85 for ; Mon, 22 Jun 2020 13:56:08 +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 4B81A7C1F9; Mon, 22 Jun 2020 13:56:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4730B1753D; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834175; 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=vhTeCajKC2nULXLiXiNaBtZWkN7Tx6hzRVNzLfPfrAc=; b=Osz5FVVEcVF+cyIF9lqK/MoCdOzd8/qJzaoMLi4idTdhkRIemylAh92r149SyKojGFT/Ny NL7c5veuzPP3A7lxEMoie9dcr8g8pnanpm+FJFRcgD2DiVOURSaOwtNVprtzMWlw8a7j9h zs+Nu4KIvE9dyk4/ioW7cPFParBa87o= X-MC-Unique: RjxYKOTLNEiMCb94DBk_eg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 3/7] ccid: build smartcard as module Date: Mon, 22 Jun 2020 15:55:57 +0200 Message-Id: <20200622135601.12433-4-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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/22 02:57:26 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, 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?= , Gerd Hoffmann , Eduardo Habkost 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" Drops libcacard.so dependency from core qemu. Signed-off-by: Gerd Hoffmann --- Makefile.objs | 1 + hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/usb/Makefile.objs | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.objs b/Makefile.objs index 7ce2588b89a3..ca555ede0710 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/hw/core/qdev.c b/hw/core/qdev.c index 6119e25e0eeb..d6459e4aa8e8 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -172,6 +172,8 @@ static struct { const char *type; const char *mod; } const hwmodules[] =3D { + { .type =3D "ccid-card-passthru", .mod =3D "usb-smartcard" = }, + { .type =3D "ccid-card-emulated", .mod =3D "usb-smartcard" = }, }; =20 static bool qdev_module_loaded_all; diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4cbe5e4e57d6..af8fd9a510ed 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 usb/ obj-y +=3D $(devices-dirs-y) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index fa5c3fa1b877..3c5b3d4fadd3 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -29,11 +29,13 @@ common-obj-$(CONFIG_USB_NETWORK) +=3D dev-network.o =20 ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y +=3D dev-smartcard-reader.o -common-obj-$(CONFIG_SMARTCARD) +=3D smartcard.mo +ifeq ($(CONFIG_SMARTCARD),y) +common-obj-m +=3D smartcard.mo smartcard.mo-objs :=3D ccid-card-passthru.o ccid-card-emulated.o smartcard.mo-cflags :=3D $(SMARTCARD_CFLAGS) smartcard.mo-libs :=3D $(SMARTCARD_LIBS) endif +endif =20 ifeq ($(CONFIG_POSIX),y) common-obj-$(CONFIG_USB_STORAGE_MTP) +=3D dev-mtp.o --=20 2.18.4 From nobody Tue May 7 00:41:10 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=1592834471; cv=none; d=zohomail.com; s=zohoarc; b=eMpDCKsgzkiiIdHU4fyfmTTZFOFIWasgnWs2oaa6N466v5foNwwS8T2/CWlvTf7bnQ3WMxhNL+z1Z6B5jnnUBPIwQ6zQI9ffRHwX6uIAAonFcYudB9/lwrne50pU6wSBkGQ4UTlr8ijANIA162UQOJGbgAirlSwIyUG+kitjOGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834471; 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=W8gbI8KRCrUVM0ZRjcx8SDNrJaT9c2nnHM26ICBr8o0=; b=Y8Jrps2bmzJwiLIeEfmk6GIOck160oaWdnykKfYzy52/5tvhKJxJUZxB9brEOxowtEm6SdjvRkfKgS2BoHyOBE8HNye1A8NubrtEgzJAEwqHtb9HnPlVQoHtTOieUbeMYgbEzPaznV+jJVzFswF5SwKEbOP+xGoOEf3ntNNzMFo= 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 1592834471791202.92470187760773; Mon, 22 Jun 2020 07:01:11 -0700 (PDT) Received: from localhost ([::1]:46856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnN0X-0002oi-0S for importer@patchew.org; Mon, 22 Jun 2020 10:01:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvr-0005SD-4n for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:19 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:33079 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 1jnMvn-0007j6-VA for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:18 -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-399-9_fskh8xOfK4C5PiMNF_ow-1; Mon, 22 Jun 2020 09:56:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B77757097 for ; Mon, 22 Jun 2020 13:56:09 +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 4BC0B5C1BD; Mon, 22 Jun 2020 13:56:03 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 519CE9D8F; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834175; 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=W8gbI8KRCrUVM0ZRjcx8SDNrJaT9c2nnHM26ICBr8o0=; b=dQBCA7qzAlPuavxwhOq5XbQZK5qROZc7786SGjISW4a4gwFC5YuLBwuloGNwbKhHmlBKD/ uT0O2zda3ASG5ITVyQoVQFzvoL86ygqshYd2U0g/OgMgg+NSkULQeHZvSs4IUjboDYyHX0 vhP2h+4gGN3+9nyG2uFEo3vE+kj2ZV8= X-MC-Unique: 9_fskh8xOfK4C5PiMNF_ow-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 4/7] usb: build usb-redir as module Date: Mon, 22 Jun 2020 15:55:58 +0200 Message-Id: <20200622135601.12433-5-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 02:57:26 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, 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?= , Gerd Hoffmann , Eduardo Habkost 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" Drops libusbredirparser.so dependency from core qemu. Signed-off-by: Gerd Hoffmann --- hw/core/qdev.c | 1 + hw/usb/Makefile.objs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index d6459e4aa8e8..e77f40db675c 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -174,6 +174,7 @@ static struct { } const hwmodules[] =3D { { .type =3D "ccid-card-passthru", .mod =3D "usb-smartcard" = }, { .type =3D "ccid-card-emulated", .mod =3D "usb-smartcard" = }, + { .type =3D "usb-redir", .mod =3D "usb-redirect" = }, }; =20 static bool qdev_module_loaded_all; diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 3c5b3d4fadd3..3bb8dd53421a 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -43,9 +43,12 @@ endif =20 # usb redirection ifeq ($(CONFIG_USB),y) -common-obj-$(CONFIG_USB_REDIR) +=3D redirect.o quirks.o -redirect.o-cflags =3D $(USB_REDIR_CFLAGS) -redirect.o-libs =3D $(USB_REDIR_LIBS) +ifeq ($(CONFIG_USB-REDIR),y) +common-obj-m +=3D redirect.mo +redirect.mo-objs =3D redirect.o quirks.o +redirect.mo-cflags =3D $(USB_REDIR_CFLAGS) +redirect.mo-libs =3D $(USB_REDIR_LIBS) +endif endif =20 # usb pass-through --=20 2.18.4 From nobody Tue May 7 00:41:10 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=1592834410; cv=none; d=zohomail.com; s=zohoarc; b=A6mD/TYDNfPXW4kc1YS1UtiYTi0Trm5ZWO+mydrATKaSJZDcuPkhwCFpkJY+UrYBHGV5pM0atLOF6e3L/s22VWOBdLm/wuPKnTWujpnZWvPDYs9hsR+z6PUiQcmtcvBGCi9JzfIIxbvM0LNvQ0J7EIwRS020saDNpGmCF7BxDUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834410; 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=Xw2C1XUgrirkNPuyAqcced0++6Fj15FoEHfU1wvSfz0=; b=NvNk/7yyL9tkfcgwWrmFPJMYN5oA85OhzFO+RC8xR+pLBFaozHrUpoavfoA+v2TLACNNufiNg3R7mxiuwgGKigbqASFrSHj+Onw4Sdau+v5d7Z7f6ayRKlB2xpjt7VCO6W4NTLlJzfQZwmGLPdzBycBCqqX8v3kDWHdZo/vAXnE= 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 1592834409624338.61663573502017; Mon, 22 Jun 2020 07:00:09 -0700 (PDT) Received: from localhost ([::1]:44328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnMzU-0001cH-CZ for importer@patchew.org; Mon, 22 Jun 2020 10:00:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvq-0005R1-Cl for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:18 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:46362 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 1jnMvn-0007j1-Rb for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:18 -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-134-giRmH-TmOFOAgamSLUVq2Q-1; Mon, 22 Jun 2020 09:56:10 -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 3C5CA57094 for ; Mon, 22 Jun 2020 13:56:09 +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 CF8E010013D7; Mon, 22 Jun 2020 13:56:08 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5D9C59D92; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834175; 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=Xw2C1XUgrirkNPuyAqcced0++6Fj15FoEHfU1wvSfz0=; b=ibNtFSKL+fNfasU6dpG/Bq6gfDVjWIqD8iKz1rcAo/fXQ9wySEXeNpspEgz6kETwOI0BZ6 VYJ9IPCaJ+Ta7xBAPf5MMMhHElpEl8jyG+or2kpJtlnlpGWnDrirTQIZe/tYnIFyR6R0YS Ylz02dv5IeekR0yTVEfnhonPSmF81GI= X-MC-Unique: giRmH-TmOFOAgamSLUVq2Q-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 5/7] vga: build qxl as module Date: Mon, 22 Jun 2020 15:55:59 +0200 Message-Id: <20200622135601.12433-6-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-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=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/22 01:27:42 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, 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?= , Gerd Hoffmann , Eduardo Habkost 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" First step in making spice support modular. Signed-off-by: Gerd Hoffmann --- hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index e77f40db675c..fe3dec9595cd 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -175,6 +175,8 @@ static struct { { .type =3D "ccid-card-passthru", .mod =3D "usb-smartcard" = }, { .type =3D "ccid-card-emulated", .mod =3D "usb-smartcard" = }, { .type =3D "usb-redir", .mod =3D "usb-redirect" = }, + { .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 af8fd9a510ed..14b7ea4eb62e 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,5 +43,6 @@ devices-dirs-y +=3D smbios/ endif =20 common-obj-y +=3D $(devices-dirs-y) +common-obj-m +=3D display/ common-obj-m +=3D usb/ obj-y +=3D $(devices-dirs-y) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 77a7d622bd2d..76b3571e4902 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -44,7 +44,10 @@ 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 +ifeq ($(CONFIG_QXL),y) +common-obj-m +=3D qxl.mo +qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o +endif =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 From nobody Tue May 7 00:41:10 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=1592834370; cv=none; d=zohomail.com; s=zohoarc; b=MOanYiDiDzYALi9Fsc+qX1XTYIvmbdtzKqJoxu9++B2Oa7AH1733ozcbm/ZaSpH7tZ4aYvgJPi73eygRHwS/CnEJqEJtJg56cDuoOdfFDtYsraHNJVEvHP4b/dqP98893W7oXGYIVmMRd+kn1QSgXU22kRWxRg4c1aTezdF+9Fk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834370; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+fe8BYH1YDyqVe9iNEOk6dpYQe4tDIxPQC7jVI46fPM=; b=mxRtFHdDfKN7RmhM3GC9fEnlKdEUHG0suUN8zOSturC+YPB5Bb3CK1FT2nM26rZDpoTq6caqvV21nGI3LPk9IoO2w4nKZzgZVDcXwwYW2RPR8NvFtZAATibkuY7sA0GxE7IaKvCugKn5RKzKof5HzysRZz7Hf2dft15jNfg8Wq4= 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 1592834370557918.8325825598639; Mon, 22 Jun 2020 06:59:30 -0700 (PDT) Received: from localhost ([::1]:42854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnMyu-0000zF-AU for importer@patchew.org; Mon, 22 Jun 2020 09:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvs-0005UT-8i for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:20 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:60110 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 1jnMvp-0007jd-EY for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:19 -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-134-doya-x_WMb28w69uh1wiDA-1; Mon, 22 Jun 2020 09:56:10 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D903107ACF7 for ; Mon, 22 Jun 2020 13:56:09 +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 CC34E707C6; Mon, 22 Jun 2020 13:56:08 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 665BA9D94; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+fe8BYH1YDyqVe9iNEOk6dpYQe4tDIxPQC7jVI46fPM=; b=WexksQG42bkF4Co0NIIHTwBBLQoTi7ObuQG/kg+5XUO4uO3XxFQye1BJ2Ct0H8bIRmBRq/ pO9F//DH+wA8zmXHv2LZ/oXbntka+cRyLFO9IcZgXczzZp4c2dhih69CWwSSh37iM6u+lU pjEQvTur8LRPLp/ILhuWA+m4qzXlXiQ= X-MC-Unique: doya-x_WMb28w69uh1wiDA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 6/7] vga: build virtio-gpu only once Date: Mon, 22 Jun 2020 15:56:00 +0200 Message-Id: <20200622135601.12433-7-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/22 01:27:42 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, 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?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/display/Makefile.objs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 76b3571e4902..d619594ad4d3 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -49,12 +49,12 @@ common-obj-m +=3D qxl.mo qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o endif =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 -obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D virtio-gpu= -pci.o -obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) +=3D vhost-= user-gpu-pci.o -obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o -obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o +common-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o virtio= -gpu-3d.o +common-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o +common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D vir= tio-gpu-pci.o +common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= vhost-user-gpu-pci.o +common-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o +common-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o virtio-gpu.o-cflags :=3D $(VIRGL_CFLAGS) virtio-gpu.o-libs +=3D $(VIRGL_LIBS) virtio-gpu-3d.o-cflags :=3D $(VIRGL_CFLAGS) --=20 2.18.4 From nobody Tue May 7 00:41:10 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=1592834608; cv=none; d=zohomail.com; s=zohoarc; b=BzKRrIh8Kth3vEoHGr7ugFHZdV0OZr7hSVA2dk4wtpNmKNMtJ3s22bmZTV6wL2RVeoeiMsRTpOO7QfKlDhIIZiu3u3yi+4ON+Psm4K2oIWROVNCIJrhIGapsc9Xgg0jDXYUzYTt8XGcxMUcyLAcmJv+xr8hZMwPexuCuFfHB79g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834608; 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=GFKzy0H8I1XUkkRGSwDjxG6mEbWRVDZgXNL+OGQJ9WE=; b=lFswY/As2/OCrCezpVBbhG/iQOreGIQOv7w7/R6uDIFD3g5q70ziXxZUUvnLI8oTIcnw6LdcogE8jCa/4YuSSzt3DURUPniyFValP3o3UQYkgI1GJUD4yhn1NMIH2v6YJWQFM798hTLMkjKcpJbLlb/RQ6Li3vrTpscua2R5alQ= 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 1592834608660993.0334631032882; Mon, 22 Jun 2020 07:03:28 -0700 (PDT) Received: from localhost ([::1]:53170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnN2l-0005T1-3d for importer@patchew.org; Mon, 22 Jun 2020 10:03:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvt-0005W5-4G for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:21 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:30112 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 1jnMvo-0007jM-QA for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:20 -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-37-0jOutSOuPJ2-zOYXqql6Pw-1; Mon, 22 Jun 2020 09:56:10 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD52B18A0726 for ; Mon, 22 Jun 2020 13:56:09 +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 6EBA75D9E2; Mon, 22 Jun 2020 13:56:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 70C4C9D95; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834176; 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=GFKzy0H8I1XUkkRGSwDjxG6mEbWRVDZgXNL+OGQJ9WE=; b=RRb2gcW7FEZAdmFn8DwcFOIfuhQ7c/kdufhiHFi70bk/HrLhQ7K2Hbfv1qiNgmyEMaBIhJ X30EY0gYxk91+d8gcCqJe7q1ZfJ1wfFiAIq0cJP9BjyyN80AGnjmZ6tBuyXtmBPyNl1ZtE VAS780pD+6/gR8qM+LYTPmPkf4lT7N4= X-MC-Unique: 0jOutSOuPJ2-zOYXqql6Pw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 7/7] vga: build virtio-gpu as module Date: Mon, 22 Jun 2020 15:56:01 +0200 Message-Id: <20200622135601.12433-8-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com 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.81; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 02:57:26 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, 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?= , Gerd Hoffmann , Eduardo Habkost 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" Drops libvirglrenderer.so dependency from core qemu. Signed-off-by: Gerd Hoffmann --- hw/core/qdev.c | 6 ++++++ hw/display/Makefile.objs | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index fe3dec9595cd..59b9c45e607f 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -177,6 +177,12 @@ static struct { { .type =3D "usb-redir", .mod =3D "usb-redirect" = }, { .type =3D "qxl-vga", .mod =3D "display-qxl" = }, { .type =3D "qxl", .mod =3D "display-qxl" = }, + { .type =3D "virtio-gpu-device", .mod =3D "display-virtio-gpu" = }, + { .type =3D "virtio-gpu-pci", .mod =3D "display-virtio-gpu" = }, + { .type =3D "virtio-vga", .mod =3D "display-virtio-gpu" = }, + { .type =3D "vhost-user-gpu-device", .mod =3D "display-virtio-gpu" = }, + { .type =3D "vhost-user-gpu-pci", .mod =3D "display-virtio-gpu" = }, + { .type =3D "vhost-user-vga", .mod =3D "display-virtio-gpu" = }, }; =20 static bool qdev_module_loaded_all; diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index d619594ad4d3..e907f3182b0c 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -49,16 +49,19 @@ common-obj-m +=3D qxl.mo qxl.mo-objs =3D qxl.o qxl-logger.o qxl-render.o endif =20 -common-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o virtio= -gpu-3d.o -common-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o -common-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D vir= tio-gpu-pci.o -common-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= vhost-user-gpu-pci.o -common-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o -common-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o -virtio-gpu.o-cflags :=3D $(VIRGL_CFLAGS) -virtio-gpu.o-libs +=3D $(VIRGL_LIBS) -virtio-gpu-3d.o-cflags :=3D $(VIRGL_CFLAGS) -virtio-gpu-3d.o-libs +=3D $(VIRGL_LIBS) +ifeq ($(CONFIG_VIRTIO_GPU),y) +common-obj-m +=3D virtio-gpu.mo +virtio-gpu-obj-$(CONFIG_VIRTIO_GPU) +=3D virtio-gpu-base.o virtio-gpu.o vi= rtio-gpu-3d.o +virtio-gpu-obj-$(CONFIG_VHOST_USER_GPU) +=3D vhost-user-gpu.o +virtio-gpu-obj-$(call land,$(CONFIG_VIRTIO_GPU),$(CONFIG_VIRTIO_PCI)) +=3D= virtio-gpu-pci.o +virtio-gpu-obj-$(call land,$(CONFIG_VHOST_USER_GPU),$(CONFIG_VIRTIO_PCI)) = +=3D vhost-user-gpu-pci.o +virtio-gpu-obj-$(CONFIG_VIRTIO_VGA) +=3D virtio-vga.o +virtio-gpu-obj-$(CONFIG_VHOST_USER_VGA) +=3D vhost-user-vga.o +virtio-gpu.mo-objs :=3D $(virtio-gpu-obj-y) +virtio-gpu.mo-cflags :=3D $(VIRGL_CFLAGS) +virtio-gpu.mo-libs :=3D $(VIRGL_LIBS) +endif + common-obj-$(CONFIG_DPCD) +=3D dpcd.o common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dp.o =20 --=20 2.18.4