diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-19 12:48:56 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-19 12:48:56 +0000 |
| commit | 062fcb27c4c1af6902f497ec9316c1c0ead90e81 (patch) | |
| tree | e765b668c540201a3159ad24ecc1f23c80eb2270 /include/hw | |
| parent | 46db367db704da87e4beb29db84a0e4978d93235 (diff) | |
| parent | 89be9e99c83095af25ce16907143c31f2959188b (diff) | |
| download | qemu-062fcb27c4c1af6902f497ec9316c1c0ead90e81.zip qemu-062fcb27c4c1af6902f497ec9316c1c0ead90e81.tar.gz qemu-062fcb27c4c1af6902f497ec9316c1c0ead90e81.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2017-12-19-1' into staging
Merge tpm 2017/12/19 v1
# gpg: Signature made Tue 19 Dec 2017 11:51:13 GMT
# gpg: using RSA key 0x75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B818 B9CA DF90 89C2 D5CE C66B 75AD 6580 2A0B 4211
* remotes/stefanberger/tags/pull-tpm-2017-12-19-1:
tpm: move qdev_prop_tpm to hw/tpm/
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/qdev-properties.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h index 4d24cdf..60b42ac 100644 --- a/include/hw/qdev-properties.h +++ b/include/hw/qdev-properties.h @@ -187,8 +187,6 @@ extern const PropertyInfo qdev_prop_link; #define DEFINE_PROP_CHR(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_chr, CharBackend) -#define DEFINE_PROP_TPMBE(_n, _s, _f) \ - DEFINE_PROP(_n, _s, _f, qdev_prop_tpm, TPMBackend *) #define DEFINE_PROP_STRING(_n, _s, _f) \ DEFINE_PROP(_n, _s, _f, qdev_prop_string, char*) #define DEFINE_PROP_NETDEV(_n, _s, _f) \ |