summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2026-07-07 07:09:37 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2026-07-07 07:09:38 +0200
commit916ab315cc2b3a3825ebb399d83339660144d5bd (patch)
tree5c10ccbe26ad72dfcd15888d3e1d95607848e90a /include
parent94826ec1370328375c3b6d1e80fdc94c8f46c348 (diff)
parentcfb6c95706998be9a6606d80e03f088c0f5b7b42 (diff)
downloadqemu-master.tar.gz
qemu-master.zip
Merge tag 'pull-nvme-20260707' of https://gitlab.com/birkelund/qemu into stagingHEADmaster
nvme queue # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEUigzqnXi3OaiR2bATeGvMW1PDekFAmpML5AACgkQTeGvMW1P # DekLeAf+JsOqQZ8rowk6ysUG4bp7Yy72vyIs05mOKrXsIEb1N3KpYAL10qs3Psl/ # /P37sBw51mbkgovpUgEV+J3kamCF/+8li1lgpsMV8HwbiO0QqQUMXPMGHWwA4CmF # 3dkZWYP9xKjU/o9tdzSJ5F8hX372leu+z8FHslhK/XIlopRWeRaH/HxrEjZvKuIr # ETPpVwffuAgM2hpi7/ekQhIxWz9nBvP/+fz57AHnj70O2Cl01JQm2PZrVX976C54 # o8j+Uz0DQup/lXunk83t1snJcYNNB/vbVPlUlF0nX/oQCiZ85SN8GqXblZPvELB9 # AzeYXmhxMWYrgf2eiqrqPl8xw1QvGg== # =wZBE # -----END PGP SIGNATURE----- # gpg: Signature made Tue 07 Jul 2026 00:43:28 CEST # gpg: using RSA key 522833AA75E2DCE6A24766C04DE1AF316D4F0DE9 # gpg: Good signature from "Klaus Jensen <its@irrelevant.dk>" [unknown] # gpg: aka "Klaus Jensen <k.jensen@samsung.com>" [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: DDCA 4D9C 9EF9 31CC 3468 4272 63D5 6FC5 E55D A838 # Subkey fingerprint: 5228 33AA 75E2 DCE6 A247 66C0 4DE1 AF31 6D4F 0DE9 * tag 'pull-nvme-20260707' of https://gitlab.com/birkelund/qemu: hw/nvme: add namespace hotplug support tests/qtest/nvme-test: add migration test with full CQ tests/functional/x86_64: add migration test for NVMe device hw/nvme: add basic live migration support hw/nvme: unmap req->sg earlier in nvme_enqueue_req_completion hw/nvme: set CQE.sq_id earlier in nvme_process_sq hw/nvme: split nvme_init_sq/nvme_init_cq into helpers hw/nvme: add migration blockers for non-supported cases tests/functional/migration: add VM launch/configure hooks hw/nvme: ensure sgl forward progress hw/nvme: fix FDP set FDP events Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/block/nvme.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/include/block/nvme.h b/include/block/nvme.h
index e4e7be5120..17a7c7818d 100644
--- a/include/block/nvme.h
+++ b/include/block/nvme.h
@@ -141,6 +141,18 @@ enum NvmeCapMask {
#define NVME_CAP_SET_CMBS(cap, val) \
((cap) |= (uint64_t)((val) & CAP_CMBS_MASK) << CAP_CMBS_SHIFT)
+#define NVME_MIGRATION_SUPPORTED_CAP_BITS ( \
+ ((uint64_t)CAP_MQES_MASK << CAP_MQES_SHIFT) \
+ | ((uint64_t)CAP_CQR_MASK << CAP_CQR_SHIFT) \
+ | ((uint64_t)CAP_AMS_MASK << CAP_AMS_SHIFT) \
+ | ((uint64_t)CAP_TO_MASK << CAP_TO_SHIFT) \
+ | ((uint64_t)CAP_DSTRD_MASK << CAP_DSTRD_SHIFT) \
+ | ((uint64_t)CAP_NSSRS_MASK << CAP_NSSRS_SHIFT) \
+ | ((uint64_t)CAP_CSS_MASK << CAP_CSS_SHIFT) \
+ | ((uint64_t)CAP_MPSMIN_MASK << CAP_MPSMIN_SHIFT) \
+ | ((uint64_t)CAP_MPSMAX_MASK << CAP_MPSMAX_SHIFT) \
+)
+
enum NvmeCapCss {
NVME_CAP_CSS_NCSS = 1 << 0,
NVME_CAP_CSS_IOCSS = 1 << 6,