From nobody Mon Feb 9 11:33:25 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592834700; cv=none; d=zohomail.com; s=zohoarc; b=a724qArAARWur6ohNvHnmsMurqNlwlBRXYWG0fRlyOf/hAckJwVpCNv0kUHU61qy6McQPpBqCNRWshNUXKEK58FwFT/JiIYMZzQLurssjzFqHMMiXFxJlGgw9sg7qLhlHnSKTeANLCIzND1X/XjcRM2mJUuCzdWW/fFQ86sK8kA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592834700; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=vhTeCajKC2nULXLiXiNaBtZWkN7Tx6hzRVNzLfPfrAc=; b=jmun0Bbe9lDA70zal4I2HFnUh9DGTQShLPxhc9LE87jgNXY15FOqQJcxyTBweQB2lktsgP55aH6nomw2jqbySknFcFWnScYvVEABPYD3h1xkLzMrnJdqFCwe6B+kofA8/Dp1Q4yMna6foP3RaeDp0mH1yxyoMrqasgolCmIBb0o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592834700134250.63812869916296; Mon, 22 Jun 2020 07:05:00 -0700 (PDT) Received: from localhost ([::1]:58376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnN4E-0007bb-QY for importer@patchew.org; Mon, 22 Jun 2020 10:04:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnMvu-0005ZH-Rq for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24723 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnMvo-0007jK-HJ for qemu-devel@nongnu.org; Mon, 22 Jun 2020 09:56:22 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-497-RjxYKOTLNEiMCb94DBk_eg-1; Mon, 22 Jun 2020 09:56:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6B3A9100CC85 for ; Mon, 22 Jun 2020 13:56:08 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-67.ams2.redhat.com [10.36.112.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B81A7C1F9; Mon, 22 Jun 2020 13:56:02 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4730B1753D; Mon, 22 Jun 2020 15:56:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592834175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=vhTeCajKC2nULXLiXiNaBtZWkN7Tx6hzRVNzLfPfrAc=; b=Osz5FVVEcVF+cyIF9lqK/MoCdOzd8/qJzaoMLi4idTdhkRIemylAh92r149SyKojGFT/Ny NL7c5veuzPP3A7lxEMoie9dcr8g8pnanpm+FJFRcgD2DiVOURSaOwtNVprtzMWlw8a7j9h zs+Nu4KIvE9dyk4/ioW7cPFParBa87o= X-MC-Unique: RjxYKOTLNEiMCb94DBk_eg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v4 3/7] ccid: build smartcard as module Date: Mon, 22 Jun 2020 15:55:57 +0200 Message-Id: <20200622135601.12433-4-kraxel@redhat.com> In-Reply-To: <20200622135601.12433-1-kraxel@redhat.com> References: <20200622135601.12433-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=kraxel@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 02:57:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dinechin@redhat.com, Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Gerd Hoffmann , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Drops libcacard.so dependency from core qemu. Signed-off-by: Gerd Hoffmann --- Makefile.objs | 1 + hw/core/qdev.c | 2 ++ hw/Makefile.objs | 1 + hw/usb/Makefile.objs | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.objs b/Makefile.objs index 7ce2588b89a3..ca555ede0710 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -59,6 +59,7 @@ common-obj-y +=3D migration/ common-obj-y +=3D audio/ common-obj-m +=3D audio/ common-obj-y +=3D hw/ +common-obj-m +=3D hw/ =20 common-obj-y +=3D replay/ =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6119e25e0eeb..d6459e4aa8e8 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -172,6 +172,8 @@ static struct { const char *type; const char *mod; } const hwmodules[] =3D { + { .type =3D "ccid-card-passthru", .mod =3D "usb-smartcard" = }, + { .type =3D "ccid-card-emulated", .mod =3D "usb-smartcard" = }, }; =20 static bool qdev_module_loaded_all; diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 4cbe5e4e57d6..af8fd9a510ed 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -43,4 +43,5 @@ devices-dirs-y +=3D smbios/ endif =20 common-obj-y +=3D $(devices-dirs-y) +common-obj-m +=3D usb/ obj-y +=3D $(devices-dirs-y) diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index fa5c3fa1b877..3c5b3d4fadd3 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -29,11 +29,13 @@ common-obj-$(CONFIG_USB_NETWORK) +=3D dev-network.o =20 ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y +=3D dev-smartcard-reader.o -common-obj-$(CONFIG_SMARTCARD) +=3D smartcard.mo +ifeq ($(CONFIG_SMARTCARD),y) +common-obj-m +=3D smartcard.mo smartcard.mo-objs :=3D ccid-card-passthru.o ccid-card-emulated.o smartcard.mo-cflags :=3D $(SMARTCARD_CFLAGS) smartcard.mo-libs :=3D $(SMARTCARD_LIBS) endif +endif =20 ifeq ($(CONFIG_POSIX),y) common-obj-$(CONFIG_USB_STORAGE_MTP) +=3D dev-mtp.o --=20 2.18.4