From nobody Sun May 5 05:30:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508848031106118.41877246679121; Tue, 24 Oct 2017 05:27:11 -0700 (PDT) Received: from localhost ([::1]:43677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yIT-0002WI-73 for importer@patchew.org; Tue, 24 Oct 2017 08:27:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yCb-0006Ih-KQ for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6yCa-00071R-S6 for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:01 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:55920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6yCa-000716-Nn; Tue, 24 Oct 2017 08:21:00 -0400 Received: by mail-qk0-x241.google.com with SMTP id x82so25918614qkb.12; Tue, 24 Oct 2017 05:21:00 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id n76sm103983qkn.85.2017.10.24.05.20.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 05:20:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nBfUTueMTs25sanuU9F4anRAVy/kTjYzVlXWe9AqUqc=; b=gYN2j8QWoe3amQ6X7a4V8dfpYd1bA9HixyAN9nhwllCWYoDgoD6uTTq0/+34iRgGL1 QIQEEgNyPvarT3g5jcwyvottbS44/honbCLR6aoEYAk5Wx84pi17PBpiCMw3gqoTwMMg nr8y7B83pjC+nEgtkCcBD/l5qxnsz/BEShIid5Z+F03vy1eMJ58QHCYrrZgsBK8Yp1Kj AMYrWa6Ay/5p2XEEUWCALg1AZJ/5Fb4qEDV4RRBrrDsWg4elPW5NsBxqLQcL7CUHhnPE Dk3iGjt5q4WGhVMi7kqfeRABV2uSWBgYAhA7325/tEQZ9ZuyC/NtPeai4JR6kGj4T0d7 bsZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nBfUTueMTs25sanuU9F4anRAVy/kTjYzVlXWe9AqUqc=; b=eCIPtLM4EvVAO1vb1rrAKWVX0ZHeLUQhSIenX4XOt4Gwmz4/BoQbe9MS/RBkdYTovz XNk8xnNVUkJ33iLT5T2P3pjK661MZIH8vZ9E1D67jj9YXZidkMyN0t9RAi01RMZQeBkK L90Wokp7MDiQzIkDaLb8WpsBqSb5lTpowd4CVKp1oNMh72+JEPYexmKO7+9wdFROyRbV RC1acAXe0RO7Wd3u4x7eVKlQ3ubMM40hVnWYabWfJgHEFuGZoEQ+kChjI3IjP7AwKeL/ yDIOMMPk5YLNUR3UflDl4dBSR1mfcdktaeLDHPOoPFZJpB3W1ygJzMd/fj8ww27t59gZ I3zg== X-Gm-Message-State: AMCzsaUeIt+Nmr/be32MSIXTLTWCX8nLa3cSOiZOt8W9wEybRocUkU+Q SGMOcWMWijBTC7UO7SrBQRc= X-Google-Smtp-Source: ABhQp+RLFGuvD5QCTHJT46cs+X8UBAApeIAAR1eoq+N7HPWO0tF6VcknarcO6vqdlgkRZ2WA23Jeyg== X-Received: by 10.233.237.193 with SMTP id c184mr21607929qkg.265.1508847660255; Tue, 24 Oct 2017 05:21:00 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: BALATON Zoltan , "Richard W . M . Jones" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger , Amarnath Valluri , Juan Quintela , Peter Maydell Date: Tue, 24 Oct 2017 09:20:42 -0300 Message-Id: <20171024122045.30072-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc1 In-Reply-To: <20171024122045.30072-1-f4bug@amsat.org> References: <20171024122045.30072-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 1/4] tpm: add missing include X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , "Dr . David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 else file including "sysemu/tpm.h" fails to compile: In file included from qemu/stubs/tpm.c:2:0: qemu/include/sysemu/tpm.h:36:19: error: implicit declaration of function = =E2=80=98object_resolve_path_type=E2=80=99 [-Werror=3Dimplicit-function-dec= laration] Object *obj =3D object_resolve_path_type("", TYPE_TPM_TIS, NULL); ^~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Richard W.M. Jones Acked-by or a Reviewed-by tag? If so it would be better to write them --- include/sysemu/tpm.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h index c8afa179e5..d7a2bd8556 100644 --- a/include/sysemu/tpm.h +++ b/include/sysemu/tpm.h @@ -13,6 +13,7 @@ #define QEMU_TPM_H =20 #include "qemu/option.h" +#include "qom/object.h" =20 typedef struct TPMState TPMState; =20 --=20 2.15.0.rc1 From nobody Sun May 5 05:30:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508847798930819.6048984083293; Tue, 24 Oct 2017 05:23:18 -0700 (PDT) Received: from localhost ([::1]:43655 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yEe-0007Tj-2G for importer@patchew.org; Tue, 24 Oct 2017 08:23:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yCj-0006NU-1q for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6yCf-00074a-41 for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:09 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:44182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6yCe-00074H-V3; Tue, 24 Oct 2017 08:21:05 -0400 Received: by mail-qk0-x243.google.com with SMTP id r64so25927478qkc.1; Tue, 24 Oct 2017 05:21:04 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id n76sm103983qkn.85.2017.10.24.05.21.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 05:21:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fwHh1OAweOZOHx7kkW8yOHZufjrY41Xyf5L9ndLoZ3o=; b=HUlBg5ZjP5ajwGJnHgKUvWvGg6gQPrVIEzymqxbkBmUUA9kKkc3jOfE4eHHL6E0Jk1 Lzr4kTMTrbK/t72eAwv4ioG5NQZsOJMi5VHRN+9vqPIBmPSY19IGK01ARIcxBsP2LyBM G2DAsxPerdoXRLhbuONgJxVrQloCoQvj8tqM2tdENTl3v3S7bu9fZX+g2SSe+HJgMhpM EfwMT9ZuFuWJgIGPxg56F2RvPLHLKiCanUBJj+lOe43cJog+MR0nCeXN/bELfXXEU7IJ IutWJVHqfEApGOClNPmEDjlqX4Md7C1ZstyZIv8/aFQz761ruDoIa+/nIxl/eHa472ww K9mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fwHh1OAweOZOHx7kkW8yOHZufjrY41Xyf5L9ndLoZ3o=; b=qi1TG+zpNAJWaH11VkOlSZ/xOGNRFP29YXGAf3+j4nsBdIIVITLXGv5JDEvA/bi730 bYGeXAGhzYcnNPaI7E10oTnHtuYsQqehIuEQDM5RNfZWVyBG+pqnqbRTnmb9yED6v591 LXwcAnPdwV+Fpg9PY5jrLQ2lX9QKyjmMAdYWzEOrJdYtYXlBSfIn/PqgQ+yPy4H0DCD0 qMMJQlYe9KytRyviqjstoOUHS/OxKBNh7CFdKUlrXibRYjOUGr8SoSriIQMOcat9mMD5 iwEHaP3qY6J8V+3YpMRi0YnXLLNXShwTI2H8fnjQhwiBxCGrBsNStp4Fa+Bqs7ym3+a7 RzTQ== X-Gm-Message-State: AMCzsaVsRTYRIundjrY8sUNXyrUQc8EfHfqd19SbA0DjYeepUmZeu90M WqnLZ2WT1Tb7wE90FdlAbic= X-Google-Smtp-Source: ABhQp+QF7LYJzc9PVnSTlXbidnDXL6xecCdMhPxpr0ojYIKKsrDs06itpy5hI/rpASSSulbu68jDBw== X-Received: by 10.55.180.132 with SMTP id d126mr24778644qkf.268.1508847664453; Tue, 24 Oct 2017 05:21:04 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: BALATON Zoltan , "Richard W . M . Jones" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger , Amarnath Valluri , Juan Quintela , Eric Blake , Peter Maydell Date: Tue, 24 Oct 2017 09:20:43 -0300 Message-Id: <20171024122045.30072-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc1 In-Reply-To: <20171024122045.30072-1-f4bug@amsat.org> References: <20171024122045.30072-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 2/4] tpm: add stubs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , "Dr . David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Commit c37cacabf22 moved tpm_cleanup() in the main loop exit, however this function is not available when compiling with --disable-tpm. Provides necessary stubs to keep code clean of #ifdef'fery. Reported-by: BALATON Zoltan Message-Id: <20171023102903.256AF7456A0@zero.eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Richard W.M. Jones Acked-by or a Reviewed-by tag? If so it would be better to write them Reviewed-by: Amarnath Valluri Reviewed-by: Juan Quintela --- Makefile.objs | 2 +- stubs/tpm.c | 33 +++++++++++++++++++++++++++++++++ MAINTAINERS | 1 + stubs/Makefile.objs | 1 + 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 stubs/tpm.c diff --git a/Makefile.objs b/Makefile.objs index d4f973a8fc..285c6f3c15 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -62,7 +62,7 @@ bt-host.o-cflags :=3D $(BLUEZ_CFLAGS) common-obj-y +=3D dma-helpers.o common-obj-y +=3D vl.o vl.o-cflags :=3D $(GPROF_CFLAGS) $(SDL_CFLAGS) -common-obj-y +=3D tpm.o +common-obj-$(CONFIG_TPM) +=3D tpm.o =20 common-obj-$(CONFIG_SLIRP) +=3D slirp/ =20 diff --git a/stubs/tpm.c b/stubs/tpm.c new file mode 100644 index 0000000000..c18aac1c73 --- /dev/null +++ b/stubs/tpm.c @@ -0,0 +1,33 @@ +/* + * TPM stubs + * + * 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. + */ +#include "qemu/osdep.h" +#include "sysemu/tpm.h" +#include "qmp-commands.h" + +int tpm_init(void) +{ + return 0; +} + +void tpm_cleanup(void) +{ +} + +TPMInfoList *qmp_query_tpm(Error **errp) +{ + return NULL; +} + +TpmTypeList *qmp_query_tpm_types(Error **errp) +{ + return NULL; +} + +TpmModelList *qmp_query_tpm_models(Error **errp) +{ + return NULL; +} diff --git a/MAINTAINERS b/MAINTAINERS index 12175425a7..2650063242 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1544,6 +1544,7 @@ TPM M: Stefan Berger S: Maintained F: tpm.c +F: stubs/tpm.c F: hw/tpm/* F: include/hw/acpi/tpm.h F: include/sysemu/tpm* diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index c7594796c3..8cfe34328a 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -28,6 +28,7 @@ stub-obj-y +=3D runstate-check.o stub-obj-y +=3D set-fd-handler.o stub-obj-y +=3D slirp.o stub-obj-y +=3D sysbus.o +stub-obj-y +=3D tpm.o stub-obj-y +=3D trace-control.o stub-obj-y +=3D uuid.o stub-obj-y +=3D vm-stop.o --=20 2.15.0.rc1 From nobody Sun May 5 05:30:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508847794469336.21903666507956; Tue, 24 Oct 2017 05:23:14 -0700 (PDT) Received: from localhost ([::1]:43654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yEZ-0007Os-JI for importer@patchew.org; Tue, 24 Oct 2017 08:23:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yCp-0006QU-NM for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6yCi-00077n-VL for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:14 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:55921) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6yCi-00077Y-QA; Tue, 24 Oct 2017 08:21:08 -0400 Received: by mail-qk0-x241.google.com with SMTP id x82so25919139qkb.12; Tue, 24 Oct 2017 05:21:08 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id n76sm103983qkn.85.2017.10.24.05.21.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 05:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wraKdZSGpwoslQ/nBgo714YDl4uliR0qkyarfqUSHuE=; b=FECKuljZcxS1iIItuxIODzUvdN54IUxgBzYyEMl7Va9Qu98a9/ryEg8jZBRM+LtFqB kfEnqdpoqXoN3KNPqxcOH3iQwFV+MnpXdic6m0RYReGZ85lBKobca5eroBd18ro8bVYD 1guOezE3QiCXq3of6FyDMzA9wFxi3Fm2JiK8pArRvdI3xFoqg/WuFYfjIA7Bem3NUy4v kRi4Sv8N6dpxHESo/Q4HWzbS6jtU3OXJbH1BrN6Op8MyEEuRm4uMXHBb05a+tV5fmx4x Xw6VVlGFuPx8IBx9cqHTkih8izkr8JtDpk4zo5cVeV9FN1YyFMc7koTNR2TFWC9tqp23 3CWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wraKdZSGpwoslQ/nBgo714YDl4uliR0qkyarfqUSHuE=; b=FWoKf5Y3fsmzAtjKPUB/z0yhlzEhQt96mT4u0I0LWv1wD57QceLSaIv3/cyQHD6BG7 9sUjzYYuV4c0jDdHglGctfX8pskLG08S7qW+jyXleyLJr8siADkqHpL8QYgR/+TYm7li Aedk55vEqlwuSaeFrFZSjdlzij+qQYGAKR/e86kNhTaVyznbl0OD/QEaPgT5zzIO7HEI xDn9IlNnN0ImuGzE3Ahq6Lq75Ngpvleya7N2ZuTRc6hxZV/v6dotMS++CrsG6MS9o/4f QmM31ZG65Q6uiqcKhww8UyJjPdpjbJsZog3TQgjOyUCaFd106KFHxrFaE/STAz9vtlhi 7tTQ== X-Gm-Message-State: AMCzsaX9V36lpVI0ZcG2AGeXE6MjxV9fbRR+HrZ2JjFL++qznmtsyaSl rRKJzejconQltgaV4ASWR3Y= X-Google-Smtp-Source: ABhQp+QLIyGwkwVnmQFBKl6gzfP13g0E7M8ELLfO7y0vhBT8sZTA+XWUHA3dmG/R532hcvOlT97akg== X-Received: by 10.55.10.18 with SMTP id 18mr21930674qkk.184.1508847668359; Tue, 24 Oct 2017 05:21:08 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: BALATON Zoltan , "Richard W . M . Jones" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger , Amarnath Valluri , Juan Quintela , Peter Maydell Date: Tue, 24 Oct 2017 09:20:44 -0300 Message-Id: <20171024122045.30072-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc1 In-Reply-To: <20171024122045.30072-1-f4bug@amsat.org> References: <20171024122045.30072-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 3/4] tpm: remove unnecessary #ifdef CONFIG_TPM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , "Dr . David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Makefile.objs now checks for $(CONFIG_TPM). Suggested-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by or a Reviewed-by tag? If so it would be better to write them Reviewed-by: Amarnath Valluri Reviewed-by: Juan Quintela Reviewed-by: Stefan Berger --- tpm.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tpm.c b/tpm.c index 45520f555d..ab5d29e91e 100644 --- a/tpm.c +++ b/tpm.c @@ -30,8 +30,6 @@ void tpm_register_model(enum TpmModel model) tpm_models[model] =3D true; } =20 -#ifdef CONFIG_TPM - static const TPMBackendClass * tpm_be_find_by_type(enum TpmType type) { @@ -192,8 +190,6 @@ int tpm_config_parse(QemuOptsList *opts_list, const cha= r *optarg) return 0; } =20 -#endif /* CONFIG_TPM */ - /* * Walk the list of active TPM backends and collect information about them * following the schema description in qapi-schema.json. --=20 2.15.0.rc1 From nobody Sun May 5 05:30:34 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508847953595557.9436882900604; Tue, 24 Oct 2017 05:25:53 -0700 (PDT) Received: from localhost ([::1]:43670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yH1-0001D0-Kh for importer@patchew.org; Tue, 24 Oct 2017 08:25:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6yCn-0006QS-UC for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6yCm-0007B8-VF for qemu-devel@nongnu.org; Tue, 24 Oct 2017 08:21:13 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:50403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6yCm-0007Aw-QU; Tue, 24 Oct 2017 08:21:12 -0400 Received: by mail-qt0-x243.google.com with SMTP id d9so23300519qtd.7; Tue, 24 Oct 2017 05:21:12 -0700 (PDT) Received: from x1.local ([181.93.89.178]) by smtp.gmail.com with ESMTPSA id n76sm103983qkn.85.2017.10.24.05.21.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Oct 2017 05:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RuxqJoY8o+MvoJrBKpmNAkcYjUHQKm+mlOY5DYZt1zA=; b=ccZ38MdOamCFDlc2C8dPP6puKaJIgqO8jit6ClyxfoWu0A75SFQprEvhq0DeNvdY/H qDKfNNrlmnPnO3E2bz0tjZ08zuZOh5NjbZ21QhTpZYzMeg9+iSLVy7k92fJuyzAOxSIc M0Z3QztD+c6ntUmZClHbsxCS5lxrvns/Kxj31DJagquqwwJCykD3mPbqVoDcRn1aHjy3 XdXdv26phRTky0sZ4tZ4HXd2ojuJrmXlo6GKkpV/ymUDA3UEEIChI+SeHKgpBCJue+0p Yekk0nK0/bU3wev1ivkt1PxRwo622Z0NIGgFuh8iTuLwW4ld3+Gbn+VOFAtSYPd7p82+ s82A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=RuxqJoY8o+MvoJrBKpmNAkcYjUHQKm+mlOY5DYZt1zA=; b=QSj755IC8CvOEoUlzMorAO8TxUpIlMyRdo06ir6FNs4plJrLFe7GmL/pABvtPHcBdx OX+IlmRxHBJMT9njn3b9Z/Rjs1iq/JHmbXUcb6hL9O5mXWCmYj9tWaGCpV7lxX1xMPO1 7ChT82/Z+YwDAdzT1WJDcXV2PAMID3lIUTcAoYqlX5R2QxJcI9271Qj+4A/d4tcUQhbY Q1saHPcMEU5pYxGTBSNomST+/QOMAnVXB0e1K9gQ6imlfAPdjKtyyY8jS7AWXAR9k/mK iNoXtKzzUsaea+5JaoSgUtLsmjeNJ6hTAPU93SJ3d8q8e+k4GXTNE40wup9k0Pfmx//l D7WQ== X-Gm-Message-State: AMCzsaVVqmoFEg/dLdiRRCTC67xzUZ0606SlqwE3DFclQq3IH7NzJsTo MMXEfrEGeCZpY7Eu0cawwds= X-Google-Smtp-Source: ABhQp+S85YG2htHqdS8JiLOl/ZPnJ/vf3HnN4LGFhAYRLoYbxsveA6m8hYdcrri0b3+vBRiZW69KsQ== X-Received: by 10.200.49.92 with SMTP id h28mr25547284qtb.340.1508847672279; Tue, 24 Oct 2017 05:21:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: BALATON Zoltan , "Richard W . M . Jones" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Stefan Berger , Amarnath Valluri , Juan Quintela , Peter Maydell Date: Tue, 24 Oct 2017 09:20:45 -0300 Message-Id: <20171024122045.30072-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.0.rc1 In-Reply-To: <20171024122045.30072-1-f4bug@amsat.org> References: <20171024122045.30072-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v2 4/4] vl: remove unnecessary #ifdef CONFIG_TPM X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , "Dr . David Alan Gilbert" , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_6 Z_629925259 SPT_0 a stub is now provided. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Richard W.M. Jones Acked-by or a Reviewed-by tag? If so it would be better to write them Reviewed-by: Amarnath Valluri Reviewed-by: Juan Quintela --- vl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/vl.c b/vl.c index 0723835bbf..ec299099ff 100644 --- a/vl.c +++ b/vl.c @@ -4624,11 +4624,9 @@ int main(int argc, char **argv, char **envp) exit(1); } =20 -#ifdef CONFIG_TPM if (tpm_init() < 0) { exit(1); } -#endif =20 /* init the bluetooth world */ if (foreach_device_config(DEV_BT, bt_parse)) --=20 2.15.0.rc1