All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: xen-devel@lists.xensource.com, ian.campbell@citrix.com,
	JBeulich@suse.com
Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>,
	samuel.thibault@ens-lyon.org,
	"Luis R. Rodriguez" <mcgrof@suse.com>,
	pryorm09@gmail.com, cfergeau@redhat.com
Subject: [PATCH 9/9] vtpm: guard against redefining TPM_VENDOR_COMMAND
Date: Fri, 20 Nov 2015 09:47:52 -0800	[thread overview]
Message-ID: <1448041672-3986-10-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1448041672-3986-1-git-send-email-mcgrof@do-not-panic.com>

From: "Luis R. Rodriguez" <mcgrof@suse.com>

vtpm.c already includes tpm/tpm_marshalling.h, this in turn
includes tpm_structures.h which already has defined
TPM_VENDOR_COMMAND. Guard against its redefinition to avoid
a compilation warning on vtpmc:

cc <etc> -I../tpm_emulator-x86_64  -c -o vtpm.o vtpm.c
In file included from vtpm.c:36:0: vtpm_manager.h:57:0: warning: "TPM_VENDOR_COMMAND" redefined
 #define TPM_VENDOR_COMMAND  0x02000000 // TPM Main, part 2, section 17.
 ^
In file included from ../tpm_emulator-x86_64/tpm/tpm_marshalling.h:21:0,
                 from vtpm.c:31:
../tpm_emulator-x86_64/tpm/tpm_structures.h:526:0: note: this is the
location of the previous definition

Cc: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
 stubdom/vtpmmgr/vtpm_manager.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/stubdom/vtpmmgr/vtpm_manager.h b/stubdom/vtpmmgr/vtpm_manager.h
index 2d2109dd63cb..6fdaf6aeb074 100644
--- a/stubdom/vtpmmgr/vtpm_manager.h
+++ b/stubdom/vtpmmgr/vtpm_manager.h
@@ -54,7 +54,10 @@
 
 //************************ Command Codes ****************************
 #define VTPM_ORD_BASE       0x0000
+/* Defined in tpm_emulator-x86_64/tpm/tpm_structures.h */
+#ifndef TPM_VENDOR_COMMAND
 #define TPM_VENDOR_COMMAND  0x02000000 // TPM Main, part 2, section 17.
+#endif
 #define VTPM_PRIV_BASE      (VTPM_ORD_BASE | TPM_VENDOR_COMMAND)
 
 /*
-- 
2.6.2

  parent reply	other threads:[~2015-11-20 17:47 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-20 17:47 [PATCH 0/9] xen: build fixes with gcc5 and binutils 2.25.0 Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 1/9] Revert "Use the extra stack for 16bit USB and PS2 keyboard/mouse commands." Luis R. Rodriguez
2015-11-20 17:47 ` [Cocci] [PATCH 2/9] Use gnutls_priority_set_direct() to deprecate gnutls_*_set() Luis R. Rodriguez
2015-11-20 17:47   ` Luis R. Rodriguez
2015-11-25 14:53   ` [Cocci] [Xen-devel] " Konrad Rzeszutek Wilk
2015-11-25 14:53     ` Konrad Rzeszutek Wilk
2015-11-25 19:36     ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2015-11-25 19:36       ` Luis R. Rodriguez
2015-11-25 20:44       ` [Cocci] " Konrad Rzeszutek Wilk
2015-11-25 20:44         ` Konrad Rzeszutek Wilk
2016-02-06  1:44         ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-06  1:44           ` Luis R. Rodriguez
2016-02-06  3:45           ` [Cocci] " Konrad Rzeszutek Wilk
2016-02-06  3:45             ` Konrad Rzeszutek Wilk
2016-02-06  4:03             ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-06  4:03               ` Luis R. Rodriguez
2016-02-06  4:12               ` [Cocci] [Xen-devel] " Konrad Rzeszutek Wilk
2016-02-06  4:12                 ` Konrad Rzeszutek Wilk
2016-02-06  4:36                 ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-06  4:36                   ` Luis R. Rodriguez
2016-02-06 20:18               ` [Cocci] [Xen-devel] " Doug Goldstein
2016-02-06 20:18                 ` Doug Goldstein
2016-02-09 10:54               ` Jan Beulich
2016-02-09 15:46                 ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-09 15:46                   ` Luis R. Rodriguez
2016-02-09 16:06                   ` Jan Beulich
2016-02-09 16:36             ` Olaf Hering
2016-02-09 16:42               ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-09 16:42                 ` Luis R. Rodriguez
2016-02-09 18:23                 ` Olaf Hering
2016-02-10  3:04                   ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-10  3:04                     ` Luis R. Rodriguez
2016-02-10  9:46                     ` Ian Campbell
2016-02-10 15:41                       ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-10 15:41                         ` Luis R. Rodriguez
2016-02-10 15:44                         ` Olaf Hering
2016-02-10 15:55                           ` [Cocci] [Xen-devel] " Luis R. Rodriguez
2016-02-10 15:55                             ` Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 3/9] hw/usb-net.c: fix state check Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 4/9] qemu-xen-dir: spice: remove spice-experimental.h include Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 5/9] qemu-xen-dir: virtio-rng: fix check for period_ms validity Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 6/9] mini-os: fix linker warning with app.lds Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 7/9] stubdom: fix unfound libgmp library issues Luis R. Rodriguez
2015-11-20 17:47 ` [PATCH 8/9] vtpm: fix vtpmblk.c compilation warning Luis R. Rodriguez
2015-11-20 17:47 ` Luis R. Rodriguez [this message]
2016-02-06  1:48 ` [PATCH 0/9] xen: build fixes with gcc5 and binutils 2.25.0 Luis R. Rodriguez
2016-02-06  3:52   ` Konrad Rzeszutek Wilk
2016-02-06  4:07     ` Luis R. Rodriguez
2016-02-06 20:22       ` Doug Goldstein
2016-02-07  5:34         ` Fengguang Wu
2016-02-08  9:58   ` Ian Campbell
2016-02-09 15:56     ` Luis R. Rodriguez
2016-02-09 16:26       ` Ian Campbell
2016-02-09 16:39         ` Luis R. Rodriguez
2016-02-10  9:34           ` Ian Campbell
2016-02-09  8:08   ` Jan Beulich
2016-02-09 16:09     ` Luis R. Rodriguez
2016-02-09 16:22       ` Ian Campbell
2016-02-09 16:30         ` Luis R. Rodriguez
2016-02-09 16:39           ` Ian Campbell
2016-02-09 16:53             ` Luis R. Rodriguez
2016-02-10  5:21               ` Luis R. Rodriguez
2016-02-10  9:38               ` Ian Campbell
2016-02-10  5:44             ` Luis R. Rodriguez
2016-02-10  9:47               ` Ian Campbell
2016-02-11  8:08           ` Olaf Hering
2016-02-10  0:24         ` Dario Faggioli

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=1448041672-3986-10-git-send-email-mcgrof@do-not-panic.com \
    --to=mcgrof@do-not-panic.com \
    --cc=JBeulich@suse.com \
    --cc=cfergeau@redhat.com \
    --cc=dgdegra@tycho.nsa.gov \
    --cc=ian.campbell@citrix.com \
    --cc=mcgrof@suse.com \
    --cc=pryorm09@gmail.com \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=xen-devel@lists.xensource.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.