get:
Show a patch.

patch:
Update a patch.

put:
Update a patch.

GET /api/1.1/patches/2224901/?format=api
HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 2224901,
    "url": "http://patchwork.ozlabs.org/api/1.1/patches/2224901/?format=api",
    "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260419130139.15554-3-alexander@mihalicyn.com/",
    "project": {
        "id": 14,
        "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api",
        "name": "QEMU Development",
        "link_name": "qemu-devel",
        "list_id": "qemu-devel.nongnu.org",
        "list_email": "qemu-devel@nongnu.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20260419130139.15554-3-alexander@mihalicyn.com>",
    "date": "2026-04-19T13:01:33",
    "name": "[v6,2/8] hw/nvme: add migration blockers for non-supported cases",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "b23dcce2976310e4cee30841c84734c6ee2c17d3",
    "submitter": {
        "id": 81630,
        "url": "http://patchwork.ozlabs.org/api/1.1/people/81630/?format=api",
        "name": "Alexander Mikhalitsyn",
        "email": "alexander@mihalicyn.com"
    },
    "delegate": null,
    "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260419130139.15554-3-alexander@mihalicyn.com/mbox/",
    "series": [
        {
            "id": 500500,
            "url": "http://patchwork.ozlabs.org/api/1.1/series/500500/?format=api",
            "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500500",
            "date": "2026-04-19T13:01:32",
            "name": "hw/nvme: add basic live migration support",
            "version": 6,
            "mbox": "http://patchwork.ozlabs.org/series/500500/mbox/"
        }
    ],
    "comments": "http://patchwork.ozlabs.org/api/patches/2224901/comments/",
    "check": "pending",
    "checks": "http://patchwork.ozlabs.org/api/patches/2224901/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>",
        "X-Original-To": "incoming@patchwork.ozlabs.org",
        "Delivered-To": "patchwork-incoming@legolas.ozlabs.org",
        "Authentication-Results": [
            "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n secure) header.d=mihalicyn.com header.i=@mihalicyn.com header.a=rsa-sha256\n header.s=mihalicyn header.b=M3NbKoxd;\n\tdkim-atps=neutral",
            "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"
        ],
        "Received": [
            "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fz82V6J2rz1yD4\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 19 Apr 2026 23:04:02 +1000 (AEST)",
            "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wERn1-00011D-6o; Sun, 19 Apr 2026 09:02:19 -0400",
            "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <alexander@mihalicyn.com>)\n id 1wERme-0000tj-UI\n for qemu-devel@nongnu.org; Sun, 19 Apr 2026 09:02:00 -0400",
            "from mail-wm1-x329.google.com ([2a00:1450:4864:20::329])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <alexander@mihalicyn.com>)\n id 1wERmX-0008If-Ss\n for qemu-devel@nongnu.org; Sun, 19 Apr 2026 09:01:54 -0400",
            "by mail-wm1-x329.google.com with SMTP id\n 5b1f17b1804b1-488b00ed86fso22799655e9.3\n for <qemu-devel@nongnu.org>; Sun, 19 Apr 2026 06:01:45 -0700 (PDT)",
            "from alex-laptop.lan\n (p200300cf57228c00995e4e0d3496e07b.dip0.t-ipconnect.de.\n [2003:cf:5722:8c00:995e:4e0d:3496:e07b])\n by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-43fe4cc2cacsm20734304f8f.13.2026.04.19.06.01.43\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 19 Apr 2026 06:01:43 -0700 (PDT)"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=mihalicyn.com; s=mihalicyn; t=1776603704; x=1777208504; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=SEO6/lrYdm4dOs+1aF7CdwIzHMn2tXQZYpY2v/1+t2k=;\n b=M3NbKoxdfi7Uy4BiVTE439mbvHPvGCiRr9H3p/m5Ku2eYtfcAFDkUtubz+f82sGkdD\n 13R3atZdMCf9wBgVX3SmrSrlutPUdDbyj2ROHL3Zbdi9z6y1qiApJBShq7Hu+NMdpqFt\n xw8Zdd014efQ4h00RzuZVqb+SlOHSHWFFeDp4=",
        "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776603704; x=1777208504;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=SEO6/lrYdm4dOs+1aF7CdwIzHMn2tXQZYpY2v/1+t2k=;\n b=JsoYMn1+7A/goQSeT+HbO+qdfS19Pz7jGiZlqLYf59kQA6p8VPUL6BzlJznG6YXd4D\n QCi20/z7lO2xiZQ2Tx0mI1x2T30M7ZgB1cYocsW5O0tF5tWsecgyRXTfgJbSV00qXVa2\n n6i6mpeCIN0xVCrr6P458PJUMDNOfUoE8OJzHFJemZkxU17grJ32YtvJ6t73aR9pIxOR\n JusT0lqCQtyOPlUyDLtCZE+DITTIBwnoQWQiJVbYFnvXS//z3/46GKOUbmkeROTbVcIl\n CEl63/mkhchg/axSBLC0eRgzRapK+Q7JmHtpRt+7cCA4d/fzKg/yXQSAB+hOtRAR0kmv\n b4aA==",
        "X-Gm-Message-State": "AOJu0Yw3ZjmPZCYdcqcci1kU78L7rfUqg+pZytuvj1CIZ7ESNNyQ6svB\n Ahx9g7ZYQNTVEnIeZzrFILPsOYJ95qx7/0layeDrSMqi9yulPGCW0JJQeZjiywLMKIYh38EF1tc\n WlfliLus=",
        "X-Gm-Gg": "AeBDiesPH7jyRrlrZPhAYTnlrZjg9jGSF53xkp/hSdW2iJjGMj4Efj3xeo8l0XcNv8E\n +9ZjF+zYdgr/7XoN5KxYlBxqBWLPPXsdjIVRXbHuW2m2aTKIOZ7jL2T4bIQn9rC5y86ntx581Qz\n m79RPnhPSbXvqGhX/5oEbC66UXhmADR03X8fz24yRCsG2ILol2ZjBG/y2BFpu61g6ALuPyknm18\n w4dNTgvqT/UIGBeR+LeCdzqh09H3yx0AFLz4mE0I/IV2cBOT6qtfl7foS/PeqipC2z5wKJ5QD3K\n 3i570YGWaecXaDy37Zw1XtvbChEHlxsaDOE7F3BCg/X2nHiWo4yQlr6XApcorccs96rta+BJ+mS\n UCGa9XXAO8GyRLOLH+S6oXL3ELfLL7DymneZht4wASxcegad5V2al7dhd83kxZom5BpSrg69eXb\n Zv6n3IFBS3r+4heFUxTOPMNWtCaBOxN8NH1rBQLXQMZYshnCV2L2/8YQpLNKfz+QO1WWTi/gIoF\n q62K02Ia9urn9udm99xqVv6USUckrh67w==",
        "X-Received": "by 2002:a05:600c:5295:b0:485:30d4:6b9e with SMTP id\n 5b1f17b1804b1-488fb77facemr148012285e9.21.1776603704434;\n Sun, 19 Apr 2026 06:01:44 -0700 (PDT)",
        "From": "Alexander Mikhalitsyn <alexander@mihalicyn.com>",
        "To": "qemu-devel@nongnu.org",
        "Cc": "Alexander Mikhalitsyn <alexander@mihalicyn.com>,\n Kevin Wolf <kwolf@redhat.com>, qemu-block@nongnu.org,\n Fam Zheng <fam@euphon.net>,\n =?utf-8?q?St=C3=A9phane_Graber?= <stgraber@stgraber.org>, =?utf-8?q?Philipp?=\n\t=?utf-8?q?e_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Paolo Bonzini <pbonzini@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>,\n Laurent Vivier <lvivier@redhat.com>, Jesper Devantier <foss@defmacro.it>,\n Klaus Jensen <its@irrelevant.dk>, Fabiano Rosas <farosas@suse.de>,\n Zhao Liu <zhao1.liu@intel.com>, Keith Busch <kbusch@kernel.org>,\n Peter Xu <peterx@redhat.com>, Hanna Reitz <hreitz@redhat.com>,\n Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>",
        "Subject": "[PATCH v6 2/8] hw/nvme: add migration blockers for non-supported\n cases",
        "Date": "Sun, 19 Apr 2026 15:01:33 +0200",
        "Message-ID": "<20260419130139.15554-3-alexander@mihalicyn.com>",
        "X-Mailer": "git-send-email 2.47.3",
        "In-Reply-To": "<20260419130139.15554-1-alexander@mihalicyn.com>",
        "References": "<20260419130139.15554-1-alexander@mihalicyn.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Received-SPF": "pass client-ip=2a00:1450:4864:20::329;\n envelope-from=alexander@mihalicyn.com; helo=mail-wm1-x329.google.com",
        "X-Spam_score_int": "-20",
        "X-Spam_score": "-2.1",
        "X-Spam_bar": "--",
        "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no",
        "X-Spam_action": "no action",
        "X-BeenThere": "qemu-devel@nongnu.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "qemu development <qemu-devel.nongnu.org>",
        "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>",
        "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>",
        "List-Post": "<mailto:qemu-devel@nongnu.org>",
        "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>",
        "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>",
        "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org",
        "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"
    },
    "content": "From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>\n\nLet's block migration for cases we don't support:\n- SR-IOV\n- CMB\n- PMR\n- SPDM\n\nNo functional changes here, because NVMe migration is\nnot supported at all as of this commit.\n\nSigned-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>\n---\n hw/nvme/ctrl.c       | 206 +++++++++++++++++++++++++++++++++++++++++++\n hw/nvme/nvme.h       |   3 +\n include/block/nvme.h |  12 +++\n 3 files changed, 221 insertions(+)",
    "diff": "diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c\nindex cc4593cd427..9f9c9bcbead 100644\n--- a/hw/nvme/ctrl.c\n+++ b/hw/nvme/ctrl.c\n@@ -207,6 +207,7 @@\n #include \"hw/pci/msix.h\"\n #include \"hw/pci/pcie_sriov.h\"\n #include \"system/spdm-socket.h\"\n+#include \"migration/blocker.h\"\n #include \"migration/vmstate.h\"\n \n #include \"nvme.h\"\n@@ -250,6 +251,7 @@ static const bool nvme_feature_support[NVME_FID_MAX] = {\n     [NVME_COMMAND_SET_PROFILE]      = true,\n     [NVME_FDP_MODE]                 = true,\n     [NVME_FDP_EVENTS]               = true,\n+    /* if you add something here, please update nvme_set_migration_blockers() */\n };\n \n static const uint32_t nvme_feature_cap[NVME_FID_MAX] = {\n@@ -4601,6 +4603,7 @@ static uint16_t nvme_io_mgmt_send(NvmeCtrl *n, NvmeRequest *req)\n         return 0;\n     case NVME_IOMS_MO_RUH_UPDATE:\n         return nvme_io_mgmt_send_ruh_update(n, req);\n+    /* if you add something here, please update nvme_set_migration_blockers() */\n     default:\n         return NVME_INVALID_FIELD | NVME_DNR;\n     };\n@@ -7518,6 +7521,10 @@ static uint16_t nvme_security_receive(NvmeCtrl *n, NvmeRequest *req)\n \n static uint16_t nvme_directive_send(NvmeCtrl *n, NvmeRequest *req)\n {\n+    /*\n+     * When adding a new dtype handling here,\n+     * please also update nvme_set_migration_blockers().\n+     */\n     return NVME_INVALID_FIELD | NVME_DNR;\n }\n \n@@ -9208,6 +9215,199 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)\n     }\n }\n \n+#define BLOCKER_FEATURES_MAX_LEN 256\n+\n+static inline void nvme_add_blocker_feature(char *blocker_features, const char *feature)\n+{\n+    if (strlen(blocker_features) > 0) {\n+        g_strlcat(blocker_features, \", \", BLOCKER_FEATURES_MAX_LEN);\n+    }\n+    g_strlcat(blocker_features, feature, BLOCKER_FEATURES_MAX_LEN);\n+}\n+\n+static bool nvme_set_migration_blockers(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp)\n+{\n+    uint64_t unsupported_cap, cap = ldq_le_p(&n->bar.cap);\n+    char blocker_features[BLOCKER_FEATURES_MAX_LEN] = \"\";\n+    bool adm_cmd_security_checked = false;\n+    bool cmd_io_mgmt_checked = false;\n+    bool cmd_zone_checked = false;\n+\n+    /*\n+     * Idea of this function is simple, we iterate over all Command Sets and\n+     * for each supported command we provide a special handling logic to\n+     * determine if we should block migration or not.\n+     *\n+     * For instance, we have NVME_ADM_CMD_NS_ATTACHMENT and it is always\n+     * available to the guest, but if there is only 1 namespace, then it is\n+     * safe to allow migration, but if there are more, then we need to block\n+     * migration because we don't handle this in migration code yet.\n+     */\n+    for (int opcode = 0; opcode < sizeof(n->cse.acs) / sizeof(n->cse.acs[0]); opcode++) {\n+        /* Is command supported? */\n+        if (!n->cse.acs[opcode]) {\n+            continue;\n+        }\n+\n+        switch (opcode) {\n+        case NVME_ADM_CMD_DELETE_SQ:\n+        case NVME_ADM_CMD_CREATE_SQ:\n+        case NVME_ADM_CMD_GET_LOG_PAGE:\n+        case NVME_ADM_CMD_DELETE_CQ:\n+        case NVME_ADM_CMD_CREATE_CQ:\n+        case NVME_ADM_CMD_IDENTIFY:\n+        case NVME_ADM_CMD_ABORT:\n+        case NVME_ADM_CMD_SET_FEATURES:\n+        case NVME_ADM_CMD_GET_FEATURES:\n+        case NVME_ADM_CMD_ASYNC_EV_REQ:\n+        case NVME_ADM_CMD_DBBUF_CONFIG:\n+        case NVME_ADM_CMD_FORMAT_NVM:\n+        case NVME_ADM_CMD_DIRECTIVE_SEND:\n+        case NVME_ADM_CMD_DIRECTIVE_RECV:\n+            break;\n+        case NVME_ADM_CMD_NS_ATTACHMENT:\n+            int namespaces_num = 0;\n+            for (int i = 1; i <= NVME_MAX_NAMESPACES; i++) {\n+                NvmeNamespace *ns = nvme_subsys_ns(n->subsys, i);\n+                if (!ns) {\n+                    continue;\n+                }\n+\n+                namespaces_num++;\n+            }\n+\n+            if (namespaces_num > 1) {\n+                nvme_add_blocker_feature(blocker_features, \"Namespace Attachment\");\n+            }\n+\n+            break;\n+        case NVME_ADM_CMD_VIRT_MNGMT:\n+            if (n->params.sriov_max_vfs) {\n+                nvme_add_blocker_feature(blocker_features, \"SR-IOV\");\n+            }\n+\n+            break;\n+        case NVME_ADM_CMD_SECURITY_SEND:\n+        case NVME_ADM_CMD_SECURITY_RECV:\n+            if (adm_cmd_security_checked) {\n+                break;\n+            }\n+\n+            if (pci_dev->spdm_port) {\n+                nvme_add_blocker_feature(blocker_features, \"SPDM\");\n+            }\n+\n+            adm_cmd_security_checked = true;\n+\n+            break;\n+        default:\n+            g_assert_not_reached();\n+        }\n+    }\n+\n+    for (int opcode = 0; opcode < sizeof(n->cse.iocs.nvm) / sizeof(n->cse.iocs.nvm[0]); opcode++) {\n+        if (!n->cse.iocs.nvm[opcode]) {\n+            continue;\n+        }\n+\n+        switch (opcode) {\n+        case NVME_CMD_FLUSH:\n+        case NVME_CMD_WRITE:\n+        case NVME_CMD_READ:\n+        case NVME_CMD_COMPARE:\n+        case NVME_CMD_WRITE_ZEROES:\n+        case NVME_CMD_DSM:\n+        case NVME_CMD_VERIFY:\n+        case NVME_CMD_COPY:\n+            break;\n+        case NVME_CMD_IO_MGMT_RECV:\n+        case NVME_CMD_IO_MGMT_SEND:\n+            if (cmd_io_mgmt_checked) {\n+                break;\n+            }\n+\n+            /* check for NVME_IOMS_MO_RUH_UPDATE */\n+            if (n->subsys->params.fdp.enabled) {\n+                nvme_add_blocker_feature(blocker_features, \"FDP\");\n+            }\n+\n+            cmd_io_mgmt_checked = true;\n+\n+            break;\n+        default:\n+            g_assert_not_reached();\n+        }\n+    }\n+\n+    for (int opcode = 0; opcode < sizeof(n->cse.iocs.zoned) / sizeof(n->cse.iocs.zoned[0]); opcode++) {\n+        /*\n+         * If command isn't supported or we have the same command\n+         * in n->cse.iocs.nvm, then we can skip it here.\n+         */\n+        if (!n->cse.iocs.zoned[opcode] || n->cse.iocs.nvm[opcode]) {\n+            continue;\n+        }\n+\n+        switch (opcode) {\n+        case NVME_CMD_ZONE_APPEND:\n+        case NVME_CMD_ZONE_MGMT_SEND:\n+        case NVME_CMD_ZONE_MGMT_RECV:\n+            if (cmd_zone_checked) {\n+                break;\n+            }\n+\n+            for (int i = 1; i <= NVME_MAX_NAMESPACES; i++) {\n+                NvmeNamespace *ns = nvme_subsys_ns(n->subsys, i);\n+                if (!ns) {\n+                    continue;\n+                }\n+\n+                if (ns->params.zoned) {\n+                    nvme_add_blocker_feature(blocker_features, \"Zoned Namespace\");\n+                    break;\n+                }\n+            }\n+\n+            cmd_zone_checked = true;\n+\n+            break;\n+        default:\n+            g_assert_not_reached();\n+        }\n+    }\n+\n+    /*\n+     * Try our best to explicitly detect all not supported caps,\n+     * to let users know what features cause migration to be blocked,\n+     * but in case we miss handling here, everything else will be\n+     * covered by unsupported_cap check.\n+     */\n+    if (NVME_CAP_CMBS(cap)) {\n+        nvme_add_blocker_feature(blocker_features, \"CMB\");\n+        cap &= ~((uint64_t)CAP_CMBS_MASK << CAP_CMBS_SHIFT);\n+    }\n+\n+    if (NVME_CAP_PMRS(cap)) {\n+        nvme_add_blocker_feature(blocker_features, \"PMR\");\n+        cap &= ~((uint64_t)CAP_PMRS_MASK << CAP_PMRS_SHIFT);\n+    }\n+\n+    unsupported_cap = cap & ~NVME_MIGRATION_SUPPORTED_CAP_BITS;\n+    if (unsupported_cap) {\n+        nvme_add_blocker_feature(blocker_features, \"unknown capability\");\n+    }\n+\n+    assert(n->migration_blocker == NULL);\n+    if (strlen(blocker_features) > 0) {\n+        error_setg(&n->migration_blocker, \"Migration is not supported for %s\", blocker_features);\n+        if (migrate_add_blocker(&n->migration_blocker, errp) < 0) {\n+            return false;\n+        }\n+    }\n+\n+    return true;\n+}\n+\n static int nvme_init_subsys(NvmeCtrl *n, Error **errp)\n {\n     int cntlid;\n@@ -9313,6 +9513,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)\n \n         n->subsys->namespaces[ns->params.nsid] = ns;\n     }\n+\n+    if (!nvme_set_migration_blockers(n, pci_dev, errp)) {\n+        return;\n+    }\n }\n \n static void nvme_exit(PCIDevice *pci_dev)\n@@ -9365,6 +9569,8 @@ static void nvme_exit(PCIDevice *pci_dev)\n     }\n \n     memory_region_del_subregion(&n->bar0, &n->iomem);\n+\n+    migrate_del_blocker(&n->migration_blocker);\n }\n \n static const Property nvme_props[] = {\ndiff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h\nindex d66f7dc82d5..457b6637249 100644\n--- a/hw/nvme/nvme.h\n+++ b/hw/nvme/nvme.h\n@@ -666,6 +666,9 @@ typedef struct NvmeCtrl {\n \n     /* Socket mapping to SPDM over NVMe Security In/Out commands */\n     int spdm_socket;\n+\n+    /* Migration-related stuff */\n+    Error *migration_blocker;\n } NvmeCtrl;\n \n typedef enum NvmeResetType {\ndiff --git a/include/block/nvme.h b/include/block/nvme.h\nindex 9d7159ed7a7..a7f586fc801 100644\n--- a/include/block/nvme.h\n+++ b/include/block/nvme.h\n@@ -141,6 +141,18 @@ enum NvmeCapMask {\n #define NVME_CAP_SET_CMBS(cap, val)   \\\n     ((cap) |= (uint64_t)((val) & CAP_CMBS_MASK)   << CAP_CMBS_SHIFT)\n \n+#define NVME_MIGRATION_SUPPORTED_CAP_BITS ( \\\n+      ((uint64_t)CAP_MQES_MASK   << CAP_MQES_SHIFT)   \\\n+    | ((uint64_t)CAP_CQR_MASK    << CAP_CQR_SHIFT)    \\\n+    | ((uint64_t)CAP_AMS_MASK    << CAP_AMS_SHIFT)    \\\n+    | ((uint64_t)CAP_TO_MASK     << CAP_TO_SHIFT)     \\\n+    | ((uint64_t)CAP_DSTRD_MASK  << CAP_DSTRD_SHIFT)  \\\n+    | ((uint64_t)CAP_NSSRS_MASK  << CAP_NSSRS_SHIFT)  \\\n+    | ((uint64_t)CAP_CSS_MASK    << CAP_CSS_SHIFT)    \\\n+    | ((uint64_t)CAP_MPSMIN_MASK << CAP_MPSMIN_SHIFT) \\\n+    | ((uint64_t)CAP_MPSMAX_MASK << CAP_MPSMAX_SHIFT) \\\n+)\n+\n enum NvmeCapCss {\n     NVME_CAP_CSS_NCSS    = 1 << 0,\n     NVME_CAP_CSS_IOCSS   = 1 << 6,\n",
    "prefixes": [
        "v6",
        "2/8"
    ]
}