From nobody Mon Apr 29 03:58:26 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=1594129591; cv=none; d=zohomail.com; s=zohoarc; b=hqTtozMg8Q5HTCfQvS3JM+jclZMEtK3X5FCEl7g0JSLPRL8PyhnrA3U1Opd9X4V4OtHJ4ZvpIuxUcsZ4/ZcaqyYK5PGuul9rciEdXg7jq5TW+jg9Jcifq9X07+abpUaLThnoRMtkWKmBr3VFGO7z/TQLH5KmSPS8GNw/lgK2iiU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129591; 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=fMprw3S8bj72InmJ3h279GUyyDfsULSh5AyJa+jLrDM=; b=AU4xBUzOrcGCyHYgKStO9MBpSsJ3LVAntXWFKpufUlMlr6F7NqqpyrF24m0ooYvxYl9EAnuWKkzejsCijM6UqX2Bh6Fv0pcp6feBNkecr/5QFk5yZG3OCLYoEE1vdnoHNpu16uUdRznokoaIBUUTQQxhWit+pxOHG26f2tTvX/k= 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 1594129591583973.5730744347853; Tue, 7 Jul 2020 06:46:31 -0700 (PDT) Received: from localhost ([::1]:57812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnvZ-0004zG-VC for importer@patchew.org; Tue, 07 Jul 2020 09:46:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnrz-0006kZ-Pp for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:47 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:33449 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 1jsnrx-0004ZX-Vg for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:47 -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-300-xJxwSK2IPkyHzNCG0mgvHQ-1; Tue, 07 Jul 2020 09:42:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0B1980183C for ; Tue, 7 Jul 2020 13:42:42 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89C9860BF3; Tue, 7 Jul 2020 13:42:30 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id B284A31F0A; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129365; 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=fMprw3S8bj72InmJ3h279GUyyDfsULSh5AyJa+jLrDM=; b=aQ81KA8aNuetTEJUJmTqMG1UvfqTR+XfpgpwFmSAjlkL6dHCbUsB9ybiluBGRgRsvFaIRb 7h5OOvZBDS6L0lco3Jb6Tf9kkRL/RW+IqnatzuZZw4UrOy7LMf6BxqT10/P9TvcyyB4g+m ax9UbvvkD6S4Dym0flq923MVgwby5pU= X-MC-Unique: xJxwSK2IPkyHzNCG0mgvHQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 01/10] module: qom module support Date: Tue, 7 Jul 2020 15:42:20 +0200 Message-Id: <20200707134229.9773-2-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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" Add support for qom types provided by modules. For starters use a manually maintained list which maps qom type to module and prefix. Two load functions are added: One to load the module for a specific type, and one to load all modules (needed for object/device lists as printed by -- for example -- qemu -device help). Signed-off-by: Gerd Hoffmann Message-id: 20200624131045.14512-2-kraxel@redhat.com --- include/qemu/module.h | 2 ++ util/module.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/include/qemu/module.h b/include/qemu/module.h index 011ae1ae7605..9121a475c1b6 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -70,5 +70,7 @@ void register_dso_module_init(void (*fn)(void), module_in= it_type type); =20 void module_call_init(module_init_type type); bool module_load_one(const char *prefix, const char *lib_name); +void module_load_qom_one(const char *type); +void module_load_qom_all(void); =20 #endif diff --git a/util/module.c b/util/module.c index e48d9aacc05a..ee560a4b4269 100644 --- a/util/module.c +++ b/util/module.c @@ -245,3 +245,58 @@ bool module_load_one(const char *prefix, const char *l= ib_name) #endif return success; } + +/* + * Building devices and other qom objects 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 & objects. + * + * So with the expectation that this will be rather the exception than + * to rule and the list will not gain that many entries go with a + * simple manually maintained list for now. + */ +static struct { + const char *type; + const char *prefix; + const char *module; +} const qom_modules[] =3D { +}; + +static bool module_loaded_qom_all; + +void module_load_qom_one(const char *type) +{ + int i; + + if (module_loaded_qom_all) { + return; + } + for (i =3D 0; i < ARRAY_SIZE(qom_modules); i++) { + if (strcmp(qom_modules[i].type, type) =3D=3D 0) { + module_load_one(qom_modules[i].prefix, + qom_modules[i].module); + return; + } + } +} + +void module_load_qom_all(void) +{ + int i; + + if (module_loaded_qom_all) { + return; + } + for (i =3D 0; i < ARRAY_SIZE(qom_modules); i++) { + if (i > 0 && (strcmp(qom_modules[i - 1].module, + qom_modules[i].module) =3D=3D 0 && + strcmp(qom_modules[i - 1].prefix, + qom_modules[i].prefix) =3D=3D 0)) { + /* one module implementing multiple types -> load only once */ + continue; + } + module_load_one(qom_modules[i].prefix, qom_modules[i].module); + } + module_loaded_qom_all =3D true; +} --=20 2.18.4 From nobody Mon Apr 29 03:58:26 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=1594129422; cv=none; d=zohomail.com; s=zohoarc; b=ghUCtI5yAfkUS1uukFUocdYFDVb6NqdSowfTQFRZJO76jOxzevr8fLhurMFZRhCQV1mlrirVWuWC1y+i3wEE+X0SOLoPzwUnKOa/fmSFpALUVGgMWhz0nRSdF4MxGFnBWBoNg5U/s1bVPeExzGvOdmxz3IoMtiV+43DebnIHmu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129422; 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=tZpyUC8O0kFmGIJyFMAqx1/t3IDSz35Y6yMJtiML0fQ=; b=GanqC83CYgyTjORX+MVXQmrwkNjijZa6ZbAsiTwnajl4YbP/+5IG/4F6HovT/TRy8MmU/7TzgboZXmPe5DdJvqjSWPJk8HLS3Z9uVdtPDnAGIejWorFh6aS806tWNT0FykMGVNfGZmrJxdrwx/hPQ75v3SE+5QZ+lJC7wziM1B8= 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 1594129422295979.3430775040988; Tue, 7 Jul 2020 06:43:42 -0700 (PDT) Received: from localhost ([::1]:46422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnsq-0008Lj-O7 for importer@patchew.org; Tue, 07 Jul 2020 09:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnru-0006dQ-Oe for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:42 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:42915 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 1jsnrs-0004Yq-NB for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:42 -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-108-pz2XMtwZNGOPFlcikCCYgg-1; Tue, 07 Jul 2020 09:42:37 -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 6F6CD18829CC for ; Tue, 7 Jul 2020 13:42:36 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F0A75D9F3; Tue, 7 Jul 2020 13:42:30 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BCD3531F14; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129358; 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=tZpyUC8O0kFmGIJyFMAqx1/t3IDSz35Y6yMJtiML0fQ=; b=VwirA2I5NFWJ6BxzyEa+E3g6LImZq/P8RxF2tN52OfWqKXqivYjzUYHj5pvi1DhJHJ/Mm1 hQhv9hWcQm1oHDtxzD4W3G6ubYa9p79k9sWwvdbbkM4xyuCFpK99n4RSfWEfkvrfSn7Nqy n+ETMsz7YYlp5bn1nbVQ9zeMwt2pA/c= X-MC-Unique: pz2XMtwZNGOPFlcikCCYgg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 02/10] object: qom module support Date: Tue, 7 Jul 2020 15:42:21 +0200 Message-Id: <20200707134229.9773-3-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-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=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/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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" Little helper function to load modules on demand. In most cases adding module loading support for devices and other objects is just s/object_class_by_name/module_object_class_by_name/ in the right spot. Signed-off-by: Gerd Hoffmann Message-id: 20200624131045.14512-3-kraxel@redhat.com --- include/qom/object.h | 12 ++++++++++++ qom/object.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/include/qom/object.h b/include/qom/object.h index 94a61ccc3fe8..51f188137f1f 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -994,6 +994,18 @@ bool object_class_is_abstract(ObjectClass *klass); */ ObjectClass *object_class_by_name(const char *typename); =20 +/** + * module_object_class_by_name: + * @typename: The QOM typename to obtain the class for. + * + * For objects which might be provided by a module. Behaves like + * object_class_by_name, but additionally tries to load the module + * needed in case the class is not available. + * + * Returns: The class for @typename or %NULL if not found. + */ +ObjectClass *module_object_class_by_name(const char *typename); + void object_class_foreach(void (*fn)(ObjectClass *klass, void *opaque), const char *implements_type, bool include_abstra= ct, void *opaque); diff --git a/qom/object.c b/qom/object.c index 6ece96bc2bfc..34daaf1280f5 100644 --- a/qom/object.c +++ b/qom/object.c @@ -985,6 +985,20 @@ ObjectClass *object_class_by_name(const char *typename) return type->class; } =20 +ObjectClass *module_object_class_by_name(const char *typename) +{ + ObjectClass *oc; + + oc =3D object_class_by_name(typename); +#ifdef CONFIG_MODULES + if (!oc) { + module_load_qom_one(typename); + oc =3D object_class_by_name(typename); + } +#endif + return oc; +} + ObjectClass *object_class_get_parent(ObjectClass *class) { TypeImpl *type =3D type_get_parent(class->type); --=20 2.18.4 From nobody Mon Apr 29 03:58:26 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=1594129422; cv=none; d=zohomail.com; s=zohoarc; b=fYE+vdqBWvYSbEdz5aJT7ynn9yr7ttXo14lwX0SvyCSWhj74wAuIWOWKh0pDSldoC4ARfsnQMGMfPi098h/Dqk7/rE7Q5Vu75SiiyxHjgz/olWGfDeC8OjTlTQZ8zcH9FOATvDJMeWQ8bxzPrvLca47/sFPCkj9IY9WmKi/dH/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129422; 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=aWEGvrK7YSjXUBMVlkvwbjgfnMCter2xKCRiNrgagJg=; b=Mg97BKr23PcK2EKMKMdhxpH7P2+W/szZvqXFK/AUdqyebo1lRE0G8hBeW6xq9UcVqYzlsqTF+tukeNV/5NtssdfTaxWCO+wlJkfc3IFy8UyQz3puvt8qVqUMNxWmuxBLWfQ3bdVw+t9OaSLyCsnKX4YyZYm/jmCfU/5pN6ARQao= 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 1594129422365746.6898078301009; Tue, 7 Jul 2020 06:43:42 -0700 (PDT) Received: from localhost ([::1]:46384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnsq-0008Kn-2V for importer@patchew.org; Tue, 07 Jul 2020 09:43:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnrv-0006dU-0c for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:43 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:36680 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 1jsnrs-0004Yw-TF for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:42 -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-364-C0MNZ5h3MkG7ScI8bTOtow-1; Tue, 07 Jul 2020 09:42:38 -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 BB9C7DC28 for ; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FB6D7788F; Tue, 7 Jul 2020 13:42:30 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CA73F31F24; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129360; 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=aWEGvrK7YSjXUBMVlkvwbjgfnMCter2xKCRiNrgagJg=; b=d8vF+U4Q6K4/lAGF/Td47Am782OKAB0CFUui8S34dTvkhISM2ntnUyTC6S0J++7hcVxtbO +3Ikq+MMa0wPSResOxyr+kCHswUAjR9U5uRHx7jwqVmdyGYZqXy2yUXD4wXDTFDIAVm96j WL8nt366U41a6S07iRwrG+wDVJhquJo= X-MC-Unique: C0MNZ5h3MkG7ScI8bTOtow-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 03/10] qdev: device module support Date: Tue, 7 Jul 2020 15:42:22 +0200 Message-Id: <20200707134229.9773-4-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=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/07/07 00:31:00 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hook module loading into the places where we need it when building devices as modules. Signed-off-by: Gerd Hoffmann Message-id: 20200624131045.14512-4-kraxel@redhat.com --- hw/core/qdev.c | 6 ++++-- qdev-monitor.c | 5 +++-- qom/qom-qmp-cmds.c | 3 ++- softmmu/vl.c | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 2131c7f951dd..9de16eae05b7 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -137,6 +137,9 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bu= s) */ DeviceState *qdev_new(const char *name) { + if (!object_class_by_name(name)) { + module_load_qom_one(name); + } return DEVICE(object_new(name)); } =20 @@ -147,10 +150,9 @@ DeviceState *qdev_new(const char *name) */ DeviceState *qdev_try_new(const char *name) { - if (!object_class_by_name(name)) { + if (!module_object_class_by_name(name)) { return NULL; } - return DEVICE(object_new(name)); } =20 diff --git a/qdev-monitor.c b/qdev-monitor.c index 22da107484c5..8e7a7f7bbdbc 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -147,6 +147,7 @@ static void qdev_print_devinfos(bool show_no_user) int i; bool cat_printed; =20 + module_load_qom_all(); list =3D object_class_get_list_sorted(TYPE_DEVICE, false); =20 for (i =3D 0; i <=3D DEVICE_CATEGORY_MAX; i++) { @@ -215,13 +216,13 @@ static DeviceClass *qdev_get_device_class(const char = **driver, Error **errp) DeviceClass *dc; const char *original_name =3D *driver; =20 - oc =3D object_class_by_name(*driver); + oc =3D module_object_class_by_name(*driver); if (!oc) { const char *typename =3D find_typename_by_alias(*driver); =20 if (typename) { *driver =3D typename; - oc =3D object_class_by_name(*driver); + oc =3D module_object_class_by_name(*driver); } } =20 diff --git a/qom/qom-qmp-cmds.c b/qom/qom-qmp-cmds.c index c5249e44d020..5e2c8cbf333f 100644 --- a/qom/qom-qmp-cmds.c +++ b/qom/qom-qmp-cmds.c @@ -116,6 +116,7 @@ ObjectTypeInfoList *qmp_qom_list_types(bool has_impleme= nts, { ObjectTypeInfoList *ret =3D NULL; =20 + module_load_qom_all(); object_class_foreach(qom_list_types_tramp, implements, abstract, &ret); =20 return ret; @@ -130,7 +131,7 @@ ObjectPropertyInfoList *qmp_device_list_properties(cons= t char *typename, ObjectPropertyIterator iter; ObjectPropertyInfoList *prop_list =3D NULL; =20 - klass =3D object_class_by_name(typename); + klass =3D module_object_class_by_name(typename); if (klass =3D=3D NULL) { error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, "Device '%s' not found", typename); diff --git a/softmmu/vl.c b/softmmu/vl.c index 3e15ee243572..5acb65d7f48c 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -1772,8 +1772,8 @@ static bool vga_interface_available(VGAInterfaceType = t) =20 assert(t < VGA_TYPE_MAX); return !ti->class_names[0] || - object_class_by_name(ti->class_names[0]) || - object_class_by_name(ti->class_names[1]); + module_object_class_by_name(ti->class_names[0]) || + module_object_class_by_name(ti->class_names[1]); } =20 static const char * --=20 2.18.4 From nobody Mon Apr 29 03:58:26 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=1594129434; cv=none; d=zohomail.com; s=zohoarc; b=QTbVQ8onEyosjBYugc4NKKT+xMN1L2ffJxDUKZqAac7GvX6Q8sDGykae3TdtPoHSgxeslMAPirmxP6MTuIJ0tCNPzZRzTKWVnc2au7j9VgqtG9BIGYhlxltYnJ9JaJF4Qk8XUOHgecnhsY3uZPjOrvlRyRTF4Iqvu4x66RmmBa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129434; 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=MYIUXR3CfD6NFerUROhZUSUnvg6P+uPCm/D3IMf65GE=; b=LmaRDko9CRsPEyiEEf4i0A/U26XHUaBhdEDS5UPS4qR/SRZuP+s/klo5/ADEzX2+a6R2Yfv5AOzb7g9OU0WYq2uw5WaWeMgijFmAc1oxkfMjMbEpFeUbGtU65cygFjJWEXaqmdqNYIFzNk2yUZoRFWYcHgdMHizaTppyPNTNHNI= 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 1594129434060224.14192484839725; Tue, 7 Jul 2020 06:43:54 -0700 (PDT) Received: from localhost ([::1]:47646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnt2-0000PB-Q1 for importer@patchew.org; Tue, 07 Jul 2020 09:43:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsns4-0006tz-Uq for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:52 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:41243 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 1jsns3-0004bN-BQ for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:52 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-268--Jx8rmekOnu0PuAKs7dpvA-1; Tue, 07 Jul 2020 09:42:39 -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 9146BEE21 for ; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 77CF279810; Tue, 7 Jul 2020 13:42:32 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D302A31F2C; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129370; 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=MYIUXR3CfD6NFerUROhZUSUnvg6P+uPCm/D3IMf65GE=; b=DcOieJpbpkvWydwOE8yZEOALW66L7hSdzAZ4uZFimo6v3UasdcajZBK1Q50+O7e1ZA7XZW n6iaaicStVHt6IWmMOoo0+WnmTMlI/2Oey2kQu1Ej4oLw5KTne2bwZFMnCHv0od4vz55GZ aT2/w13uftAJkfkILWnx9cylnR7JknU= X-MC-Unique: -Jx8rmekOnu0PuAKs7dpvA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 04/10] build: fix device module builds Date: Tue, 7 Jul 2020 15:42:23 +0200 Message-Id: <20200707134229.9773-5-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=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/07/07 00:31:00 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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" Slightly hackish workaround, works ok as long as we don't have target-specific modules. meson will obsolete this. See comment in the patch for the --verbose description. Signed-off-by: Gerd Hoffmann Message-id: 20200624131045.14512-5-kraxel@redhat.com [ kraxel: updated comment from discussions ] Signed-off-by: Gerd Hoffmann --- Makefile.target | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Makefile.target b/Makefile.target index 8ed1eba95b9c..02bd9d7117dd 100644 --- a/Makefile.target +++ b/Makefile.target @@ -179,6 +179,20 @@ 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 +# unnest-vars recursing into target directories to fill obj-y and not +# properly handling the -m case. +# +# Clear common-obj-m as workaround. Fixes suspious dependency errors +# when building devices as modules. A bit hackish, but should be ok +# as long as we do not have any target-specific modules. +# +# The meson-based build system currently in development doesn't need +# unnest-vars and will obsolete this workaround. +# +common-obj-m :=3D + include $(SRC_PATH)/Makefile.objs dummy :=3D $(call unnest-vars,.., \ authz-obj-y \ --=20 2.18.4 From nobody Mon Apr 29 03:58:26 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=1594129745; cv=none; d=zohomail.com; s=zohoarc; b=O5X3ucvs+dvVaXCCA5f0qos5+S7gRJAEU3D1SOtUZwngLeTJ5V/k/oUIZ/QTtg3J7yTUD8bufre9xeaDbFQEfGrh2q105pw2kfN9BK7TYltv+fejCFoh4HH/C8PE0VcOuIWoJzHdCpfUKTAxK4Cmdnz4zEJR4tYWb0opB4Rq/8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129745; 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=2lksNVHVDfn+JRUysyPNuTS6EqEm1HR/0tS62Mk0Giw=; b=c+TGP2nGlo1e1Acl/oMd2mTmafSg6/d4BzIduFWDof4HeaHYrfEmJapiL8mJdWF7RDNmLrb0JmHXQBqRIGVOww7ArKCdIMZnlIH02ivwtQBqGa7yGDk3bvSV5wevNflxZIl8IpWYG/K3WAelCUwyhlg5kR93wIbSwd7MlLe7dqY= 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 1594129745918934.9144055121652; Tue, 7 Jul 2020 06:49:05 -0700 (PDT) Received: from localhost ([::1]:37014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsny4-0008MZ-Ew for importer@patchew.org; Tue, 07 Jul 2020 09:49:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50696) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsns3-0006rF-CQ for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:51 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:53886 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 1jsns1-0004b9-PB for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:51 -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-104-wxktQKl1NCCBP6Pjrh5lVQ-1; Tue, 07 Jul 2020 09:42:44 -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 F311B107ACCA for ; Tue, 7 Jul 2020 13:42:43 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4964AC0064; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E00E431F50; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129369; 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=2lksNVHVDfn+JRUysyPNuTS6EqEm1HR/0tS62Mk0Giw=; b=exjoV3pJfX/SjFy1TY+xa4HEZKiKR4dFGBhIH4GR8AIKLRL8kBbN3PenpbNdTh1qhj1s8i l8mGJ5PzUJzRkMku2UPD3sAOJag1/3bDUHG3B8alFjtSuRERfuWXbd4+ZP/SsWBXni4X+V +V/QOhYhOh+VhB5kFovnMfxvL5kMM7M= X-MC-Unique: wxktQKl1NCCBP6Pjrh5lVQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 05/10] ccid: build smartcard as module Date: Tue, 7 Jul 2020 15:42:24 +0200 Message-Id: <20200707134229.9773-6-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=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/07/07 00:31:00 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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 Message-id: 20200624131045.14512-6-kraxel@redhat.com --- Makefile.objs | 1 + util/module.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 98383972eef3..3d45492d8b46 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/util/module.c b/util/module.c index ee560a4b4269..89da9a3cce05 100644 --- a/util/module.c +++ b/util/module.c @@ -261,6 +261,8 @@ static struct { const char *prefix; const char *module; } const qom_modules[] =3D { + { "ccid-card-passthru", "hw-", "usb-smartcard" }, + { "ccid-card-emulated", "hw-", "usb-smartcard" }, }; =20 static bool module_loaded_qom_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 Mon Apr 29 03:58:26 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=1594129438; cv=none; d=zohomail.com; s=zohoarc; b=bWqPwlsCZtCHZia8qegaGQfFJ/lXHynRNxu4P8d7hVw4gmZxbCZVZBojkFQnnRd/2KvPFYz9X9Sy6WE5Yi3Kg2vZlKhX+HbbJC4TusCpA9gE3RmWRHlcOwLHktpAwncpqyf4CBex3MfUf4Rjej9JGkCxwssRm2ajOWGuztibGTk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129438; 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=lNfHrf/4zGKicBY5F9a1m8s+sgFe0y8Cq+RRcG0z6Bc=; b=XKQw7ntqsnC/6Gf1OuZi4bHeIKj//VJNUPocfO7oVLNEpn1BlaaTK6pfCsG93MiAVgadjC2HGD8JMnH8QW5fT5OA2wJIa2T/pP0zLjsfStX1UHNTQ4YAlWZ4hx3mWgSX4aeWCxIohx7g6POPhCOggJyoiMtWlUHEpwvh370Azj8= 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 1594129438340969.9593463489846; Tue, 7 Jul 2020 06:43:58 -0700 (PDT) Received: from localhost ([::1]:48016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnt6-0000Yu-Ps for importer@patchew.org; Tue, 07 Jul 2020 09:43:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50744) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsns7-00070A-Qz for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:55 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34511 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 1jsns6-0004bt-Ae for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-444-8QYteG6LOnCmd_hKFvKGEQ-1; Tue, 07 Jul 2020 09:42:49 -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 D4821EE01 for ; Tue, 7 Jul 2020 13:42:48 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4615A19D7C; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id EA30E31F51; Tue, 7 Jul 2020 15:42:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129373; 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=lNfHrf/4zGKicBY5F9a1m8s+sgFe0y8Cq+RRcG0z6Bc=; b=M9i7thMN1xjZjxT83CYeJR95PfRxQ1rPkPGq+Rwg33aZ2wDHqw7/5ooLX/JClP/f5J/oVJ xowW9o0e+gxMSueDMNyOjQ6ppLjCKXGZdUdpgvijL6xbxD46e7RdzqInZ7r2zjQWsEu7vR hYjlhHQwa5neM7rBqj5m0Lw2akPr+gI= X-MC-Unique: 8QYteG6LOnCmd_hKFvKGEQ-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 06/10] usb: build usb-redir as module Date: Tue, 7 Jul 2020 15:42:25 +0200 Message-Id: <20200707134229.9773-7-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=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/07/07 00:31:00 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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 Message-id: 20200624131045.14512-7-kraxel@redhat.com --- util/module.c | 1 + hw/usb/Makefile.objs | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/util/module.c b/util/module.c index 89da9a3cce05..e3226165e91c 100644 --- a/util/module.c +++ b/util/module.c @@ -263,6 +263,7 @@ static struct { } const qom_modules[] =3D { { "ccid-card-passthru", "hw-", "usb-smartcard" }, { "ccid-card-emulated", "hw-", "usb-smartcard" }, + { "usb-redir", "hw-", "usb-redirect" }, }; =20 static bool module_loaded_qom_all; diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 3c5b3d4fadd3..e342ff59fab0 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 Mon Apr 29 03:58:26 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=1594129589; cv=none; d=zohomail.com; s=zohoarc; b=YrgPvqrJ7G3cKwjjiih9mqCowbf1w0wYjatOxvE7Z2DcDwEM8r1YYnSPVxj3qaGS6CJqusRpGnHDzFOiPpPSx4UYO1Fl8cplt6vVqQS9DLHs6lp409yfyhtTqTPhXL1arvcQW9jZzqotIe9rabU9zpZcjFRnA6/j8OYJSlKvZGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129589; 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=1hdbvzh0LRbpAMT6z/LPJ2AKfhbzIuEuBObNn/Wxwc0=; b=GoCse1CQCLtjW50HMBV3gEyaP11/9HBErzP751XI1rqcH4J8JRmT4h9croadkU/VFEXl9SC3GPQh9ZvF9tebEveM4LWjUzkieOZYEyTqa8mDW0jTn5saY9dC2eBBW+e0vc3t081z+OPn1q+hq4bGvmBvI2geCaf1K1nA/qjPEYA= 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 1594129589828436.4120720173138; Tue, 7 Jul 2020 06:46:29 -0700 (PDT) Received: from localhost ([::1]:57720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnvY-0004x4-3Y for importer@patchew.org; Tue, 07 Jul 2020 09:46:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnry-0006hW-5O for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:46 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:42666 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 1jsnrw-0004ZG-Fb for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:45 -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-493-HVRi6op3MHS7sKvO6qK8nw-1; Tue, 07 Jul 2020 09:42:39 -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 8466983DE6D for ; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C9805D9F3; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 02C9C31F52; Tue, 7 Jul 2020 15:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129363; 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=1hdbvzh0LRbpAMT6z/LPJ2AKfhbzIuEuBObNn/Wxwc0=; b=bStGf60dXpHMWrH9WPOW9/pvwYQDgy4IbDizu+lr8aU/k9lJl2i42T+pNVp+A4f2cOJZX+ 8J1lkjifEFx7ItESWjTK5LIEwNdUR3dbX1JeTXhY4sQtWSZlehVDKeWXTtk95su8UUIv9O lEYPPaU7oUVnTnn796rKrNk6ZKpjCl4= X-MC-Unique: HVRi6op3MHS7sKvO6qK8nw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 07/10] vga: build qxl as module Date: Tue, 7 Jul 2020 15:42:26 +0200 Message-Id: <20200707134229.9773-8-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-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/07/07 00:20:54 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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 Message-id: 20200624131045.14512-8-kraxel@redhat.com --- util/module.c | 2 ++ hw/Makefile.objs | 1 + hw/display/Makefile.objs | 5 ++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/util/module.c b/util/module.c index e3226165e91c..7c76d2a84b94 100644 --- a/util/module.c +++ b/util/module.c @@ -264,6 +264,8 @@ static struct { { "ccid-card-passthru", "hw-", "usb-smartcard" }, { "ccid-card-emulated", "hw-", "usb-smartcard" }, { "usb-redir", "hw-", "usb-redirect" }, + { "qxl-vga", "hw-", "display-qxl" }, + { "qxl", "hw-", "display-qxl" }, }; =20 static bool module_loaded_qom_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 Mon Apr 29 03:58:26 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=1594129682; cv=none; d=zohomail.com; s=zohoarc; b=bnIx1whEUChQCw/dI+QW9yfTWzaAcusGWneBbktlP2tclDOsm2IoLh46NArkH2MMSAEyUBDfNiA+l44lt7JuOEQu1EeGrxrYNoToD65TH2VBnmLfLum6Sg8h9d4E5Ggcd/+6FaSUpt5kbshPls3Ycs+mg3Yi4+mHf0qG4uxS+k4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129682; 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=akbrj/47Kpn8U6a7aapfWRvWli+/95HHAxOyWrdP4NA=; b=FOT4USZIYavlPkHtOqt7T5blVlqey4IIDef8O8asuT+eEBmG+dvyzZ7DJQ5V3PDqVVmLr2mhu+dcnptYz1lrg4OLw6kBhJtJ+sAlKS1DASdr7Rv/r2qedyZc6+t86Km1AwpbPhplNiKDE/ryaTe24pLb3y8gTgM6FGquRJwnW1s= 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 1594129682616444.08930961204896; Tue, 7 Jul 2020 06:48:02 -0700 (PDT) Received: from localhost ([::1]:33716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnx3-0006mU-EK for importer@patchew.org; Tue, 07 Jul 2020 09:48:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsns1-0006o1-Mg for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:49 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56335 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 1jsns0-0004aS-4i for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:49 -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-332-QQFaxT82MSy0SrqJcimecA-1; Tue, 07 Jul 2020 09:42:38 -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 BD5A4800D5C for ; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42D5271662; Tue, 7 Jul 2020 13:42:37 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0A9E631F5C; Tue, 7 Jul 2020 15:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129367; 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=akbrj/47Kpn8U6a7aapfWRvWli+/95HHAxOyWrdP4NA=; b=fUoEkY9uheZENZNGteYcs5AaDV3UFvYbupcxl/wI5z4nK2PeLih7rMatTmPv1JRYTjmV9w hH2dhJeZbp2Juk46Eo3Y5xFZnV1zkjqYV0Jbbp/FPfikUAd6e/ORNfC/n8M7ImyOdevO8b CNNNHaIOQznrsNRpyT2iqQVkMFdg3Jg= X-MC-Unique: QQFaxT82MSy0SrqJcimecA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 08/10] vga: build virtio-gpu only once Date: Tue, 7 Jul 2020 15:42:27 +0200 Message-Id: <20200707134229.9773-9-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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 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/07/07 00:31:00 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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 Message-id: 20200624131045.14512-9-kraxel@redhat.com --- 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 Mon Apr 29 03:58:26 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=1594129516; cv=none; d=zohomail.com; s=zohoarc; b=J3FQoKKGdySdoppJsqJLQ1RlI5ucswGwPBr5a71llQeHroqrwxgW5P/x7tfVlCOQn108mV0Esvkth13oXrw7umHw+8MbaGe6lWWhy0qE/eF35WpJ2TROsRE9M61eNv4BkuaVv3CmdPOOFe0Ju1txwcLelMbFhik3jIlwuzUgdmc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129516; 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=H+315nxq6bNjq/QlcD/W08rdS4R94HYn4QVyOapKe54=; b=PDmAJ1U6PS6mCWmog4I1aja04ibGDmN6OTzh1OuSaQQzuaWLxbW+VGFOfFnjvH21cZuK13yA5zMxPJMDvyWXUKqGoroa0Gu0uXvapRXPg8rnBAA+6h0O62EGUExuacbtv3iSINxlTGQe9cX7XboAFh+bMv5LEAsuSyP/lJP3fJ4= 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 1594129516449787.3936848156492; Tue, 7 Jul 2020 06:45:16 -0700 (PDT) Received: from localhost ([::1]:53548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnuL-0002q1-SA for importer@patchew.org; Tue, 07 Jul 2020 09:45:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnrz-0006iz-0h for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:47 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:41040 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 1jsnrw-0004ZL-FQ for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:46 -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-387-mH5rpg8iOiWEU2RTHYCXjA-1; Tue, 07 Jul 2020 09:42:39 -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 E5BB51883638 for ; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BAE25D9C9; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 14A3331F5E; Tue, 7 Jul 2020 15:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129363; 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=H+315nxq6bNjq/QlcD/W08rdS4R94HYn4QVyOapKe54=; b=GWNhCAA/swQjY18BADIvLjCTmTdl++2SQw0hPYbbEff650U5ybRjYfFfl9M6TWlUdlv8w3 lhD/UkFmNyhwXo06aTYscKoEnsV9Wx5MdYZc7WgCkjFqkooe8uUOWG2jFISbm0eEnPKeno WS7E5sLwxspTnYWw7DZ3zFBAnZgPDOQ= X-MC-Unique: mH5rpg8iOiWEU2RTHYCXjA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 09/10] vga: build virtio-gpu as module Date: Tue, 7 Jul 2020 15:42:28 +0200 Message-Id: <20200707134229.9773-10-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-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/07/07 00:20:54 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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 Message-id: 20200624131045.14512-10-kraxel@redhat.com --- util/module.c | 6 ++++++ hw/display/Makefile.objs | 23 +++++++++++++---------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/util/module.c b/util/module.c index 7c76d2a84b94..a74214eac052 100644 --- a/util/module.c +++ b/util/module.c @@ -266,6 +266,12 @@ static struct { { "usb-redir", "hw-", "usb-redirect" }, { "qxl-vga", "hw-", "display-qxl" }, { "qxl", "hw-", "display-qxl" }, + { "virtio-gpu-device", "hw-", "display-virtio-gpu" }, + { "virtio-gpu-pci", "hw-", "display-virtio-gpu" }, + { "virtio-vga", "hw-", "display-virtio-gpu" }, + { "vhost-user-gpu-device", "hw-", "display-virtio-gpu" }, + { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" }, + { "vhost-user-vga", "hw-", "display-virtio-gpu" }, }; =20 static bool module_loaded_qom_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 From nobody Mon Apr 29 03:58:26 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=1594129515; cv=none; d=zohomail.com; s=zohoarc; b=R756kb94w5W669A08WmDnEujGpIOMzReOnc468r0eyuVffnowYUS17Fht+WpjNvmKfLu6G6c2pVXHM7RGUzJDhvsKWdcweboYKNNn9BrszpiCR1d3/TRtCUoMW6gOVJqk40lB30ASbgjg4njvIgZy3q7RivaeCKgIwhgZBjdLI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594129515; 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=+T5nEzbikVPfmrsZRjdm19UXIkdXCxFroIqmStEfv64=; b=ds+2TbddF8ckz0a/Z+eZVBs4i5XmAr8DV38BNljb+E87Y9mjnh+lci5iSiQd/DMJ2xjD2VfYQhfkyCIqETtocXqNP/OxJXoVn1r9nu4G8SlvgxK1yrgFYx/O7J8YUQRNwgB/0njOYjJgl5G6SzsOHp9er72f0Ws3bRA8zBzWpGE= 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 1594129515487929.8807776077413; Tue, 7 Jul 2020 06:45:15 -0700 (PDT) Received: from localhost ([::1]:53506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jsnuL-0002ni-5f for importer@patchew.org; Tue, 07 Jul 2020 09:45:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jsnrv-0006dh-WA for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55457 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 1jsnru-0004Z1-7L for qemu-devel@nongnu.org; Tue, 07 Jul 2020 09:42:43 -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-398-gEZHE-2bO6WQijjukaBwmw-1; Tue, 07 Jul 2020 09:42:39 -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 B52F21883634 for ; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-200.ams2.redhat.com [10.36.112.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4418E78467; Tue, 7 Jul 2020 13:42:38 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 21E4F31F62; Tue, 7 Jul 2020 15:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594129361; 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=+T5nEzbikVPfmrsZRjdm19UXIkdXCxFroIqmStEfv64=; b=HLoPg15WY9FXnG4DQDG2emSHxpWahz4D5JYIpo4YbYOrOz2uMQ/CxGLb+vfrDgulj1qV5g gsmmDe+xcVf7+G2o5HQ4CxjtydrrmbxOew2jrzs02cSEOnOQP7vFHEiVY7+g77mz9nK8ju Bb3zOyzHbnIhfFPIiY7tHbnpTNzwz6Q= X-MC-Unique: gEZHE-2bO6WQijjukaBwmw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 10/10] chardev: enable modules, use for braille Date: Tue, 7 Jul 2020 15:42:29 +0200 Message-Id: <20200707134229.9773-11-kraxel@redhat.com> In-Reply-To: <20200707134229.9773-1-kraxel@redhat.com> References: <20200707134229.9773-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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=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/07/07 06:04:49 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.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_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost , Paolo Bonzini 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" Removes brlapi library dependency from core qemu. Signed-off-by: Gerd Hoffmann Message-id: 20200624131045.14512-11-kraxel@redhat.com --- Makefile.objs | 1 + chardev/char.c | 2 +- util/module.c | 1 + chardev/Makefile.objs | 5 ++++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 3d45492d8b46..d22b3b45d7b6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -71,6 +71,7 @@ common-obj-$(CONFIG_TPM) +=3D tpm.o =20 common-obj-y +=3D backends/ common-obj-y +=3D chardev/ +common-obj-m +=3D chardev/ =20 common-obj-$(CONFIG_SECCOMP) +=3D qemu-seccomp.o qemu-seccomp.o-cflags :=3D $(SECCOMP_CFLAGS) diff --git a/chardev/char.c b/chardev/char.c index e3051295ac37..df697f3ce9e0 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -527,7 +527,7 @@ static const ChardevClass *char_get_class(const char *d= river, Error **errp) const ChardevClass *cc; char *typename =3D g_strdup_printf("chardev-%s", driver); =20 - oc =3D object_class_by_name(typename); + oc =3D module_object_class_by_name(typename); g_free(typename); =20 if (!object_class_dynamic_cast(oc, TYPE_CHARDEV)) { diff --git a/util/module.c b/util/module.c index a74214eac052..32b0547b8266 100644 --- a/util/module.c +++ b/util/module.c @@ -272,6 +272,7 @@ static struct { { "vhost-user-gpu-device", "hw-", "display-virtio-gpu" }, { "vhost-user-gpu-pci", "hw-", "display-virtio-gpu" }, { "vhost-user-vga", "hw-", "display-virtio-gpu" }, + { "chardev-braille", "chardev-", "baum" }, }; =20 static bool module_loaded_qom_all; diff --git a/chardev/Makefile.objs b/chardev/Makefile.objs index d68e1347f9af..3a58c9d329d6 100644 --- a/chardev/Makefile.objs +++ b/chardev/Makefile.objs @@ -18,8 +18,11 @@ chardev-obj-$(CONFIG_WIN32) +=3D char-win.o chardev-obj-$(CONFIG_WIN32) +=3D char-win-stdio.o =20 common-obj-y +=3D msmouse.o wctablet.o testdev.o -common-obj-$(CONFIG_BRLAPI) +=3D baum.o + +ifeq ($(CONFIG_BRLAPI),y) +common-obj-m +=3D baum.o baum.o-cflags :=3D $(SDL_CFLAGS) baum.o-libs :=3D $(BRLAPI_LIBS) +endif =20 common-obj-$(CONFIG_SPICE) +=3D spice.o --=20 2.18.4