diff options
| author | Peter Maydell | 2020-05-06 22:13:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-05-06 22:13:05 +0200 |
| commit | 298d893dd5006a38d0475fb584ae71b9e9f6e161 (patch) | |
| tree | ad4655b4c5eeeff283321e28d1c219e71f58d511 /hw/core/machine.c | |
| parent | Merge remote-tracking branch 'remotes/alistair/tags/pull-reg-to-apply-2020050... (diff) | |
| parent | hw: add compat machines for 5.1 (diff) | |
| download | qemu-298d893dd5006a38d0475fb584ae71b9e9f6e161.tar.gz qemu-298d893dd5006a38d0475fb584ae71b9e9f6e161.tar.xz qemu-298d893dd5006a38d0475fb584ae71b9e9f6e161.zip | |
Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-05-06-1' into staging
Merge tpm 2020/05/06 v1
# gpg: Signature made Wed 06 May 2020 15:16:17 BST
# gpg: using RSA key B818B9CADF9089C2D5CEC66B75AD65802A0B4211
# gpg: Good signature from "Stefan Berger <stefanb@linux.vnet.ibm.com>" [unknown]
# 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-2020-05-06-1:
hw: add compat machines for 5.1
hw/arm/virt: Remove the compat forcing tpm-tis-device PPI to off
tpm: tpm-tis-device: set PPI to false by default
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index c1a444cb75..7a50dd518f 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -28,6 +28,9 @@ #include "hw/mem/nvdimm.h" #include "migration/vmstate.h" +GlobalProperty hw_compat_5_0[] = {}; +const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0); + GlobalProperty hw_compat_4_2[] = { { "virtio-blk-device", "queue-size", "128"}, { "virtio-scsi-device", "virtqueue_size", "128"}, |