summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKlaus Jensen <k.jensen@samsung.com>2022-04-29 10:33:36 +0200
committerKlaus Jensen <k.jensen@samsung.com>2022-06-03 21:48:24 +0200
commitfbba243bc700a4e479331e20544c7f6a41ae87b3 (patch)
treeb22aa719446ff2c7ec68207ddf3e250e462605b1
parent9f2e1acf83c332752f52c39dad390c94ec2ba9f5 (diff)
downloadfocaccia-qemu-fbba243bc700a4e479331e20544c7f6a41ae87b3.tar.gz
focaccia-qemu-fbba243bc700a4e479331e20544c7f6a41ae87b3.zip
hw/nvme: bump firmware revision
The Linux kernel quirks the QEMU NVMe controller pretty heavily because
of the namespace identifier mess. Since this is now fixed, bump the
firmware revision number to allow the quirk to be disabled for this
revision.

As of now, bump the firmware revision number to be equal to the QEMU
release version number.

Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
-rw-r--r--hw/nvme/ctrl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 909e357a7e..1e6e0fcad9 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -6713,7 +6713,7 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
     id->vid = cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID));
     id->ssvid = cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID));
     strpadcpy((char *)id->mn, sizeof(id->mn), "QEMU NVMe Ctrl", ' ');
-    strpadcpy((char *)id->fr, sizeof(id->fr), "1.0", ' ');
+    strpadcpy((char *)id->fr, sizeof(id->fr), QEMU_VERSION, ' ');
     strpadcpy((char *)id->sn, sizeof(id->sn), n->params.serial, ' ');
 
     id->cntlid = cpu_to_le16(n->cntlid);