diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-02-10 17:08:51 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-02-10 17:08:51 +0000 |
| commit | 81a23caf47956778c5a5056ad656d1ef92bf9659 (patch) | |
| tree | d36bbf53bef8fcffde6fbe8ccb0b711235453e3a /hw | |
| parent | 2b8a51cdb3e8d15a5c35de7a2e76a813ae7358f0 (diff) | |
| parent | 11a18c84db4a71497d3d40769688a01b6f64b2ad (diff) | |
| download | qemu-81a23caf47956778c5a5056ad656d1ef92bf9659.zip qemu-81a23caf47956778c5a5056ad656d1ef92bf9659.tar.gz qemu-81a23caf47956778c5a5056ad656d1ef92bf9659.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Mon 10 Feb 2020 09:23:42 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:
hw/core: Allow setting 'virtio-blk-device.scsi' property on OSX host
block: fix crash on zero-length unaligned write and read
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/machine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 3e288bf..d8e30e4 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -148,7 +148,8 @@ GlobalProperty hw_compat_2_5[] = { const size_t hw_compat_2_5_len = G_N_ELEMENTS(hw_compat_2_5); GlobalProperty hw_compat_2_4[] = { - { "virtio-blk-device", "scsi", "true" }, + /* Optional because the 'scsi' property is Linux-only */ + { "virtio-blk-device", "scsi", "true", .optional = true }, { "e1000", "extra_mac_registers", "off" }, { "virtio-pci", "x-disable-pcie", "on" }, { "virtio-pci", "migrate-extra", "off" }, |