diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 18:14:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-12-13 18:14:07 +0000 |
| commit | 084a398bf8aa7634738e6c6c0103236ee1b3b72f (patch) | |
| tree | 44d7faaeaeff6dd48eac2e3faae2a878e5a1457b /hw/arm/virt.c | |
| parent | 4148d142a8cbbce10bb77e560997ae6b482e5edf (diff) | |
| parent | 86d2a49b41832355ab50cf60cec0cd50680fc0e5 (diff) | |
| download | focaccia-qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.tar.gz focaccia-qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request # gpg: Signature made Fri 13 Dec 2019 14:32:11 GMT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/block-pull-request: iothread: document -object iothread on man page virtio-blk: advertise F_WCE (F_FLUSH) if F_CONFIG_WCE is advertised Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm/virt.c')
| -rw-r--r-- | hw/arm/virt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d4bedc2607..bf4b1cbfb8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2149,6 +2149,7 @@ type_init(machvirt_machine_init); static void virt_machine_4_2_options(MachineClass *mc) { + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); } DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) |