diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-03-15 19:23:00 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-03-15 19:23:00 +0000 |
| commit | 2615a5e433aeb812c300d3a48e1a88e1303e2339 (patch) | |
| tree | 3edfb705db68fb72bf6fa634ca08ffd8bd88efe3 /hw/core | |
| parent | e7c6a8cf9f5c82aa152273e1c9e80d07b1b0c32c (diff) | |
| parent | fb0b154c801e3447e505de420195fb7038695941 (diff) | |
| download | focaccia-qemu-2615a5e433aeb812c300d3a48e1a88e1303e2339.tar.gz focaccia-qemu-2615a5e433aeb812c300d3a48e1a88e1303e2339.zip | |
Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging
Pull request # gpg: Signature made Mon 15 Mar 2021 09:50:58 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-gitlab/tags/block-pull-request: virtio-blk: Respect discard granularity Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core')
| -rw-r--r-- | hw/core/machine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 4386f57b5c..4c1a4a4c32 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,6 +39,7 @@ GlobalProperty hw_compat_5_2[] = { { "ICH9-LPC", "smm-compat", "on"}, { "PIIX4_PM", "smm-compat", "on"}, + { "virtio-blk-device", "report-discard-granularity", "off" }, }; const size_t hw_compat_5_2_len = G_N_ELEMENTS(hw_compat_5_2); |