From nobody Sun May 19 11:31:03 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=1591891751; cv=none; d=zohomail.com; s=zohoarc; b=KcokrLS9kUqibJynUfPsiDZw6kD3PXPKIXEYhhEFC1rNUNO/Ebd54gImTeXI/TrARN4QvGlvmQf3acb8n0AsK/SoTS808/80qdAEGCwIUbZ66S7tS4TV1X0Rm/qZeVYIUvHDzmNBIenOy/GepMwasSQ/MVZF1KEcKfQmn8tZRCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891751; 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=a/GQD4lAJJ5ICleMlXPowioaefks84ty8lBKrWWjqKg=; b=CJAU9XybRccbObpp0cdKFBeIuBBZV0iDOLjkgroYA7HQ8gsvRehVJZ1qsLo/Q+flUDb986vXiWB6L3qfWc4+jOO+NcxjI3s15ZZSfQpOaktipQKMCXTaqk4o6QBcglb5gyCLnb7qLZzhIYqrWM6UYV06SKWPd4wAxRI/bWfJr2M= 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 1591891751494675.878065023924; Thu, 11 Jun 2020 09:09:11 -0700 (PDT) Received: from localhost ([::1]:53568 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPlO-0004aZ-2V for importer@patchew.org; Thu, 11 Jun 2020 12:09:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPfn-0005fZ-Vl for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42772 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 1jjPfm-0000bm-1L for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:23 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-31-cltclGvoMqiY6FDjH6MUiQ-1; Thu, 11 Jun 2020 12:03:15 -0400 Received: by mail-wr1-f69.google.com with SMTP id s7so2726927wrm.16 for ; Thu, 11 Jun 2020 09:03:15 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id z2sm5396064wrs.87.2020.06.11.09.03.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891400; 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=a/GQD4lAJJ5ICleMlXPowioaefks84ty8lBKrWWjqKg=; b=XEIaM7A/pik45Sl0c/3nuYiFXSnOFI/v3PcfPjBJoaVix5hXmI5v+yaZvoePfFoieJYM7v w2mi6XbQBBMycleoN9OD9aTHauj7GL0kCxL++eMU6MhSqbY3JCJZQwAAMibFay0oGCsTKv leaxYLWwl4npNc4ct9BDiYpn5xSUR50= X-MC-Unique: cltclGvoMqiY6FDjH6MUiQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a/GQD4lAJJ5ICleMlXPowioaefks84ty8lBKrWWjqKg=; b=r2pj+Y+vYtiNLE9TE5kGa6iK4AONxaMAYdTBjVV+JTk7E2AwS13nYFr0cDXkDLRdQi 4PVsFZ2Q8wv3HtSK0oq9jFcD+DAVFlTZ33/vP4iADBcaahFDIzqGPPfHHAxCjZd7Y1jL oxnmqpFc1+nCuZf8i3L1X+Fa7IjgCaud8ejjtDGewhdlB0+Ba3bfgk1momLkQbTrsOHh KzMzhpth5EvzS8iDDULGJemMoxDxUo9ooIonfdd5QgTFeUIX7cnp8nncnfapxHD/tjvV D9NUWgcwIrs2rkEEVpvSf2wUGPpu8eAB6nVfQxl+k8ZZcYc9K3HngVWaEE2a4lCaPPQS oq1g== X-Gm-Message-State: AOAM5317E2TAbDmLyrHRnvHofOiNNq8CehaH8CpAMWOZZnUqOO9Y5F0b daYePHXJP7kweQzGMPRKgDbIByn0xU7tWs8n/wH8dU6gyUDErVtKEmRURDwmA8byrV6J42/bII5 SynrPQmAXPyAIhFo= X-Received: by 2002:a5d:608d:: with SMTP id w13mr10156003wrt.298.1591891394546; Thu, 11 Jun 2020 09:03:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRu5pl3GVx/86EtkVzXlDKEuxJFHnM2YWAM5CuzPHINFI1FOpnMM3w0N+qnaIKGGHjaEI+fw== X-Received: by 2002:a5d:608d:: with SMTP id w13mr10155992wrt.298.1591891394384; Thu, 11 Jun 2020 09:03:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 01/11] docs/specs/tpm: Correct header path name Date: Thu, 11 Jun 2020 18:02:56 +0200 Message-Id: <20200611160306.2751-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit 8dc6701722 introduce the documentation but an incorrect path name was used. Fix that. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- docs/specs/tpm.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 5e61238bc5..9e48e3b981 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -199,8 +199,8 @@ to be used with the passthrough backend or the swtpm ba= ckend. =20 QEMU files related to TPM backends: - ``backends/tpm.c`` + - ``include/sysemu/tpm.h`` - ``include/sysemu/tpm_backend.h`` - - ``include/sysemu/tpm_backend_int.h`` =20 The QEMU TPM passthrough device ------------------------------- --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891623; cv=none; d=zohomail.com; s=zohoarc; b=LqekPosnmRPxoux6KNRkN3dW7ykL350rQwX2hVLtJRvQ0O67PgZt8/uM1G2/aCa/kF1D2hQWnOA4eZ74YL3yqt3GpO9Cup6o8HtK8KvzHCBfDUvBEBiniLWJvBHJY19lttHr0EmP9GEDj4Fv2qK5Boa/TdJ8vfg96Wlc3m0gfX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891623; 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=7iBj366HDTDMnWgMVaB3F0YknnASmntgiVGR2sJtUQI=; b=TYgcBxetvYKL8JqftV/fl870DOT46RIjWyz1OLpGMp3Q8F8HpnnUqD4/nNzkQnqA/eR1kqvhrehsdiJ/piQFsRle9Z8GUHs4TUKKr1AoTq3hSJTnD3vLF+XLevPfZHbukRQYCYMPYyhQYMXuCdHLxkDXRlXkrgcHUWKPnYiN7k0= 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 1591891623967995.1352923996112; Thu, 11 Jun 2020 09:07:03 -0700 (PDT) Received: from localhost ([::1]:45332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPjJ-0000Lq-Qb for importer@patchew.org; Thu, 11 Jun 2020 12:07:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPft-0005tY-2j for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:29 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30130 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 1jjPfr-0000dk-6Q for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:28 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-55Zzqu_QOFKaZEuC37xElw-1; Thu, 11 Jun 2020 12:03:22 -0400 Received: by mail-wm1-f69.google.com with SMTP id j128so1495244wmj.6 for ; Thu, 11 Jun 2020 09:03:22 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id z2sm5396336wrs.87.2020.06.11.09.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891406; 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=7iBj366HDTDMnWgMVaB3F0YknnASmntgiVGR2sJtUQI=; b=JK8eUPyspY5+iMNRzHnSpiQemUgWi2wax3ld1Qphtja+9Hx1CiRvHXB5flt/zJEW+UQjGa e2L2YvrWrfOaMOFQyTIVBd0CNl51DSvnrEDMbYZmLp89WHRVzNeKyxa9BNn12mRA3mXKrY 8eC3+3tw/fb42rkSTnbuQw4qDmiq138= X-MC-Unique: 55Zzqu_QOFKaZEuC37xElw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7iBj366HDTDMnWgMVaB3F0YknnASmntgiVGR2sJtUQI=; b=HUUMw/pwGgyvGOp0jYiYokbhQsGBwjFAhrWiNUlg2BzkcoNrEZ+hdLOnEa4hDBcg+Q yXP/eF3AJdPCvaHQXNEmaC94YWDq4hwUfWlBkeIIkOPJO1tL76miVLiIbnw1Tt9+09hr GmFrRNu/3nT3hJsMJfZQnfUjIdBIdhG/4gqQmrnmDFG5Fy8TDN4S91xI99AJgg/ir4SA wB5UPv++67FG/QrlBW7/D2wId+ne8cCFVlEKMmeMt/m+rmNsD6uzk+/zguClErbLPZCH ZvDCH8zlValqkUiOufgASqW6rRHaZ0froK4iAOQGRudLpasFRsLFDd2C49z0xoqlPsY/ axHQ== X-Gm-Message-State: AOAM531NVFjH0T0rkugfi+y5/IncILhN55EIUbTRTH7xqS8Ofo+BOn1R e9oYNc6j+aJSs3TcAIkdHLmgHOCKMRUlf8tHTcF2PqxB3/Mp6X/DnVd78pwit6b3fe4u5dgAVHA RJ5nBLF6lMYEplyQ= X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr9363313wma.83.1591891401289; Thu, 11 Jun 2020 09:03:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJysYVRwNxY8KI8rLxmGY2TQHT1+N0syLuE0dhRmn5YmtrYNyAItSL3gGuMfFqmDn8cWQJIKDA== X-Received: by 2002:a1c:4b0f:: with SMTP id y15mr9363172wma.83.1591891399406; Thu, 11 Jun 2020 09:03:19 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 02/11] backends: Add TPM files into their own directory Date: Thu, 11 Jun 2020 18:02:57 +0200 Message-Id: <20200611160306.2751-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As we will have various TPM backend files, it is cleaner to use a single directory. Suggested-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- backends/{tpm.c =3D> tpm/tpm_backend.c} | 0 MAINTAINERS | 2 +- backends/Makefile.objs | 2 +- backends/tpm/Makefile.objs | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) rename backends/{tpm.c =3D> tpm/tpm_backend.c} (100%) create mode 100644 backends/tpm/Makefile.objs diff --git a/backends/tpm.c b/backends/tpm/tpm_backend.c similarity index 100% rename from backends/tpm.c rename to backends/tpm/tpm_backend.c diff --git a/MAINTAINERS b/MAINTAINERS index 3abe3faa4e..9deb15b268 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2385,7 +2385,7 @@ F: hw/tpm/* F: include/hw/acpi/tpm.h F: include/sysemu/tpm* F: qapi/tpm.json -F: backends/tpm.c +F: backends/tpm/ F: tests/qtest/*tpm* T: git https://github.com/stefanberger/qemu-tpm.git tpm-next =20 diff --git a/backends/Makefile.objs b/backends/Makefile.objs index 28a847cd57..22d204cb48 100644 --- a/backends/Makefile.objs +++ b/backends/Makefile.objs @@ -1,7 +1,7 @@ common-obj-y +=3D rng.o rng-egd.o rng-builtin.o common-obj-$(CONFIG_POSIX) +=3D rng-random.o =20 -common-obj-$(CONFIG_TPM) +=3D tpm.o +common-obj-$(CONFIG_TPM) +=3D tpm/ =20 common-obj-y +=3D hostmem.o hostmem-ram.o common-obj-$(CONFIG_POSIX) +=3D hostmem-file.o diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs new file mode 100644 index 0000000000..8cf5772824 --- /dev/null +++ b/backends/tpm/Makefile.objs @@ -0,0 +1 @@ +common-obj-y +=3D tpm_backend.o --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591892120; cv=none; d=zohomail.com; s=zohoarc; b=kzLBlc/RNvnMiUvd3d2cCT3x68ppO/HBO6+XsEldoCzF9jbopHYyZFt1ASlI7Ffw0q4qa+SID2HOkqK3pf5CrNamNqD7NAYqPtCDojJ5nbm/koW4syPNwZvugRm5OBF1HGXT9TDU5bQDiAnb4CDue0BqGmZ6QiZ2Y5KXP4Veqw8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591892120; 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=8lWB0Ui4g7romPhYjN7+fNOLPfWPt76YM8vzgCCtMno=; b=QUuCovL907tCgL+93AIDJJl5CfhzPsSv5QVf0eApvrG5WjivXWsVBZCiSLJQi33hc0DmXhv4lhPvTk5RxzxqMx7JPzND2fhFNpy5uzFGrgCVZmnaxiAJjgA5Sj17As3/VrXeweQ2nKoP/64CTfMTajVI9B57etQUeaxVUUCfm4s= 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 1591892120066722.4286350302701; Thu, 11 Jun 2020 09:15:20 -0700 (PDT) Received: from localhost ([::1]:48878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPrK-00082e-KG for importer@patchew.org; Thu, 11 Jun 2020 12:15:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48608) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPlJ-00059v-9F for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:09:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28403 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 1jjPlH-0002BE-5t for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:09:04 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-262-a85W7eDBN8O4ZI2y4J6cYg-1; Thu, 11 Jun 2020 12:03:27 -0400 Received: by mail-wr1-f71.google.com with SMTP id p10so2723258wrn.19 for ; Thu, 11 Jun 2020 09:03:27 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id d2sm5880260wrs.95.2020.06.11.09.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891741; 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=8lWB0Ui4g7romPhYjN7+fNOLPfWPt76YM8vzgCCtMno=; b=gwb0IxYj5TWBf4KsI3wfl/uc65N+1AnSekdSOxXojDFFc8qZSZ9XTluWx3+FLpAl+nkWbN KV3b69Z6J/LFhC8R21b20+svLIt9a27QSPcmj40Rj/9swpfcGTkY1bLydQfPfHWwztwwbO UZzgTsvnRR8mCDSonkNu5bKdtW7PmZU= X-MC-Unique: a85W7eDBN8O4ZI2y4J6cYg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8lWB0Ui4g7romPhYjN7+fNOLPfWPt76YM8vzgCCtMno=; b=lUPmbC/YixhFqPR+Y02yxvYEvqmV/gAmjppmH77zmuhPvAuhinahllVHzjdBxAEGgz kugWGbYEOw/zlEvfNuI4xLKb0415SXJxMs7RHG90Vc6QyQ9MkWggsVtkQPAIPp37Okno JyGXbfvHU6VMZw54g7bfvGi1a5IPoBjwQ0LKu5WoQvNmfZ1/OCfG1XmSCAO9phWkNTRs 8V1vSWfY+SprI5gQTrExqv+Kg+cx5YWEr+7Rq7wl8z4f3w4piwtrJlHLLm3aWWOP4tkJ v1OoJLs5Q7s4vg1iWpju3jS1V9y9kk4XDzFM2aCL/D9viV57Cfuyyx2FRAjt7spIMo5A 89Gw== X-Gm-Message-State: AOAM531ChYv4lGkA54FevzucHE0ezPP4I8FNNjv8t2Xur9r2Ul/CIJwy La2Gz+CZ48oCYuSKO7h4ncQv7EFOX76kflrTTZlZsnQ3jEJZhJfYGx2TcP09fByKSf6q8DDYG34 1VVLw/lmRHSZ62Rg= X-Received: by 2002:adf:e78a:: with SMTP id n10mr10677300wrm.114.1591891406198; Thu, 11 Jun 2020 09:03:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztQUYXO6NNQtaF8o4BnQnfggb8b2XxntyaTl90JbG0uqF9bBRx+torpCUTWf7j1IM777kLcQ== X-Received: by 2002:adf:e78a:: with SMTP id n10mr10677271wrm.114.1591891405969; Thu, 11 Jun 2020 09:03:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 03/11] hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig Date: Thu, 11 Jun 2020 18:02:58 +0200 Message-Id: <20200611160306.2751-4-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) The TPMDEV describe TPM backends. Use the TPM_BACKEND config name which is self-explicit. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Berger --- hw/tpm/Kconfig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 4794e7fe28..5028fd8880 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,4 +1,4 @@ -config TPMDEV +config TPM_BACKEND bool depends on TPM =20 @@ -15,26 +15,26 @@ config TPM_TIS_SYSBUS config TPM_TIS bool depends on TPM - select TPMDEV + select TPM_BACKEND =20 config TPM_CRB bool depends on TPM && PC - select TPMDEV + select TPM_BACKEND =20 config TPM_PASSTHROUGH bool default y # FIXME: should check for x86 host as well - depends on TPMDEV && LINUX + depends on TPM_BACKEND && LINUX =20 config TPM_EMULATOR bool default y - depends on TPMDEV + depends on TPM_BACKEND =20 config TPM_SPAPR bool default y depends on TPM && PSERIES - select TPMDEV + select TPM_BACKEND --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591892218; cv=none; d=zohomail.com; s=zohoarc; b=m2cGLJQYX5iTiYILcaGi+YQdEcA5wgjBdxcZV4F7vD/J14WPjCaKXQvBtEfheoUkoWJg3IHm8MYXG6BCDd++KvpQ8XECqepPV+zOS+0EP+3eXBCXEgBKS5xPb/YOTa0y1F/6abQbasDwRvVLO5aJpvLfRZ2AI+MAvXhUjzp+ff4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591892218; 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=lg93mmx8nphNH1y4bYZrwT9M+1WJW6lG0NFyoN2HHMc=; b=BfmymZx5GjiS9GS55epre2FZGX0NQfNjbXdoQnP8gbINdzyqnr61gcaoa2h+wv1qI1OT6XfI05mX568B+4Undn9qQYJ/p2T1kv5sftG1r1iMgY7aAYiPb1FOfUcRS2y3RhBRFiewzXiqOl6UoyuUBXliRegPRX42mrK+4a5hT08= 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 1591892218726237.91188110359656; Thu, 11 Jun 2020 09:16:58 -0700 (PDT) Received: from localhost ([::1]:53834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPsv-0001xO-4p for importer@patchew.org; Thu, 11 Jun 2020 12:16:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPmH-00078k-3C for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:10:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:30626 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 1jjPmF-0002QE-7e for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:10:04 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-9d_PgyNDPrWAaJLjzlMDKA-1; Thu, 11 Jun 2020 12:03:32 -0400 Received: by mail-wm1-f69.google.com with SMTP id u15so1225473wmm.5 for ; Thu, 11 Jun 2020 09:03:32 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id a15sm5749589wra.86.2020.06.11.09.03.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891801; 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=lg93mmx8nphNH1y4bYZrwT9M+1WJW6lG0NFyoN2HHMc=; b=Zx1i/gNCgV7CDz7T/wT1W8BCSrVCR+Y6+a0pW3lw1VS8wffWYGEs8C3/Ha316M4hHRNgqQ NOY7Cp0HRUGM9+xFIwTBEfcyfeVa+R2/HRnTX30lZBbPyUBFoRmOkTZud2ea12oTJYN/n4 kJwjU1YxqqlyhutBLqEAoHGM3He6Nts= X-MC-Unique: 9d_PgyNDPrWAaJLjzlMDKA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lg93mmx8nphNH1y4bYZrwT9M+1WJW6lG0NFyoN2HHMc=; b=uWvdA1SkLIBRu3oEKHUVAob11diVoUGDEqs+poSGvqLS5jCeAzwPw5BCwwTnUvgqBs 9nYJvA6a4nl/XCdb9PwQBVDo8HE72UtRrSfrpeYbA36FbWD/qC93xxH3xY4xi2sURngT hPSJ3geF7DZ9vphT5eEP/Zo1QAfMxVxxcSG2YuG/puUJP6HWs8XACGa2DoC+MdYz2+BG jGXQFjm01Yy8jAKgbRlfarR6Cqc9g5y1kAv+b1Qma6ccFYXSeX7RTyRack5/MYKCW7lu tXAlNoLj2hemXOWIflohB4XCoOiuc+8IAYni6HcQY7y4zHKZKRQT+1PcAWiYTb5cuVnX fJIg== X-Gm-Message-State: AOAM533Q+SCx/FyBaHHG3T8yKheRAOby6sk/b8LwQwN7JDq/YVrMGaoS rsBjCxJOYehYSW5rWJ6OGCELFOI78B4GxOPVMjxETC12X9GoUrlvsa+QCgWMeSiw9dcuVt25/Pk xizGEAajVkohmIJM= X-Received: by 2002:adf:9286:: with SMTP id 6mr10379909wrn.361.1591891411094; Thu, 11 Jun 2020 09:03:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqTesS7xm4yBhAQQ99I3Nma0bf65xYGUYytQg5xoJP5xIXklWHETgjuJ+4V87pgYtOfbZgxw== X-Received: by 2002:adf:9286:: with SMTP id 6mr10379891wrn.361.1591891410935; Thu, 11 Jun 2020 09:03:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/11] hw/tpm: Do not include 'qemu/osdep.h' in header Date: Thu, 11 Jun 2020 18:02:59 +0200 Message-Id: <20200611160306.2751-5-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From CODING_STYLE.rst: Do not include "qemu/osdep.h" from header files since the .c file will have already included it. Remove "qemu/osdep.h" from "tpm_tis.h". Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_tis.h | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h index 5554989395..f6b5872ba6 100644 --- a/hw/tpm/tpm_tis.h +++ b/hw/tpm/tpm_tis.h @@ -24,7 +24,6 @@ #ifndef TPM_TPM_TIS_H #define TPM_TPM_TIS_H =20 -#include "qemu/osdep.h" #include "sysemu/tpm_backend.h" #include "tpm_ppi.h" =20 --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891665; cv=none; d=zohomail.com; s=zohoarc; b=N2nkinKQIT304SLNMpwdzIqElBCuXNsRJtYO+QwMISdWPCyqZsiy4l020SN1+xzNJ++bQbmqoOMBqHieeBdl30ZJMRnUG+uega6/Lus5xSRcwd71xdJR1lL3dDI3VLp4gPtH1Nz/wNOAjF88LSCBiryUWE/rFhPviKYitnylGT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891665; 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=GhYz6sKF2bPYiUHoKS1Jnt6TjZbsEwWbEop5lmusuaY=; b=MrYEk6SRTbOslOjHT146wU4Bx8U7IBKRSoOP6PcEIJuaDSsw0Sse133uWeLLHljBrKOssf+tMTikqhPTQjcaCAmqRSoSXl/uxsieP6cwiTKBsFu4H39xP9YESdr6CVmwzUXsTHpzELBGgzSHjFefxf54oS7Q3/rA0myyacZNpTs= 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 1591891665288821.8502557452483; Thu, 11 Jun 2020 09:07:45 -0700 (PDT) Received: from localhost ([::1]:48168 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPjz-0001zz-UI for importer@patchew.org; Thu, 11 Jun 2020 12:07:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPg7-00069t-R6 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:43 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:28503 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 1jjPg6-0000qV-3G for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:43 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-261-2AmmOEQxNlq9edjC317ahg-1; Thu, 11 Jun 2020 12:03:37 -0400 Received: by mail-wm1-f69.google.com with SMTP id t145so1494747wmt.2 for ; Thu, 11 Jun 2020 09:03:37 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q8sm4429457wmq.1.2020.06.11.09.03.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891421; 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=GhYz6sKF2bPYiUHoKS1Jnt6TjZbsEwWbEop5lmusuaY=; b=YV5GtGZgjpTl/u/Qr4h6/WulBJR19Gyot7suambkiJxuXFbxRq52qUXCaEztnOypHW78Un l4P9+xV3tTMKWkVxqV2n1HXAq2wOGYvYARhMlZTegIzlnA7CmCCYsfrLJ+tBADnvx3UaV3 UnDseKXCuIXGz+IJ/B8ttWeyNmxvYoU= X-MC-Unique: 2AmmOEQxNlq9edjC317ahg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GhYz6sKF2bPYiUHoKS1Jnt6TjZbsEwWbEop5lmusuaY=; b=FQF1zp1OoB0s178JZMnpJeZpvP2PfstyRULDKhgsc24D2bbbpQe5rG1ldWuqd8R558 x+7DAagsuVCp63WzGzx8QrjFjs2Jsg1bqDmII5mxRgmlrsk6BrjiM1PMaYpEqgEbrhJ2 RzBnfYAMtIPijq9GOIakPUpY/0ex7afkVWDyQLOCrDLZxR42rZXiHnDkoT+c2Rz9hyOd D5u9x3DQu1uQBHVcHjJowMemP2187Xa7hsqTs5sJ4OVdKZ5M3YiMBEu+r/zMZoiNRDcV 1crnfUIw0ZXds4HSthIf/JcPLD2gny09INTJ+Z7VJTFVjPdyGJyQpA2aauVJIz7SMJQi Lysw== X-Gm-Message-State: AOAM5321Zz8VlZovxzlK8ZYhyJ22ac7Nl7oE6XjIv13CxiSw7+kLvhFi XeV3chZpq7KDcYPUY0knlD8zUg9Q9RY4JyxcT4xB2OhoSiMzyRnBUvc5As/HvMFrMwzxsXNlcku Kdr1TLNGjdBdmpj8= X-Received: by 2002:a1c:6a1a:: with SMTP id f26mr9109441wmc.80.1591891416276; Thu, 11 Jun 2020 09:03:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5f3Pj8z9aYJA0Iv+c9ytFLLmSgAJSptUJ5KizCrXLFDAKYeF/EjT5KOYlAweFzc0XNlc1Ig== X-Received: by 2002:a1c:6a1a:: with SMTP id f26mr9109398wmc.80.1591891415774; Thu, 11 Jun 2020 09:03:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 05/11] hw/tpm: Include missing 'qemu/option.h' header Date: Thu, 11 Jun 2020 18:03:00 +0200 Message-Id: <20200611160306.2751-6-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.81; envelope-from=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Files using the TPM_STANDARD_CMDLINE_OPTS macro declared in "tpm_int.h" will use QEMU_OPT_STRING definition declared in "qemu/option.h". Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_int.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index 3fb28a9d6c..fd5ebc6489 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -12,6 +12,8 @@ #ifndef TPM_TPM_INT_H #define TPM_TPM_INT_H =20 +#include "qemu/option.h" + #define TPM_STANDARD_CMDLINE_OPTS \ { \ .name =3D "type", \ --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891756; cv=none; d=zohomail.com; s=zohoarc; b=Mcg3aYzspO01WsOOnINDm2rf7o/Qzovyc3R7cp5euMdRbbxD7Hhw5xEIBiiEcshu3aXNvo22s+sRhz0dUjTLZkojqmFUDJM+MWy/oSvlMUqm9TjfLTp9nhWJJsIA6xj/2XqwIOWFHV7P4u/39mlMJN/NROmRKDtUDaFwWiTMDVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891756; 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=D2Oz/tFoTbJgZ+hpQsGEbztQQnHjY/PR/LdJBtph6qw=; b=KrWphC6WC01D9ixuds5Jjy8W09E4wSmzWW9maps2AL+heDVF6W1ozzzv8+lP4RsGlWdlCxg98osWdb/1lkeyCY0v93L5oKRN+D085pigd29g2wHTtQrm1fN+hioyujT1GrpUGlV4wyrPju6XwRb2fFzcglQ+vwj/7jYkSTPtMMY= 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 1591891756291826.4634000520567; Thu, 11 Jun 2020 09:09:16 -0700 (PDT) Received: from localhost ([::1]:53876 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPlS-0004j7-SX for importer@patchew.org; Thu, 11 Jun 2020 12:09:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPgA-0006Gz-Kh for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:46 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23103 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 1jjPg8-0000rT-Mk for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:03:46 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-300-TC3R5MoVPAau_FYHOwOT6g-1; Thu, 11 Jun 2020 12:03:42 -0400 Received: by mail-wm1-f72.google.com with SMTP id a18so1228369wmm.3 for ; Thu, 11 Jun 2020 09:03:42 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id o10sm5515821wrj.37.2020.06.11.09.03.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891423; 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=D2Oz/tFoTbJgZ+hpQsGEbztQQnHjY/PR/LdJBtph6qw=; b=PHJSZaBf2B0ZiV9U1W9EJQQseyVaMKgJZLec7/F7IdPJHpCQgUBPXe2xhxpITT5aQO//Sc LmNqwtCMeWkuUuNJNEdEsRC4lmpQhTaJ0G4cekFRtiBgSVFfn02NrNJsB0Y9swG8Vf/NnW zBkzYTJDHkiTF7eE5dbwZffkwe2XafY= X-MC-Unique: TC3R5MoVPAau_FYHOwOT6g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D2Oz/tFoTbJgZ+hpQsGEbztQQnHjY/PR/LdJBtph6qw=; b=Geyuoz4AZk4rEF4PeEPKhfvoYd16/stB6XxEL27GfDtBz6tE6KVmHhapicDYIZJZFP LYd7T9RqYtlWIJhmWPHgM8w7QV8ku4ALTYKcFemaCkAcOV2UiIVPLXOeZrhk9djJWRpq 0ZPyCd9pw5T3lPxCL7FLg4bLijAUTHXOgvXvktj0jqd/TwgH7L0hD6szvFdQngh0TDhc 1kExap6rrtbdmYQV9Jsg48FAYMicQVxcalK7VvTRlOTrkedEO/kPsaM5Jp03hnk5H+cV gDtFZutRDJOg8wntyPH9gWj5MWRLoECEzzrczLdeRBlN+8WEI/IJMjlhZPQpumTHLzv1 gSsA== X-Gm-Message-State: AOAM530eeNF3tBoGzBQ2fLgIpknW69UVUIWu0LyqVQWNjU5CGtVlLea8 w+C1e0YsVyjR3s/zOxsqiW7yyi0CdgCFyrX6FZFhDI5hnd2Rr73W4EYvGTzv/e5dt3CZJkr/83c 21EDUQNAKgS4LE1c= X-Received: by 2002:adf:a396:: with SMTP id l22mr10088073wrb.24.1591891420960; Thu, 11 Jun 2020 09:03:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+92LqUlLMF4TaKWAxAo/OkPvnUh1NRTmPyoijjDW83gvwHj4TyOtFB/+bmHGpwQzZqv2JGQ== X-Received: by 2002:adf:a396:: with SMTP id l22mr10088046wrb.24.1591891420708; Thu, 11 Jun 2020 09:03:40 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 06/11] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources Date: Thu, 11 Jun 2020 18:03:01 +0200 Message-Id: <20200611160306.2751-7-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Nothing in "tpm_ppi.h" require declarations from "hw/acpi/tpm.h". Reduce dependencies and include it only in the files requiring it. Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_ppi.h | 1 - hw/tpm/tpm_ppi.c | 1 + hw/tpm/tpm_tis_isa.c | 1 + hw/tpm/tpm_tis_sysbus.c | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h index d33ef27de6..6f773c25a0 100644 --- a/hw/tpm/tpm_ppi.h +++ b/hw/tpm/tpm_ppi.h @@ -12,7 +12,6 @@ #ifndef TPM_TPM_PPI_H #define TPM_TPM_PPI_H =20 -#include "hw/acpi/tpm.h" #include "exec/address-spaces.h" =20 typedef struct TPMPPI { diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c index 6d9c1a3e40..72d7a3d926 100644 --- a/hw/tpm/tpm_ppi.c +++ b/hw/tpm/tpm_ppi.c @@ -17,6 +17,7 @@ #include "cpu.h" #include "sysemu/memory_mapping.h" #include "migration/vmstate.h" +#include "hw/acpi/tpm.h" #include "tpm_ppi.h" #include "trace.h" =20 diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 30ba37079d..42f909ff1e 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -26,6 +26,7 @@ #include "hw/isa/isa.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "hw/acpi/tpm.h" #include "tpm_util.h" #include "tpm_tis.h" =20 diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index eced1fc843..edca1dae0d 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" +#include "hw/acpi/tpm.h" #include "tpm_util.h" #include "hw/sysbus.h" #include "tpm_tis.h" --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591892017; cv=none; d=zohomail.com; s=zohoarc; b=MYKO4IcX2NJPvgWjxblqdGOkeZuxNh4eOuAlShHruDM7K/grlP8bf9bN+5u6lfVlRSeo+hJO3UrMwvQKBF1CXdLND/F7X/7iRMbX5tewjBiQYwcaItL6rFfUiKqIMdjg4CCAQwupqNyKwAdEIA57maMTaXHXTPDWwfpatK3htjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591892017; 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=Ux4aj329B1BwmC7nDJ/LNHc4D/BIeJqak7rhlE6WHSo=; b=fCeC2+DKGmJBM8K0KOtFioFYV9bkzVgHQjkjomeUDpZzvj7UaY+Yj0O74Was2t/OhSMEEmXx/0O+71QfDBs6OcQ8HRXGGivJleovjYOHCzKoHF36ZcRT+aM/s9ixoBmhJwef7b2jQF9wYSWWzF6eSy5s5rBR8CeSqknvxVrx1Q8= 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 1591892017545121.78507564548272; Thu, 11 Jun 2020 09:13:37 -0700 (PDT) Received: from localhost ([::1]:42538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPpg-0005SZ-8Q for importer@patchew.org; Thu, 11 Jun 2020 12:13:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPgj-00074c-NY for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:25 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59119 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 1jjPgg-00011c-JZ for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:21 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-54-yf2d5jhNM6KYnyi0u79FlA-1; Thu, 11 Jun 2020 12:03:47 -0400 Received: by mail-wm1-f71.google.com with SMTP id r1so1493891wmh.7 for ; Thu, 11 Jun 2020 09:03:47 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id q13sm5612598wrn.84.2020.06.11.09.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891457; 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=Ux4aj329B1BwmC7nDJ/LNHc4D/BIeJqak7rhlE6WHSo=; b=Kx2cn4CBjPK1CqpQKI9i6oBCXlwJTf1P2MTW+lh1OaKNcizEpSyyt+JsGHY1XN0nx2Y2P6 a1uzm/1crup0g6I+rpOLqa3bmPDBP6gfisxonqhrQJhYwGhWRrrBnggW8cTZ2Q3VwyDYpH jJOa+VyqMPb9ZwKFIBjA0zu52T9CziA= X-MC-Unique: yf2d5jhNM6KYnyi0u79FlA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ux4aj329B1BwmC7nDJ/LNHc4D/BIeJqak7rhlE6WHSo=; b=km1eZW9AP3IDi8ElYGc9WOh0sTuvzShAKx+tJMDAJrFQh0cbOM1CsE3OaOkPyoI5KL PXL8i7JgsHHv2CrwCGsBoR/hWvc2f2PCUgFm8Lo5AgRGLy/VbB/nvzjuokSWL5lvfyT9 qLEOYPk1C9Wb2R0YAp5UE99FcjvOq4IgspyD1hqSB7qogTskDH0CGWKi6xYuTgrPe75A TQq0Y6k/thl7AAJw0SEo61l+1pHJ4YIefVRoIHiG6CLq4F53X8jtOUM8ZaayVKIaZ5Mj HO9XWWF6Mu3znyOQxUL6wg84Z2miE500sj6oehZ8ZDYBn2NiFyxkDBYisMYoTA2lzWPd 6YaQ== X-Gm-Message-State: AOAM53027qcLROVygYoSR9xWIWtns+KL8ld+/5sBBZotV1KHJkV1ZF7L Sx4Mt/n7PcZZMBmWsgtVZFtXbGCdEAvqVIiL+aDtqRIuHHEbhZFzBjbr9CnBZF3bjeiS+S86ekt ++X1404dT3b5Mwww= X-Received: by 2002:a1c:e355:: with SMTP id a82mr8773683wmh.1.1591891425834; Thu, 11 Jun 2020 09:03:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwriCdule6rDyHlaOYJfsMRQUFtfkg7m1fkMoEufPkUS5l2qH13Kg73X86hkLtbD/7aT3zCew== X-Received: by 2002:a1c:e355:: with SMTP id a82mr8773657wmh.1.1591891425631; Thu, 11 Jun 2020 09:03:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/11] hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion Date: Thu, 11 Jun 2020 18:03:02 +0200 Message-Id: <20200611160306.2751-8-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Remove unnecessary 'tpm_int.h' header inclusion. Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_crb.c | 1 - hw/tpm/tpm_spapr.c | 1 - hw/tpm/tpm_tis_common.c | 1 - 3 files changed, 3 deletions(-) diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index cd004e7f8e..664ff70ef9 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -25,7 +25,6 @@ #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" #include "sysemu/reset.h" -#include "tpm_int.h" #include "tpm_util.h" #include "tpm_ppi.h" #include "trace.h" diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index ce65eb2e45..ab1a86ad6e 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -20,7 +20,6 @@ #include "migration/vmstate.h" =20 #include "sysemu/tpm_backend.h" -#include "tpm_int.h" #include "tpm_util.h" =20 #include "hw/ppc/spapr.h" diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 1af4bce139..94704870f6 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -33,7 +33,6 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" -#include "tpm_int.h" #include "tpm_util.h" #include "tpm_ppi.h" #include "trace.h" --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891900; cv=none; d=zohomail.com; s=zohoarc; b=aCAhnL70HxDC6GScBnYSTLLOamNTXhxu735bhzuBCBi5zTUe4Gpm0j5R4jMxDUSI+LymHEhK3hNub50yXKzUMNKIqwEzZu5IIl+PkzjkTp3kZXMfrkrnqOupX8Zk7SElATRr8DEFVV7YniZZvPqe+buFxQKpaq/CS2U7P3N2SjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891900; 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=xQSuJDxId+eIi5LOLR+uHKFmqgbML9RlTNVSEbvu1dk=; b=cptw3cQ6C4oFtcDk5Hs8ejDOi2qP7eTeaKbr9HiMs0Tke+OZUR+bjKFvdpC8KbFJbtsPdreKgwsY10J+k4YQHyMxs/YWtzyMlo6iA+iDf6WqRhVafcPARMxl+Mq756MMQV27mw8jPNMGzaSln8A1FJk6OUimj/8kKalDf9zO2iE= 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 1591891900360293.10744076839615; Thu, 11 Jun 2020 09:11:40 -0700 (PDT) Received: from localhost ([::1]:33762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPnm-0000Vr-SN for importer@patchew.org; Thu, 11 Jun 2020 12:11:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPgV-0006iz-Sh for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:07 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:47966 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 1jjPgU-0000wP-5I for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:07 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-189-6zSOUtSEOyqosN2OTi2xtA-1; Thu, 11 Jun 2020 12:03:52 -0400 Received: by mail-wm1-f71.google.com with SMTP id 11so1225778wmj.6 for ; Thu, 11 Jun 2020 09:03:51 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id k21sm5913606wrd.24.2020.06.11.09.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891445; 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=xQSuJDxId+eIi5LOLR+uHKFmqgbML9RlTNVSEbvu1dk=; b=bi3MJvwF2Yz35nJIFDDLlMsCY348HHiflPLc/zJ7HlbNVZI42Hrosp6z5qsqSoSchDvdzg lxkJIs+ltgfG81EBYUN1yY36D/HzfGnXTcoZRENtYpgyCux5gaMv4blpQo6Kgp8hCDK1zp D6iPHkrV0Dq5UBG5HmJKYJhzCLe6W/o= X-MC-Unique: 6zSOUtSEOyqosN2OTi2xtA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xQSuJDxId+eIi5LOLR+uHKFmqgbML9RlTNVSEbvu1dk=; b=rXNTcWZNGIFLHZ3KoSCEQNweG2hQFJx69G4EApBKEh/9hN/Y+HUw0rDPjHhLp/9+yu pnOzAt23CJ+ZEkWOkFIPifEbF7Bk5SlLf3squ1k/9H+ltitzYEe1WKwBNx8rjDUv7ewk qbDc14ZOMj7RQRlAFCPB2xb8su7uZrmabOx+q2uLGtvrr/YuwRbkHh5Zn32gBECEQXm7 nSDll0opWoAIyarnjsVNnBNTy6yxliiFlJOXsgKgBN8BVfD8TStSEieJ7Myn6XZv/zB0 do6/1pkHWZcc1NI6fmNP8tBjOaaweTWTRYVzbTcJjlTMGE2JljQYCs6svtQOwUaOGcts JYrg== X-Gm-Message-State: AOAM530rqVo65VVkoT1mH2XuWZpuAEajKp+9gd/D6pcYaC+7bi9Y59/h PugSdw/bjo1H0Q0BYFRTTuyp3bXtjVhhfWRQ93mFcZQHMi3+rAwDfbIUc8IKk2yBMUPKf1Y48kT q0KZ9mitTDl2jg3Q= X-Received: by 2002:a5d:4446:: with SMTP id x6mr9906069wrr.119.1591891430739; Thu, 11 Jun 2020 09:03:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvPnc0zlH5xdZMbH/e4XltSwwnYw3bBzPbd6sDfqW8DUaJqaLs0pcq5i1BBOIcCVx8eEOXvw== X-Received: by 2002:a5d:4446:: with SMTP id x6mr9906047wrr.119.1591891430578; Thu, 11 Jun 2020 09:03:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 08/11] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h' Date: Thu, 11 Jun 2020 18:03:03 +0200 Message-Id: <20200611160306.2751-9-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.81; envelope-from=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We are going to make "tpm_util.h" publicly accessible by moving it to the include/ directory in a pair of commits. Keep declarations internals to hw/tpm/ in "tpm_int.h". Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_int.h | 11 +++++++++++ hw/tpm/tpm_util.h | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/tpm/tpm_int.h b/hw/tpm/tpm_int.h index fd5ebc6489..9f72879d89 100644 --- a/hw/tpm/tpm_int.h +++ b/hw/tpm/tpm_int.h @@ -13,6 +13,7 @@ #define TPM_TPM_INT_H =20 #include "qemu/option.h" +#include "sysemu/tpm.h" =20 #define TPM_STANDARD_CMDLINE_OPTS \ { \ @@ -74,4 +75,14 @@ struct tpm_resp_hdr { #define TPM_RC_FAILURE 0x101 #define TPM_RC_LOCALITY 0x907 =20 +int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version, + size_t *buffersize); + +typedef struct TPMSizedBuffer { + uint32_t size; + uint8_t *buffer; +} TPMSizedBuffer; + +void tpm_sized_buffer_reset(TPMSizedBuffer *tsb); + #endif /* TPM_TPM_INT_H */ diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h index 7889081fba..d524935576 100644 --- a/hw/tpm/tpm_util.h +++ b/hw/tpm/tpm_util.h @@ -66,19 +66,9 @@ static inline void tpm_cmd_set_error(void *b, uint32_t e= rror) stl_be_p(b + 6, error); } =20 -int tpm_util_get_buffer_size(int tpm_fd, TPMVersion tpm_version, - size_t *buffersize); - #define DEFINE_PROP_TPMBE(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *) =20 -typedef struct TPMSizedBuffer { - uint32_t size; - uint8_t *buffer; -} TPMSizedBuffer; - -void tpm_sized_buffer_reset(TPMSizedBuffer *tsb); - void tpm_util_show_buffer(const unsigned char *buffer, size_t buffer_size, const char *string); =20 --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891952; cv=none; d=zohomail.com; s=zohoarc; b=eoeFwUDQx2KOzavmNUcfn9iUT1shBv6a05umUUN4ES9XtotDJ0bVmC65813N2V+A/d8w+rrEt9g5+vN/HZK+t2KJNAG/xFH7DyvN6MF9sY2uG1ABZ00DpARrMBh06c6R3kHtcXJZaCU+DvAxllKnUHl878ngzBEdl2t00R+4yjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891952; 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=OEBGBSENtvQqVBtd9DaoSVHe6pzGLtI0FdTlX7YOxdE=; b=JjSWqQqpcU8YUr0i2Q2V06rERz8IBFSyf/gCWO3sw2ejQ1qManIs5MCgL3ZpqrBwaG1HCG5qSBYupo5Q1gTy1lUisvHtQIGelevxhX4XfYnWkKH2BieneeNav6gj8FyAMGUhxKwyro9Dw7d75+ddtyz/OcnIOqvnJjvrCIHUGlM= 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 1591891952111598.4579765082411; Thu, 11 Jun 2020 09:12:32 -0700 (PDT) Received: from localhost ([::1]:36774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPoc-0002Xv-QE for importer@patchew.org; Thu, 11 Jun 2020 12:12:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPh2-0007HM-K5 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:40 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:43537 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 1jjPgv-00015U-H7 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:36 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-426-bIFoiYKlM_m4d-pGUhqaBQ-1; Thu, 11 Jun 2020 12:04:00 -0400 Received: by mail-wr1-f72.google.com with SMTP id t5so2712736wro.20 for ; Thu, 11 Jun 2020 09:03:59 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id z206sm4990080wmg.30.2020.06.11.09.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891472; 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=OEBGBSENtvQqVBtd9DaoSVHe6pzGLtI0FdTlX7YOxdE=; b=M1D5l6cKFrgGNWzeQOfq3Ctm34NLrAi/76kjhUV2A2R+AHKxN+Q20SjGkIBR1IJKl/slqw BVVIyQUKMQ89zd5rCmx/CjOy8r+CgthGQeQEDShD18j4CO39qWElvWeK7lko6WXqJTYqY1 JC32hCjCw9DiToL3dpcAVXQCdNYL3MU= X-MC-Unique: bIFoiYKlM_m4d-pGUhqaBQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OEBGBSENtvQqVBtd9DaoSVHe6pzGLtI0FdTlX7YOxdE=; b=dsrU2hawzG3HQpQ15xXYmqlbzbQPRNgkPhnJPeW0v1+i+LlLPHLrKkaQf367n7iTKp SC2NoySginkrtixBMwvlpxKRuIcSwFQpXjz2RyNEm4VefamG/EOXoOAlXIp9Rcy7R13F 3neGLLKJBaPJb5I8EgC5bv1PTDz7ugd/vDn4M/EjAztIIWJ99YQIYO1mbw/dkefY2yoa 4ynYQkLaWpZ2CvihhiZnSgUVapZV/RG94Ta9z4p2cYAFF6NRWt5srSJyjspkMX9IaQTT 4wR0cu+s9oWRyp1ZBo+bnPs18BiDHncoFBw1h2EjiXIEksEsEoDYUKCZKjb3y25WuhdB 35sQ== X-Gm-Message-State: AOAM53283Fnr9Oe0D+zu3KM8YOuvNjn5TQ/GJgMXkORcPBfZi0wf6sM6 M7FMHquNP/gbOLY6D+6NuLKnx3H3vKs8fDttveifRT57Qv++k9evq6hDkhfuOY2FmemSQClHC/M e37FI5Mp7+dSGm9w= X-Received: by 2002:a1c:e40a:: with SMTP id b10mr8578133wmh.41.1591891435611; Thu, 11 Jun 2020 09:03:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynp5Vfe+J/amzkiVBC5jheUTPpLuFTgZf1g1u8LUmc6MfUXOw/4NlKcngL6hJoiQq1LEEPcA== X-Received: by 2002:a1c:e40a:: with SMTP id b10mr8578112wmh.41.1591891435343; Thu, 11 Jun 2020 09:03:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/11] hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header Date: Thu, 11 Jun 2020 18:03:04 +0200 Message-Id: <20200611160306.2751-10-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We are going to make "tpm_util.h" publicly accessible by moving it to the include/ directory in the next commit. The DEFINE_PROP_TPMBE() macro is only meaningful for the TPM hardware files (in hw/tpm/), so keep this macro in a local header. Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/tpm/tpm_prop.h | 31 +++++++++++++++++++++++++++++++ hw/tpm/tpm_util.h | 3 --- hw/tpm/tpm_crb.c | 1 + hw/tpm/tpm_spapr.c | 1 + hw/tpm/tpm_tis_isa.c | 2 +- hw/tpm/tpm_tis_sysbus.c | 2 +- 6 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 hw/tpm/tpm_prop.h diff --git a/hw/tpm/tpm_prop.h b/hw/tpm/tpm_prop.h new file mode 100644 index 0000000000..85e1ae5718 --- /dev/null +++ b/hw/tpm/tpm_prop.h @@ -0,0 +1,31 @@ +/* + * TPM utility functions + * + * Copyright (c) 2010 - 2015 IBM Corporation + * Authors: + * Stefan Berger + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, see + */ + +#ifndef HW_TPM_PROP_H +#define HW_TPM_PROP_H + +#include "sysemu/tpm_backend.h" +#include "hw/qdev-properties.h" + +#define DEFINE_PROP_TPMBE(_n, _s, _f) \ + DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *) + +#endif /* HW_TPM_PROP_H */ diff --git a/hw/tpm/tpm_util.h b/hw/tpm/tpm_util.h index d524935576..cf61d830d7 100644 --- a/hw/tpm/tpm_util.h +++ b/hw/tpm/tpm_util.h @@ -66,9 +66,6 @@ static inline void tpm_cmd_set_error(void *b, uint32_t er= ror) stl_be_p(b + 6, error); } =20 -#define DEFINE_PROP_TPMBE(_n, _s, _f) \ - DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *) - void tpm_util_show_buffer(const unsigned char *buffer, size_t buffer_size, const char *string); =20 diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 664ff70ef9..1cac4d671d 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -25,6 +25,7 @@ #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" #include "sysemu/reset.h" +#include "tpm_prop.h" #include "tpm_util.h" #include "tpm_ppi.h" #include "trace.h" diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index ab1a86ad6e..65672048c7 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -21,6 +21,7 @@ =20 #include "sysemu/tpm_backend.h" #include "tpm_util.h" +#include "tpm_prop.h" =20 #include "hw/ppc/spapr.h" #include "hw/ppc/spapr_vio.h" diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c index 42f909ff1e..5faf6231c0 100644 --- a/hw/tpm/tpm_tis_isa.c +++ b/hw/tpm/tpm_tis_isa.c @@ -27,7 +27,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" -#include "tpm_util.h" +#include "tpm_prop.h" #include "tpm_tis.h" =20 typedef struct TPMStateISA { diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c index edca1dae0d..4a3bc70625 100644 --- a/hw/tpm/tpm_tis_sysbus.c +++ b/hw/tpm/tpm_tis_sysbus.c @@ -26,7 +26,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "hw/acpi/tpm.h" -#include "tpm_util.h" +#include "tpm_prop.h" #include "hw/sysbus.h" #include "tpm_tis.h" =20 --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891912; cv=none; d=zohomail.com; s=zohoarc; b=KAx4qWlVFTaF8Oqrrh/pgb1e1Yi9xL3whay+FP8HFW2VkpCquo28B/1LY+KrdL7CK6KYcrHjTPRdX4nU8aTsUNeEihRvM2c2Oi0+P4QLn05S3piiCW61ZWelZo7XKcdGay1k83U1WrUBUyzQ6ZPxK6dGji0ntEriARel95tMJUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891912; 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=LEzGP/ZApkAb2DZHP89viWXOV6fIUAQzfhGOYXXmOvs=; b=NV7qHjcTNEo6wRNa/BzKoXxIOCC1AABsdL/IJdMQ67pqo8HLgtGhC18JlwUprqHypWkkfuPvi0CbHzW7XlWRf7zTfoGG1uDiZ9bm+WfKKSoONLD2RNDfAEcVQCwgq9ladmv+GQro31hWiZWB78ifRvuJ3v3c5J/nAYF6bFj5C98= 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 1591891912266950.6189190856263; Thu, 11 Jun 2020 09:11:52 -0700 (PDT) Received: from localhost ([::1]:34022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPnx-0000eg-Sm for importer@patchew.org; Thu, 11 Jun 2020 12:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPgY-0006mC-Re for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:10 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:46195 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 1jjPgU-0000wU-Dx for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:09 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-rp4wuXG2MqWrubnld8rDUg-1; Thu, 11 Jun 2020 12:04:02 -0400 Received: by mail-wr1-f69.google.com with SMTP id c14so2717952wrm.15 for ; Thu, 11 Jun 2020 09:04:02 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id r12sm5903519wrc.22.2020.06.11.09.03.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891445; 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=LEzGP/ZApkAb2DZHP89viWXOV6fIUAQzfhGOYXXmOvs=; b=He4oEeTzc7yadVk8pvw6nhBi+a8N4OSYNceixEOvzyeSoErFk7bkEtWbLBZR3SYN2eEYJT ubpMPT7kNhYfKPk0ESzALoWpD57WDfe4OarQ8P/um9YaGlg3DmE74Y/SzaUvmIFoy6Op/K 5vVaGKPBAm06VSMZaU4VACKtJ0Ngqt0= X-MC-Unique: rp4wuXG2MqWrubnld8rDUg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LEzGP/ZApkAb2DZHP89viWXOV6fIUAQzfhGOYXXmOvs=; b=oYOPM1MGHysQrpWyM1SuJ1y+udDxZoABLxdnINNCqDesXyKQ94jIgrzpJJn8WyHaQ+ 8/6oUpRr1TSvE7fveX+V1bywYo6WqSba1IaYsVXcKNGnNaW01WU9GJGLHYsDJ4EwiVBb iB/ZgPazi4qm/pdeiZ2OAYx+cAOfvBBFDxXpsddlD15xfQDcT2zWMUKlP94T4Ug++XdB tvYDsV6HoU+cX6hZWLS9KdXHf1pwKLVg06GjkR8P9kfGfU3GZSiJ9hstsmtVUdfubqEG isZyBX4p5hxtmoQzBM3Q1nyaJjco5Zrbdybwz+AoQbtsbqDYA85CJHTE4rg31LscutPU xT8g== X-Gm-Message-State: AOAM5313Y6qCxqWlpuXd1cSQY3eazDCec/ijtOEf3QXV44m/8b580joa KHSguWpc+2PTtD9sYMlQxn2GJIRID2Aisp1bmp5Kid8E0xjLC2hvEimb+mMNaN4uWG55plBlJvX kSbMy7l6rU9hGfGE= X-Received: by 2002:adf:e592:: with SMTP id l18mr10885064wrm.175.1591891440570; Thu, 11 Jun 2020 09:04:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzr6hsSerWY3PPXj2dXIsrjsSKE/2HnUUReffRoeH4BpmSH+d6lxlEDiR1+vJ9Bv/TEyvV7qw== X-Received: by 2002:adf:e592:: with SMTP id l18mr10885029wrm.175.1591891440324; Thu, 11 Jun 2020 09:04:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 10/11] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h" Date: Thu, 11 Jun 2020 18:03:05 +0200 Message-Id: <20200611160306.2751-11-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.81; envelope-from=philmd@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 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We are going to split the TPM backends from the TPM emulated hardware in the next commit. Make the TPM util helpers accessible by moving local "tpm_util.h" to global "sysemu/tpm_util.h". Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- docs/specs/tpm.rst | 4 ++-- {hw/tpm =3D> include/sysemu}/tpm_util.h | 6 +++--- hw/tpm/tpm_crb.c | 2 +- hw/tpm/tpm_emulator.c | 2 +- hw/tpm/tpm_passthrough.c | 2 +- hw/tpm/tpm_spapr.c | 2 +- hw/tpm/tpm_tis_common.c | 2 +- hw/tpm/tpm_util.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename {hw/tpm =3D> include/sysemu}/tpm_util.h (95%) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 9e48e3b981..0200fdac68 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -234,7 +234,7 @@ PCRs. QEMU files related to the TPM passthrough device: - ``hw/tpm/tpm_passthrough.c`` - ``hw/tpm/tpm_util.c`` - - ``hw/tpm/tpm_util.h`` + - ``include/sysemu/tpm_util.h`` =20 =20 Command line to start QEMU with the TPM passthrough device using the host's @@ -294,7 +294,7 @@ command. QEMU files related to the TPM emulator device: - ``hw/tpm/tpm_emulator.c`` - ``hw/tpm/tpm_util.c`` - - ``hw/tpm/tpm_util.h`` + - ``include/sysemu/tpm_util.h`` =20 The following commands start the swtpm with a UnixIO control channel over a socket interface. They do not need to be run as root. diff --git a/hw/tpm/tpm_util.h b/include/sysemu/tpm_util.h similarity index 95% rename from hw/tpm/tpm_util.h rename to include/sysemu/tpm_util.h index cf61d830d7..63e872c3b2 100644 --- a/hw/tpm/tpm_util.h +++ b/include/sysemu/tpm_util.h @@ -19,8 +19,8 @@ * License along with this library; if not, see */ =20 -#ifndef TPM_TPM_UTIL_H -#define TPM_TPM_UTIL_H +#ifndef SYSEMU_TPM_UTIL_H +#define SYSEMU_TPM_UTIL_H =20 #include "sysemu/tpm.h" #include "qemu/bswap.h" @@ -69,4 +69,4 @@ static inline void tpm_cmd_set_error(void *b, uint32_t er= ror) void tpm_util_show_buffer(const unsigned char *buffer, size_t buffer_size, const char *string); =20 -#endif /* TPM_TPM_UTIL_H */ +#endif /* SYSEMU_TPM_UTIL_H */ diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 1cac4d671d..60247295d4 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -24,9 +24,9 @@ #include "hw/acpi/tpm.h" #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" +#include "sysemu/tpm_util.h" #include "sysemu/reset.h" #include "tpm_prop.h" -#include "tpm_util.h" #include "tpm_ppi.h" #include "trace.h" =20 diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 3a0fc442f3..9605339f93 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -32,8 +32,8 @@ #include "qemu/sockets.h" #include "io/channel-socket.h" #include "sysemu/tpm_backend.h" +#include "sysemu/tpm_util.h" #include "tpm_int.h" -#include "tpm_util.h" #include "tpm_ioctl.h" #include "migration/blocker.h" #include "migration/vmstate.h" diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index f67244b5d4..7403807ec4 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -28,10 +28,10 @@ #include "qemu/module.h" #include "qemu/sockets.h" #include "sysemu/tpm_backend.h" +#include "sysemu/tpm_util.h" #include "tpm_int.h" #include "qapi/clone-visitor.h" #include "qapi/qapi-visit-tpm.h" -#include "tpm_util.h" #include "trace.h" =20 #define TYPE_TPM_PASSTHROUGH "tpm-passthrough" diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c index 65672048c7..cb4dfd1e6a 100644 --- a/hw/tpm/tpm_spapr.c +++ b/hw/tpm/tpm_spapr.c @@ -20,7 +20,7 @@ #include "migration/vmstate.h" =20 #include "sysemu/tpm_backend.h" -#include "tpm_util.h" +#include "sysemu/tpm_util.h" #include "tpm_prop.h" =20 #include "hw/ppc/spapr.h" diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 94704870f6..64206a6a3b 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -33,7 +33,7 @@ #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "sysemu/tpm_backend.h" -#include "tpm_util.h" +#include "sysemu/tpm_util.h" #include "tpm_ppi.h" #include "trace.h" =20 diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c index c0a0f3d71f..d0ec2a8235 100644 --- a/hw/tpm/tpm_util.c +++ b/hw/tpm/tpm_util.c @@ -23,11 +23,11 @@ #include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/visitor.h" -#include "tpm_util.h" #include "tpm_int.h" #include "exec/memory.h" #include "hw/qdev-properties.h" #include "sysemu/tpm_backend.h" +#include "sysemu/tpm_util.h" #include "trace.h" =20 /* tpm backend property */ --=20 2.21.3 From nobody Sun May 19 11:31:03 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=1591891796; cv=none; d=zohomail.com; s=zohoarc; b=K3zgIF0e6IE+t7bC6y2uaNwSUUueoMa3LU3ksQqdvMmA8UFr57a09802nVM7fGAERcQ5e29rqrcmgb8HUQcIMrR5q5Vq9U9UjqgWE9zWhtCqMmedfoZGZvpTPf+WljZdV3U2RCMzNF6OcYtzXF88nPO9dkig28S/Ww1ZzraxNEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591891796; 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=eLAIpONFmuURJ2a8+fI4ccntho8lii5mlz20iz2XpIQ=; b=VGwapJainvdyPmh5ehnD7d4Ih2L8fJkntqVrEMqCQZgiP5BYNpGyUSbW1WpegruE0sr+x3NC8El9TWpjy35um6214VLjSNhYXroZ3NxB4MjQ7aSqvYEVVMykydGO3WWPBF7qJoaONbmzPqxShIpgqNRJGUxTH26Vrjx0X82Ydk0= 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 1591891796633640.9475093162704; Thu, 11 Jun 2020 09:09:56 -0700 (PDT) Received: from localhost ([::1]:56602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjPm7-0005pJ-97 for importer@patchew.org; Thu, 11 Jun 2020 12:09:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjPgb-0006ri-La for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27566 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 1jjPgY-0000xj-U4 for qemu-devel@nongnu.org; Thu, 11 Jun 2020 12:04:13 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-511-D2OFnfXEMWKcwsJuWl93ew-1; Thu, 11 Jun 2020 12:04:07 -0400 Received: by mail-wr1-f72.google.com with SMTP id w4so2731147wrl.13 for ; Thu, 11 Jun 2020 09:04:07 -0700 (PDT) Received: from x1w.redhat.com (181.red-88-10-103.dynamicip.rima-tde.net. [88.10.103.181]) by smtp.gmail.com with ESMTPSA id a126sm4679245wme.28.2020.06.11.09.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 09:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591891450; 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=eLAIpONFmuURJ2a8+fI4ccntho8lii5mlz20iz2XpIQ=; b=gDh+gsAg+NGPpkQLZam47Pj7DSsJ1W3wA6vCoiDYaBn0KNHseL4L6Ayywo+V7l5WSXj/o0 mD2Ff/hLIG9xSOGt39xtu4NRvZ/0C3wuM7So2uAa7Ol3xKUnVy3Fkf5MVr6VObkEbCUnYf lCdDuzqH5bzpwdjnoq7HP3J/Kn/wbzQ= X-MC-Unique: D2OFnfXEMWKcwsJuWl93ew-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eLAIpONFmuURJ2a8+fI4ccntho8lii5mlz20iz2XpIQ=; b=KQslcXmmHgZ4jMY//uowVLHZ1+9OiW3ktFAmrDFVjCRhsfipLGovLHl+98bbLogm2o 5re6IDNHAOFxrZniQw9VLVk+sHYiZuhfPqYeJm2iofYFAOfw6HiVr2lgSGyx6Y2pGPW9 tM6ZBS7oIjtu5nLKoOQdWcXGu+QWGRCF5hTKuUksjPs5Od5JqUQiLptDl5q89Id5Vywc /LS2pS5/N8qOTUtnYT8IbVGDYkDYkuWxh13Bp+AIwQerHOb1PYwjOdNEbt2EiLIdElly 2Xt+PSgaocoVm2vvYJcSLp5Oivp9TK+eDCXSHAEJPvccLD3Vbh5FJ1N++ytAUimAPCLp +8Bw== X-Gm-Message-State: AOAM531dnGGYIO1sIG9MRkJ7NXKJ7iv2G8/d8rwRBJ5E3f1IWMlqFKFU AYsBpxTxZn3qOZGpCuSAnHpa4JC9huVqyYfmHVuA14yLC5R6Um77m5T+3u8qhTiwsR0Vca3GugV rjDThcSvIgzyfFKA= X-Received: by 2002:adf:d84c:: with SMTP id k12mr10231421wrl.265.1591891445674; Thu, 11 Jun 2020 09:04:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwGm0vMXJiGZl/y6aKAFBwtwhc++6Lq7sKDghD9yJhROCC+x1nmiXkxNHOklU2zOeqY9UYs5g== X-Received: by 2002:adf:d84c:: with SMTP id k12mr10231378wrl.265.1591891445319; Thu, 11 Jun 2020 09:04:05 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 11/11] tpm: Move backend code under the 'backends/' directory Date: Thu, 11 Jun 2020 18:03:06 +0200 Message-Id: <20200611160306.2751-12-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200611160306.2751-1-philmd@redhat.com> References: <20200611160306.2751-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; 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=207.211.31.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 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: Laurent Vivier , Thomas Huth , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) TPM subsytem is split into backends (see commit f4ede81eed2) and frontends (see i.e. 3676bc69b35). Keep the emulated hardware 'frontends' under hw/tpm/, but move the backends in the backends/tpm/ directory. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC due to a FIXME in tpm_tis_common.c, it uses TRACE_TPM_UTIL_SHOW_BUFFER which is now generated by backends/tpm/trace-events... docs/specs/tpm.rst | 8 +++--- Makefile | 2 +- Makefile.objs | 1 + {hw =3D> backends}/tpm/tpm_int.h | 6 ++--- {hw =3D> backends}/tpm/tpm_ioctl.h | 0 {hw =3D> backends}/tpm/tpm_emulator.c | 0 {hw =3D> backends}/tpm/tpm_passthrough.c | 0 {hw =3D> backends}/tpm/tpm_util.c | 0 hw/tpm/tpm_tis_common.c | 1 + tests/qtest/tpm-emu.c | 2 +- backends/Kconfig | 1 + backends/tpm/Kconfig | 14 +++++++++++ backends/tpm/Makefile.objs | 3 +++ backends/tpm/trace-events | 33 +++++++++++++++++++++++++ hw/tpm/Kconfig | 15 ------------ hw/tpm/Makefile.objs | 3 --- hw/tpm/trace-events | 34 +------------------------- 17 files changed, 63 insertions(+), 60 deletions(-) rename {hw =3D> backends}/tpm/tpm_int.h (96%) rename {hw =3D> backends}/tpm/tpm_ioctl.h (100%) rename {hw =3D> backends}/tpm/tpm_emulator.c (100%) rename {hw =3D> backends}/tpm/tpm_passthrough.c (100%) rename {hw =3D> backends}/tpm/tpm_util.c (100%) create mode 100644 backends/Kconfig create mode 100644 backends/tpm/Kconfig create mode 100644 backends/tpm/trace-events diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 0200fdac68..ed6c0d785d 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -232,8 +232,8 @@ Integrity Measurement Architecture (IMA), are not expec= ting to share PCRs. =20 QEMU files related to the TPM passthrough device: - - ``hw/tpm/tpm_passthrough.c`` - - ``hw/tpm/tpm_util.c`` + - ``backends/tpm/tpm_passthrough.c`` + - ``backends/tpm/tpm_util.c`` - ``include/sysemu/tpm_util.h`` =20 =20 @@ -292,8 +292,8 @@ instrumented to initialize a TPM 1.2 or TPM 2 device us= ing this command. =20 QEMU files related to the TPM emulator device: - - ``hw/tpm/tpm_emulator.c`` - - ``hw/tpm/tpm_util.c`` + - ``backends/tpm/tpm_emulator.c`` + - ``backends/tpm/tpm_util.c`` - ``include/sysemu/tpm_util.h`` =20 The following commands start the swtpm with a UnixIO control channel over diff --git a/Makefile b/Makefile index d1af126ea1..0ab6e12dd6 100644 --- a/Makefile +++ b/Makefile @@ -418,7 +418,7 @@ MINIKCONF_ARGS =3D \ CONFIG_LINUX=3D$(CONFIG_LINUX) \ CONFIG_PVRDMA=3D$(CONFIG_PVRDMA) =20 -MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig +MINIKCONF_INPUTS =3D $(SRC_PATH)/Kconfig.host $(SRC_PATH)/backends/Kconfig= $(SRC_PATH)/hw/Kconfig MINIKCONF_DEPS =3D $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig) MINIKCONF =3D $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \ =20 diff --git a/Makefile.objs b/Makefile.objs index 99774cfd25..84fc651f53 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -125,6 +125,7 @@ trace-events-subdirs =3D trace-events-subdirs +=3D accel/kvm trace-events-subdirs +=3D accel/tcg trace-events-subdirs +=3D backends +trace-events-subdirs +=3D backends/tpm trace-events-subdirs +=3D crypto trace-events-subdirs +=3D monitor ifeq ($(CONFIG_USER_ONLY),y) diff --git a/hw/tpm/tpm_int.h b/backends/tpm/tpm_int.h similarity index 96% rename from hw/tpm/tpm_int.h rename to backends/tpm/tpm_int.h index 9f72879d89..ba6109306e 100644 --- a/hw/tpm/tpm_int.h +++ b/backends/tpm/tpm_int.h @@ -9,8 +9,8 @@ * This work is licensed under the terms of the GNU GPL, version 2 or late= r. * See the COPYING file in the top-level directory. */ -#ifndef TPM_TPM_INT_H -#define TPM_TPM_INT_H +#ifndef BACKENDS_TPM_INT_H +#define BACKENDS_TPM_INT_H =20 #include "qemu/option.h" #include "sysemu/tpm.h" @@ -85,4 +85,4 @@ typedef struct TPMSizedBuffer { =20 void tpm_sized_buffer_reset(TPMSizedBuffer *tsb); =20 -#endif /* TPM_TPM_INT_H */ +#endif /* BACKENDS_TPM_INT_H */ diff --git a/hw/tpm/tpm_ioctl.h b/backends/tpm/tpm_ioctl.h similarity index 100% rename from hw/tpm/tpm_ioctl.h rename to backends/tpm/tpm_ioctl.h diff --git a/hw/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c similarity index 100% rename from hw/tpm/tpm_emulator.c rename to backends/tpm/tpm_emulator.c diff --git a/hw/tpm/tpm_passthrough.c b/backends/tpm/tpm_passthrough.c similarity index 100% rename from hw/tpm/tpm_passthrough.c rename to backends/tpm/tpm_passthrough.c diff --git a/hw/tpm/tpm_util.c b/backends/tpm/tpm_util.c similarity index 100% rename from hw/tpm/tpm_util.c rename to backends/tpm/tpm_util.c diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c index 64206a6a3b..4093b5f246 100644 --- a/hw/tpm/tpm_tis_common.c +++ b/hw/tpm/tpm_tis_common.c @@ -36,6 +36,7 @@ #include "sysemu/tpm_util.h" #include "tpm_ppi.h" #include "trace.h" +#include "../backends/tpm/trace.h" /* FIXME TRACE_TPM_UTIL_SHOW_BUFFER */ =20 #include "tpm_tis.h" =20 diff --git a/tests/qtest/tpm-emu.c b/tests/qtest/tpm-emu.c index c43ac4aef8..337647846f 100644 --- a/tests/qtest/tpm-emu.c +++ b/tests/qtest/tpm-emu.c @@ -13,7 +13,7 @@ #include "qemu/osdep.h" #include =20 -#include "hw/tpm/tpm_ioctl.h" +#include "backends/tpm/tpm_ioctl.h" #include "io/channel-socket.h" #include "qapi/error.h" #include "tpm-emu.h" diff --git a/backends/Kconfig b/backends/Kconfig new file mode 100644 index 0000000000..f35abc1609 --- /dev/null +++ b/backends/Kconfig @@ -0,0 +1 @@ +source tpm/Kconfig diff --git a/backends/tpm/Kconfig b/backends/tpm/Kconfig new file mode 100644 index 0000000000..5d91eb89c2 --- /dev/null +++ b/backends/tpm/Kconfig @@ -0,0 +1,14 @@ +config TPM_BACKEND + bool + depends on TPM + +config TPM_PASSTHROUGH + bool + default y + # FIXME: should check for x86 host as well + depends on TPM_BACKEND && LINUX + +config TPM_EMULATOR + bool + default y + depends on TPM_BACKEND diff --git a/backends/tpm/Makefile.objs b/backends/tpm/Makefile.objs index 8cf5772824..db2731f634 100644 --- a/backends/tpm/Makefile.objs +++ b/backends/tpm/Makefile.objs @@ -1 +1,4 @@ common-obj-y +=3D tpm_backend.o +common-obj-y +=3D tpm_util.o +common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o +common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o diff --git a/backends/tpm/trace-events b/backends/tpm/trace-events new file mode 100644 index 0000000000..0a2591fb2d --- /dev/null +++ b/backends/tpm/trace-events @@ -0,0 +1,33 @@ +# See docs/devel/tracing.txt for syntax documentation. + +# tpm_passthrough.c +tpm_passthrough_handle_request(void *cmd) "processing command %p" +tpm_passthrough_reset(void) "reset" + +# tpm_util.c +tpm_util_get_buffer_size_hdr_len(uint32_t len, size_t expected) "tpm_resp-= >hdr.len =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_len(uint32_t len, size_t expected) "tpm_resp->len= =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_res= p->hdr.len =3D %u, expected =3D %zu" +tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp->l= en =3D %u, expected =3D %zu" +tpm_util_get_buffer_size(size_t len) "buffersize of device: %zu" +tpm_util_show_buffer(const char *direction, size_t len, const char *buf) "= direction: %s len: %zu\n%s" + +# tpm_emulator.c +tpm_emulator_set_locality(uint8_t locty) "setting locality to %d" +tpm_emulator_handle_request(void) "processing TPM command" +tpm_emulator_probe_caps(uint64_t caps) "capabilities: 0x%"PRIx64 +tpm_emulator_set_buffer_size(uint32_t buffersize, uint32_t minsize, uint32= _t maxsize) "buffer size: %u, min: %u, max: %u" +tpm_emulator_startup_tpm_resume(bool is_resume, size_t buffersize) "is_res= ume: %d, buffer size: %zu" +tpm_emulator_get_tpm_established_flag(uint8_t flag) "got established flag:= %d" +tpm_emulator_cancel_cmd_not_supt(void) "Backend does not support CANCEL_TP= M_CMD" +tpm_emulator_handle_device_opts_tpm12(void) "TPM Version 1.2" +tpm_emulator_handle_device_opts_tpm2(void) "TPM Version 2" +tpm_emulator_handle_device_opts_unspec(void) "TPM Version Unspecified" +tpm_emulator_handle_device_opts_startup_error(void) "Startup error" +tpm_emulator_get_state_blob(uint8_t type, uint32_t size, uint32_t flags) "= got state blob type %d, %u bytes, flags 0x%08x" +tpm_emulator_set_state_blob(uint8_t type, uint32_t size, uint32_t flags) "= set state blob type %d, %u bytes, flags 0x%08x" +tpm_emulator_set_state_blobs(void) "setting state blobs" +tpm_emulator_set_state_blobs_error(const char *msg) "error while setting s= tate blobs: %s" +tpm_emulator_set_state_blobs_done(void) "Done setting state blobs" +tpm_emulator_pre_save(void) "" +tpm_emulator_inst_init(void) "" diff --git a/hw/tpm/Kconfig b/hw/tpm/Kconfig index 5028fd8880..29e82f3c92 100644 --- a/hw/tpm/Kconfig +++ b/hw/tpm/Kconfig @@ -1,7 +1,3 @@ -config TPM_BACKEND - bool - depends on TPM - config TPM_TIS_ISA bool depends on TPM && ISA_BUS @@ -22,17 +18,6 @@ config TPM_CRB depends on TPM && PC select TPM_BACKEND =20 -config TPM_PASSTHROUGH - bool - default y - # FIXME: should check for x86 host as well - depends on TPM_BACKEND && LINUX - -config TPM_EMULATOR - bool - default y - depends on TPM_BACKEND - config TPM_SPAPR bool default y diff --git a/hw/tpm/Makefile.objs b/hw/tpm/Makefile.objs index f1ec4beb95..6fc05be67c 100644 --- a/hw/tpm/Makefile.objs +++ b/hw/tpm/Makefile.objs @@ -1,9 +1,6 @@ -common-obj-$(CONFIG_TPM) +=3D tpm_util.o obj-$(call lor,$(CONFIG_TPM_TIS),$(CONFIG_TPM_CRB)) +=3D tpm_ppi.o common-obj-$(CONFIG_TPM_TIS_ISA) +=3D tpm_tis_isa.o common-obj-$(CONFIG_TPM_TIS_SYSBUS) +=3D tpm_tis_sysbus.o common-obj-$(CONFIG_TPM_TIS) +=3D tpm_tis_common.o common-obj-$(CONFIG_TPM_CRB) +=3D tpm_crb.o -common-obj-$(CONFIG_TPM_PASSTHROUGH) +=3D tpm_passthrough.o -common-obj-$(CONFIG_TPM_EMULATOR) +=3D tpm_emulator.o obj-$(CONFIG_TPM_SPAPR) +=3D tpm_spapr.o diff --git a/hw/tpm/trace-events b/hw/tpm/trace-events index 439e514787..de9bf1e01b 100644 --- a/hw/tpm/trace-events +++ b/hw/tpm/trace-events @@ -4,38 +4,6 @@ tpm_crb_mmio_read(uint64_t addr, unsigned size, uint32_t val) "CRB read 0x= %016" PRIx64 " len:%u val: 0x%" PRIx32 tpm_crb_mmio_write(uint64_t addr, unsigned size, uint32_t val) "CRB write = 0x%016" PRIx64 " len:%u val: 0x%" PRIx32 =20 -# tpm_passthrough.c -tpm_passthrough_handle_request(void *cmd) "processing command %p" -tpm_passthrough_reset(void) "reset" - -# tpm_util.c -tpm_util_get_buffer_size_hdr_len(uint32_t len, size_t expected) "tpm_resp-= >hdr.len =3D %u, expected =3D %zu" -tpm_util_get_buffer_size_len(uint32_t len, size_t expected) "tpm_resp->len= =3D %u, expected =3D %zu" -tpm_util_get_buffer_size_hdr_len2(uint32_t len, size_t expected) "tpm2_res= p->hdr.len =3D %u, expected =3D %zu" -tpm_util_get_buffer_size_len2(uint32_t len, size_t expected) "tpm2_resp->l= en =3D %u, expected =3D %zu" -tpm_util_get_buffer_size(size_t len) "buffersize of device: %zu" -tpm_util_show_buffer(const char *direction, size_t len, const char *buf) "= direction: %s len: %zu\n%s" - -# tpm_emulator.c -tpm_emulator_set_locality(uint8_t locty) "setting locality to %d" -tpm_emulator_handle_request(void) "processing TPM command" -tpm_emulator_probe_caps(uint64_t caps) "capabilities: 0x%"PRIx64 -tpm_emulator_set_buffer_size(uint32_t buffersize, uint32_t minsize, uint32= _t maxsize) "buffer size: %u, min: %u, max: %u" -tpm_emulator_startup_tpm_resume(bool is_resume, size_t buffersize) "is_res= ume: %d, buffer size: %zu" -tpm_emulator_get_tpm_established_flag(uint8_t flag) "got established flag:= %d" -tpm_emulator_cancel_cmd_not_supt(void) "Backend does not support CANCEL_TP= M_CMD" -tpm_emulator_handle_device_opts_tpm12(void) "TPM Version 1.2" -tpm_emulator_handle_device_opts_tpm2(void) "TPM Version 2" -tpm_emulator_handle_device_opts_unspec(void) "TPM Version Unspecified" -tpm_emulator_handle_device_opts_startup_error(void) "Startup error" -tpm_emulator_get_state_blob(uint8_t type, uint32_t size, uint32_t flags) "= got state blob type %d, %u bytes, flags 0x%08x" -tpm_emulator_set_state_blob(uint8_t type, uint32_t size, uint32_t flags) "= set state blob type %d, %u bytes, flags 0x%08x" -tpm_emulator_set_state_blobs(void) "setting state blobs" -tpm_emulator_set_state_blobs_error(const char *msg) "error while setting s= tate blobs: %s" -tpm_emulator_set_state_blobs_done(void) "Done setting state blobs" -tpm_emulator_pre_save(void) "" -tpm_emulator_inst_init(void) "" - # tpm_tis.c tpm_tis_raise_irq(uint32_t irqmask) "Raising IRQ for flag 0x%08x" tpm_tis_new_active_locality(uint8_t locty) "Active locality is now %d" @@ -56,7 +24,7 @@ tpm_tis_pre_save(uint8_t locty, uint32_t rw_offset) "loct= y: %d, rw_offset =3D %u" # tpm_ppi.c tpm_ppi_memset(uint8_t *ptr, size_t size) "memset: %p %zu" =20 -# hw/tpm/tpm_spapr.c +# tpm_spapr.c tpm_spapr_show_buffer(const char *direction, size_t len, const char *buf) = "direction: %s len: %zu\n%s" tpm_spapr_do_crq(uint8_t raw1, uint8_t raw2) "1st 2 bytes in CRQ: 0x%02x 0= x%02x" tpm_spapr_do_crq_crq_result(void) "SPAPR_VTPM_INIT_CRQ_RESULT" --=20 2.21.3