From: Klaus Birkelund Jensen <klaus@birkelund.eu>
Date: Thu, 6 Jun 2019 09:25:30 +0000 (+0200)
Subject: nvme: do not advertise support for unsupported arbitration mechanism
X-Git-Tag: v4.1.0-rc0~41^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cc354ac9868a35279ff01857144212f6aefb697;p=thirdparty%2Fqemu.git

nvme: do not advertise support for unsupported arbitration mechanism

The device mistakenly reports that the Weighted Round Robin with Urgent
Priority Class arbitration mechanism is supported.

It is not.

Signed-off-by: Klaus Birkelund Jensen <klaus.jensen@cnexlabs.com>
Message-id: 20190606092530.14206-1-klaus@birkelund.eu
Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 107a719b953..36d6a8bb3a3 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);