diff options
| author | Peter Maydell | 2019-12-13 19:14:07 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-12-13 19:14:07 +0100 |
| commit | 084a398bf8aa7634738e6c6c0103236ee1b3b72f (patch) | |
| tree | 44d7faaeaeff6dd48eac2e3faae2a878e5a1457b /hw/core/machine.c | |
| parent | Merge remote-tracking branch 'remotes/dgilbert/tags/pull-virtiofs-20191213a' ... (diff) | |
| parent | iothread: document -object iothread on man page (diff) | |
| download | qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.tar.gz qemu-084a398bf8aa7634738e6c6c0103236ee1b3b72f.tar.xz 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/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 1689ad3bf8..023548b4f3 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -27,6 +27,11 @@ #include "hw/pci/pci.h" #include "hw/mem/nvdimm.h" +GlobalProperty hw_compat_4_2[] = { + { "virtio-blk-device", "x-enable-wce-if-config-wce", "off" }, +}; +const size_t hw_compat_4_2_len = G_N_ELEMENTS(hw_compat_4_2); + GlobalProperty hw_compat_4_1[] = { { "virtio-pci", "x-pcie-flr-init", "off" }, }; |