diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 11:28:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 11:28:28 +0100 |
| commit | 7fec76a02267598a4e437ddfdaeaeb6de09b92f3 (patch) | |
| tree | 338c85fea4651c80e9a7d681ec78ce0d87c9c65f /hw/block | |
| parent | 474f3938d79ab36b9231c9ad3b5a9314c2aeacde (diff) | |
| parent | ab5d4a30f7f3803ca5106b370969c1b7b54136f8 (diff) | |
| download | qemu-7fec76a02267598a4e437ddfdaeaeb6de09b92f3.zip qemu-7fec76a02267598a4e437ddfdaeaeb6de09b92f3.tar.gz qemu-7fec76a02267598a4e437ddfdaeaeb6de09b92f3.tar.bz2 | |
Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2019-06-24' into staging
Block patches:
- The SSH block driver now uses libssh instead of libssh2
- The VMDK block driver gets read-only support for the seSparse
subformat
- Various fixes
# gpg: Signature made Mon 24 Jun 2019 15:42:56 BST
# gpg: using RSA key 91BEB60A30DB3E8857D11829F407DB0061D5CF40
# gpg: issuer "mreitz@redhat.com"
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>" [full]
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1 1829 F407 DB00 61D5 CF40
* remotes/maxreitz/tags/pull-block-2019-06-24:
iotests: Fix 205 for concurrent runs
ssh: switch from libssh2 to libssh
vmdk: Add read-only support for seSparse snapshots
vmdk: Reduce the max bound for L1 table size
vmdk: Fix comment regarding max l1_size coverage
iotest 134: test cluster-misaligned encrypted write
blockdev: enable non-root nodes for transaction drive-backup source
nvme: do not advertise support for unsupported arbitration mechanism
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/nvme.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 107a719..36d6a8b 100644 --- a/hw/block/nvme.c +++ b/hw/block/nvme.c @@ -1384,7 +1384,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) n->bar.cap = 0; NVME_CAP_SET_MQES(n->bar.cap, 0x7ff); NVME_CAP_SET_CQR(n->bar.cap, 1); - NVME_CAP_SET_AMS(n->bar.cap, 1); NVME_CAP_SET_TO(n->bar.cap, 0xf); NVME_CAP_SET_CSS(n->bar.cap, 1); NVME_CAP_SET_MPSMAX(n->bar.cap, 4); |