qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Berger <stefanb@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	"Stefan Berger" <stefanb@linux.vnet.ibm.com>
Subject: [Qemu-devel] [PATCH 3/5] tpm: remove unnecessary #ifdef CONFIG_TPM
Date: Wed, 25 Oct 2017 01:14:58 -0400	[thread overview]
Message-ID: <1508908500-25274-4-git-send-email-stefanb@linux.vnet.ibm.com> (raw)
In-Reply-To: <1508908500-25274-1-git-send-email-stefanb@linux.vnet.ibm.com>

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

Makefile.objs now checks for $(CONFIG_TPM).

Suggested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
 tpm.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tpm.c b/tpm.c
index 45520f5..ab5d29e 100644
--- a/tpm.c
+++ b/tpm.c
@@ -30,8 +30,6 @@ void tpm_register_model(enum TpmModel model)
     tpm_models[model] = true;
 }
 
-#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 char *optarg)
     return 0;
 }
 
-#endif /* CONFIG_TPM */
-
 /*
  * Walk the list of active TPM backends and collect information about them
  * following the schema description in qapi-schema.json.
-- 
2.5.5

  parent reply	other threads:[~2017-10-25  5:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-25  5:14 [Qemu-devel] [PATCH 0/5] Merge tpm 2017/10/24 Stefan Berger
2017-10-25  5:14 ` [Qemu-devel] [PATCH 1/5] tpm: add missing include Stefan Berger
2017-10-25  5:14 ` [Qemu-devel] [PATCH 2/5] tpm: add stubs Stefan Berger
2017-10-25  5:14 ` Stefan Berger [this message]
2017-10-25  5:14 ` [Qemu-devel] [PATCH 4/5] vl: remove unnecessary #ifdef CONFIG_TPM Stefan Berger
2017-10-25  5:15 ` [Qemu-devel] [PATCH 5/5] tpm: print buffers received from TPM when debugging Stefan Berger
2017-10-25 13:05 ` [Qemu-devel] [PATCH 0/5] Merge tpm 2017/10/24 Philippe Mathieu-Daudé
2017-10-25 14:44   ` Stefan Berger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1508908500-25274-4-git-send-email-stefanb@linux.vnet.ibm.com \
    --to=stefanb@linux.vnet.ibm.com \
    --cc=f4bug@amsat.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).