diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-26 10:53:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-26 10:53:23 +0100 |
| commit | a467bb9940145ed678ac6f84e9cc260f31174905 (patch) | |
| tree | 79bd2b56e0958aeb39d5f6dd0ea80d4af44ab188 /tpm.c | |
| parent | 2d2e632ad00d11867c6c5625605b1fbc022dd62f (diff) | |
| parent | 690604f696db6b3da35988e29da3f8d7966e12bc (diff) | |
| download | qemu-a467bb9940145ed678ac6f84e9cc260f31174905.tar.gz | |
Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-07-25-tag' into staging
qemu-ga patch queue for 2.7
* fix w32 build failures due to -Werror when building with VSS/fsfreeze
enabled
* fix leaking for qemu-ga config files in `make check`
# gpg: Signature made Mon 25 Jul 2016 20:01:09 BST
# gpg: using RSA key 0x3353C9CEF108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg: aka "Michael Roth <mdroth@utexas.edu>"
# gpg: aka "Michael Roth <mdroth@linux.vnet.ibm.com>"
# Primary key fingerprint: CEAC C9E1 5534 EBAB B82D 3FA0 3353 C9CE F108 B584
* remotes/mdroth/tags/qga-pull-2016-07-25-tag:
configure: mark qemu-ga VSS includes as system headers
tests: use static qga config file
build-sys: link tests/data
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tpm.c')
0 files changed, 0 insertions, 0 deletions