From nobody Fri Sep 20 22:16:02 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=1591863798; cv=none; d=zohomail.com; s=zohoarc; b=jBpu79UqfinnrTJnFHO+o20/EuQUyNX/7vuz1hdFMn0MV6TkqMeV/PHqNOibuphbwdtu3VpXMolH1KRnjXCXfWRqIP7xIfl18zpIJHv4bXXFIH8kG55dzLPPF9GK0ZlCbn75TqwuVcRxd0lsgy9j05O/YEJ3y1LUrBpqRSPU/Cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863798; 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=m2yv07S+Jzz+ZmV3AmBtr+0sKpxMyFYao4v1mJ/9W1E=; b=BGlvartUcJqOB7i6VxWEtnqdFOi9DTZhZWZtDf8+UYnRIlyRPKuq64qEPbKP0jnPZCUlxSvyFsOQY0mwvyWAaX55Rsuu7eP5vSKKw3H34J4Y5cBUhRdckEe2ukQ6G3uaK/TjhKY+yvNU/Zp+XGy8g4rZ9B20PB/EjqebOtx6SBI= 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 1591863798086414.89083326925527; Thu, 11 Jun 2020 01:23:18 -0700 (PDT) Received: from localhost ([::1]:34186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIUW-0006PL-OD for importer@patchew.org; Thu, 11 Jun 2020 04:23:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITW-0004qP-NL for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:14 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31716 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 1jjITU-0006qd-BO for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22: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-pP7llZ_kOVSRnQG3fObFiA-1; Thu, 11 Jun 2020 04:22:08 -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 E3F4B835B44 for ; Thu, 11 Jun 2020 08:22:07 +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 A249C5C1B0; Thu, 11 Jun 2020 08:22:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 189031750A; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863730; 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=m2yv07S+Jzz+ZmV3AmBtr+0sKpxMyFYao4v1mJ/9W1E=; b=LWzwYf8PxJx6rToTGKRBLwyyp5ZnVLCbZKNGUBdvsFsfRqEhVPcwuRwFxm/PPOS4CWjVJx 7PdfWuzhzp6q7Zzsfmop8VtRRIxXUexfJW9zJxm2F4ZuSlTgrIRjZum8dCtqsCQhOvHc87 EVyKIrB0qNPrHZ2aDyXxXtHQWWSudus= X-MC-Unique: pP7llZ_kOVSRnQG3fObFiA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 1/7] qdev: add support for device module loading Date: Thu, 11 Jun 2020 10:21:53 +0200 Message-Id: <20200611082200.26331-2-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-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.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 03:29:35 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 --- include/hw/qdev-core.h | 3 +++ include/qemu/module.h | 1 + hw/core/qdev.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 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, 79 insertions(+) create mode 100644 stubs/hw-module.c 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..342b5b64871e 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -146,10 +146,60 @@ 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 expectation 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; + + 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; +} + 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) { 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 05d1a4cb6bf8..f93724c8cc56 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 c1e43ac68f87..40d630202648 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 Fri Sep 20 22:16:02 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=1591863974; cv=none; d=zohomail.com; s=zohoarc; b=eZMkdnqUppa/KqMMkyIBrYh1nEYYveE9zadzUvMwYCWkAgdOiR7azu6U25bl30MwJpCS+I3Ve9ItsXLgnp3X7eZ4X+hlS+SFOeGDAKmt0bzENV5ispB2u7Tdkqn2LmlvR4j53OlH0dzgc5pqyZuwc9jEXQxgbUGTGQ70muex08Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863974; 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=gclMPt/xw2hTNaxkESIaYsdAFfWmrBMcmCyjNL0bTvgytjdjbQwmfoCzEusLfPGvlM0s41uVfDXbJ+TL3YwBcLTN5pthUlh61YekpG2KmqKX794d/IGFSs0D3Y0szkUOkpJLiHrs5sdOxkQC5Ze1yUCy75TNdqfbH0sOtSGbwc8= 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 159186397412959.28842905225042; Thu, 11 Jun 2020 01:26:14 -0700 (PDT) Received: from localhost ([::1]:46718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIXM-0003PE-9Q for importer@patchew.org; Thu, 11 Jun 2020 04:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITX-0004qf-A9 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22317 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 1jjITV-0006qs-Nt for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22: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-310-bSWnT3FlMxS55F65DGOzlA-1; Thu, 11 Jun 2020 04:22:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 47C36835B46 for ; Thu, 11 Jun 2020 08:22:10 +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 9415719D61; Thu, 11 Jun 2020 08:22:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2139D17510; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863732; 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=PDz8arVtK+Pa/+XdbwxjPY60u3G/FqIYMdIH8JZwAU2C5jSM0RHu7BxVIh1BKq+8TcPfgz JDyKZkzkQv7YkoNOCrBsMzQvSKTsoXUlyqJDGriK4wHTnghqmEkvJ4PtssD9MXtCKH/Y41 1G+zWBYiXz2k2uY2SHw9TQ871lpKcRE= X-MC-Unique: bSWnT3FlMxS55F65DGOzlA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 2/7] build: fix device module builds Date: Thu, 11 Jun 2020 10:21:54 +0200 Message-Id: <20200611082200.26331-3-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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/11 03:29:33 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_H4=-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 Fri Sep 20 22:16:02 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=1591863800; cv=none; d=zohomail.com; s=zohoarc; b=WEn2DLP/GMZvSn+1GC+tfnc7VWz6V3UTvZWIpOtwxLdmZYuCtYmiH7A8qEpZXMicI/7pOY1WI9hdYCmNE/KoARlxxaBXvaLxLZKtzYzj0Hpaz8LAlv/8w4ZcsQn5qhlQ6VZEUdLL+S3YYXBhlcb8CNYbJ1UoQypvFnOd5eZYX8I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863800; 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=DeN3q5RGjvT7QnboHK4q5+BTEr1qbI6D85IAOMA0dRo=; b=daaPSbpkSYQzvFtlwE1u5yTlf7uyZ+Esuf9qFawYjOdEmNJE5cxMj7rIn5z1bVMiLtdyL5xi184pFLStU5uGPbejv5ox51BcmetK4vZKUD8jXGM/HLeEsfpCRfeGo7czMU5/UgHSU1DG0JCnW2uweLrMoqudkMLIZnl3yNi5n8E= 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 1591863800654921.6046806601946; Thu, 11 Jun 2020 01:23:20 -0700 (PDT) Received: from localhost ([::1]:34400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIUZ-0006WE-FF for importer@patchew.org; Thu, 11 Jun 2020 04:23:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITa-0004vk-RL for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:18 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:56714 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 1jjITV-0006qr-Nd for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22: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-21-7NuxBY0bPPO_wbfo1euXzg-1; Thu, 11 Jun 2020 04:22:08 -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 C8EEF188360B for ; Thu, 11 Jun 2020 08:22:07 +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 9A7CB7C3B7; Thu, 11 Jun 2020 08:22:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2F61D17511; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863732; 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=DeN3q5RGjvT7QnboHK4q5+BTEr1qbI6D85IAOMA0dRo=; b=NjDrZmnjvfZ0A+pkE4Sdq7CGnY/JkzzkN+1hbGzXWL9JmZQOX58FwTnG8lf6QO7NXz4sL3 5VfUWVUiW9qbGXeVNmNwXoj74r1ELMWViq1iIViB/i/L3HovMd31EcDMESbR2nIYrslwFK BBz15E+72d8JOTh55IKmaM3flV4USl8= X-MC-Unique: 7NuxBY0bPPO_wbfo1euXzg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 3/7] ccid: build smartcard as module Date: Thu, 11 Jun 2020 10:21:55 +0200 Message-Id: <20200611082200.26331-4-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-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=207.211.31.81; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 03:29:33 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_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01, 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 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/hw/core/qdev.c b/hw/core/qdev.c index 342b5b64871e..0388efe2190b 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 "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 660e2b437348..71843591fe43 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 Fri Sep 20 22:16:02 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=1591863884; cv=none; d=zohomail.com; s=zohoarc; b=kZOGOWlevNWvnLoiP/m1P1rekX2PQ0KzZcsc0oi3IVfycxUTY9VWtapBIcEXBXyHcN1C5hK1vBqpLOYj42jTNrwhks0hit8Vp9cTsAcBSc8s/sVI0fAQOH46T+1Hm96cp/koupdFlexP1ZSH20Jlok3n8Z3i5c8COOKMaVlLb38= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863884; 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=tfXOLUUQ4Kr2jyNo1AqC75oEoYOyN5+p6zR3YQ+Uk9I=; b=L3K6Mu8D9YXcKNe3XSXyikPCkymJ0gggu+vyTvlPW+8G2WXSAJZNggwHgiuzS+6g1KR+o+Caoq9MqpKDE2YGHiw3YcsIszXpTY5pZF61vMltwZ3kXfAA7jIr6IlM/HodPYxZ918z4AuQ8UQ5yaHkPhXmaompgesm0E3Lp5wkbeg= 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 1591863884810668.78573535892; Thu, 11 Jun 2020 01:24:44 -0700 (PDT) Received: from localhost ([::1]:40212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIVv-0000Zl-Hu for importer@patchew.org; Thu, 11 Jun 2020 04:24:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITX-0004qc-53 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:15 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50883 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 1jjITW-0006qx-5R for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:14 -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-382-n3tb-ZhsMAa7JoHvNvfNmw-1; Thu, 11 Jun 2020 04:22:08 -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 867228015CB for ; Thu, 11 Jun 2020 08:22:07 +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 9EEAB7F4FE; Thu, 11 Jun 2020 08:22:01 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 3A0CA17516; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863733; 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=tfXOLUUQ4Kr2jyNo1AqC75oEoYOyN5+p6zR3YQ+Uk9I=; b=CkvxwB23NAEkD4M5L97/B34d/wwJr0hHy61gK3nkJrCCpRye3ZOTUYNjnjHCRrX9Q3Rnir 7U5j0kyl0z46bxhalPG6xVTkkJc6g2ccblBpudXF6w6cj9Gvpa82MRmGVvrYxAujcfPOtM +7BBQlrKoYYLFaj1GxHEbPdS8KFMMC0= X-MC-Unique: n3tb-ZhsMAa7JoHvNvfNmw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 4/7] usb: build usb-redir as module Date: Thu, 11 Jun 2020 10:21:56 +0200 Message-Id: <20200611082200.26331-5-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-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/11 03:29:33 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_H4=-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 0388efe2190b..676707e64191 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -158,6 +158,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 Fri Sep 20 22:16:02 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=1591863889; cv=none; d=zohomail.com; s=zohoarc; b=P2WvuaZ55ACQ81EqK4lDPHPAmeWV9TyfQmvfiueo+Z9nwgxeyl/XaSINsrR1+MgiT3PXLpY12eHcT3AmYyFlB54AWjGyHCWLFepT31f1qNF0v7pywvJs33suiymso+P2Vyr5lxglVb7KnxFjr6gM/iRQknQMZY/WRGwLNTco/JE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863889; 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=YXMLr/n4Azc2cYOQEYUEVxC8S7aEmeuWnQJD0RANpeU=; b=TPXd/5TZ9FzuHY28BX03kJ9p1f2WnEuZpzMpBOw2XV7MjKcqtc3c+dX994AY2Z3oKUV+G46aRc+qdbVGyRoIup592+H8NHUKVrZVuF9cIXyY5Jwmde6cZxeNTK8/45wKcg8KezoV+n8+xdkhz+uUCsgGIvOHmLQLStPaxKh6zSM= 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 1591863889243249.98362243833992; Thu, 11 Jun 2020 01:24:49 -0700 (PDT) Received: from localhost ([::1]:40616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIVz-0000jx-V3 for importer@patchew.org; Thu, 11 Jun 2020 04:24:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITe-00054E-RW for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:22 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24289 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 1jjITd-0006sT-T8 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22: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-64-ISmaMBfoOxCnQgtyyeJnAw-1; Thu, 11 Jun 2020 04:22:15 -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 034F5BFC1 for ; Thu, 11 Jun 2020 08:22:15 +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 155558FF77; Thu, 11 Jun 2020 08:22:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 461E717532; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863741; 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=YXMLr/n4Azc2cYOQEYUEVxC8S7aEmeuWnQJD0RANpeU=; b=DehNxTy2Cp0d3KQMLUy9mrvF4MQoj65eeTFu+ZD9VHUyLZAnb/P/nlGLIaxO4KcMa9mJFF lB3Db7fp1/OjjZQdnjFqAikjK7ti9kCxZV8rurJWxumk5kFgbfpkmuWIbJV/iWbC6KEh/G FTUFQ+0vinYCm+BH2Ft76R+V6f3vP6c= X-MC-Unique: ISmaMBfoOxCnQgtyyeJnAw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 5/7] vga: build qxl as module Date: Thu, 11 Jun 2020 10:21:57 +0200 Message-Id: <20200611082200.26331-6-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-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=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/11 03:29:33 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_H4=-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 676707e64191..e6b1fabac924 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -159,6 +159,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 71843591fe43..fd6519e8af3f 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 Fri Sep 20 22:16:02 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=1591863981; cv=none; d=zohomail.com; s=zohoarc; b=F9+vXHMZxM4Y/5W3qS194LLPydMFA9LhQRbWUKcGWnQljfIJtp1mVYbwXjiyftnrySKdVBRcaTjhWCjTxjptXnVHW6GJx4+TcCwiDowBr0qkM8ksmtGO+PEYITaiaq7YDG+oA1j3X5Uo5GcGx19clU8v+2GcjkijosMxrVmfn1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863981; 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=EqkDzksZsIpxzL5nvCvhq3RLJwWJz8GdHhIzB0UHVF37rEXlBJ7hX4aRzU506Tt8VkUggp5atEhGRjfXZJJeNf+XXznxAiWYTCogNVcnwfcplGZfSX6RXIqzWDPv1ZHHXBY7ky1+4fVNBZNTV2QagOWFnHQsdUNYkebVHSFbKWU= 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 1591863981065252.03526438799122; Thu, 11 Jun 2020 01:26:21 -0700 (PDT) Received: from localhost ([::1]:47458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIXT-0003hK-Hm for importer@patchew.org; Thu, 11 Jun 2020 04:26:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITf-000563-OQ for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:23 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:55627 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 1jjITe-0006t6-SP for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:23 -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-72-AIGRoSp7NEGNHcXSsa16Pw-1; Thu, 11 Jun 2020 04:22:18 -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 00E101883602 for ; Thu, 11 Jun 2020 08:22:18 +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 A8DAE10013D7; Thu, 11 Jun 2020 08:22:17 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4EFF617538; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863741; 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=O6qW3CC1Ls/eGc2BYuci4EMo5f27ZrDPASJXu7opWT9+5kz3WrNgIOhIx87YTn9C2SI7bL OJQU9SRndeoDjS580c8S9fR/y/sgqRRads+evbcV4/O7n7CT3ABk46DqG/erwEBOi3suCE 1z9XYVdRUJCLz5bdVh0UxbjwymtmPkk= X-MC-Unique: AIGRoSp7NEGNHcXSsa16Pw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 6/7] vga: build virtio-gpu only once Date: Thu, 11 Jun 2020 10:21:58 +0200 Message-Id: <20200611082200.26331-7-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.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/11 03:29:33 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_H4=-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 Fri Sep 20 22:16:02 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=1591863890; cv=none; d=zohomail.com; s=zohoarc; b=imPY2xapljuFrpwYvC/ayBREsdVdaCO2KTjRx9PYQfrrknwmNQizqNS1e08uCEOYWalEzp4wZw3sCk3lGz4xiAhYVqPh8wWYOHmOa0pkLGexhHpEKB5m916tpM+5kXiINgtLPx6S/Xpap+V2PfRewqbHqGkf9g8bjgHAte/hdfE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591863890; 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=DiC7fvosT6sNHiY1apE3NdDTCQT3W6XSu/wydCH7/Gs=; b=G2C1uZlloVKEECZh06g5HydkAbxA17im/8NlNFFR93nrl1JTGyt3dJCIfgZPBVdYK3DDKrK5T/ak60NFNs16w969HuhZWsttTezIrKMCF8HsN6cdgf51QSSPiP/gaOJfnr8Qq8Zcjfk5QvaQpjO03JrpR38e7DW3tN9TzNHtdZE= 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 1591863890173926.6057508164864; Thu, 11 Jun 2020 01:24:50 -0700 (PDT) Received: from localhost ([::1]:40742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjIW0-0000my-Rq for importer@patchew.org; Thu, 11 Jun 2020 04:24:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjITf-00055m-Jr for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47669 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 1jjITd-0006sN-SI for qemu-devel@nongnu.org; Thu, 11 Jun 2020 04:22:23 -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-6-IgocUNIOO3iWLZY6nn41NQ-1; Thu, 11 Jun 2020 04:22:15 -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 15169835B41 for ; Thu, 11 Jun 2020 08:22:15 +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 4394A8929B; Thu, 11 Jun 2020 08:22:09 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 5996D1753B; Thu, 11 Jun 2020 10:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591863741; 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=DiC7fvosT6sNHiY1apE3NdDTCQT3W6XSu/wydCH7/Gs=; b=ew/HW9veXCi6wwr7hhDX8Og+ApLYfB5v/EPfnjEs82ofc940CKtsLRjMIid8vv4fVij07B cN3LkZ1NSTcURNWIRCp97koQhqqKhbu15PcnhUtRec0CGzn2XeJvJ9DfX23G4v5/2wvlBs /Xv1ugpVW7qN0W9CwHn573cJmASd278= X-MC-Unique: IgocUNIOO3iWLZY6nn41NQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v3 7/7] vga: build virtio-gpu as module Date: Thu, 11 Jun 2020 10:21:59 +0200 Message-Id: <20200611082200.26331-8-kraxel@redhat.com> In-Reply-To: <20200611082200.26331-1-kraxel@redhat.com> References: <20200611082200.26331-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=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/11 03:29:33 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_H4=-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 e6b1fabac924..126cb284be00 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -161,6 +161,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