diff --git a/CHANGELOG.md b/CHANGELOG.md index ba0e89c77..5e18a99c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -66,6 +66,11 @@ polling until all detachments complete. An existing function `spdk_nvme_detach_async` was updated to add one or more detachments to an active context while it is being polled. +Rename a variable in the member `cmic` of the struct `spdk_nvme_ctrlr_data` from +`multi_host` to `multi_ctrlr`. The variable means that the NVM subsystem may have two or +more controllers if set to 1. However `multi_host` had indicated a particular use case +such that the NVM subsystem is used by multiple hosts. + ### rpc New RPC `bdev_rbd_register_cluster` and `bdev_rbd_unregister_cluster` was added, it allows to create diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c index 6e7294e97..1fddaf054 100644 --- a/examples/nvme/identify/identify.c +++ b/examples/nvme/identify/identify.c @@ -1285,7 +1285,7 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport cdata->ieee[0], cdata->ieee[1], cdata->ieee[2]); printf("Multi-path I/O\n"); printf(" May have multiple subsystem ports: %s\n", cdata->cmic.multi_port ? "Yes" : "No"); - printf(" May be connected to multiple hosts: %s\n", cdata->cmic.multi_host ? "Yes" : "No"); + printf(" May have multiple controllers: %s\n", cdata->cmic.multi_ctrlr ? "Yes" : "No"); printf(" Associated with SR-IOV VF: %s\n", cdata->cmic.sr_iov ? "Yes" : "No"); printf("Max Data Transfer Size: "); if (cdata->mdts == 0) { diff --git a/include/spdk/nvme_spec.h b/include/spdk/nvme_spec.h index d44755819..e534bf8cb 100644 --- a/include/spdk/nvme_spec.h +++ b/include/spdk/nvme_spec.h @@ -1875,7 +1875,7 @@ struct __attribute__((packed)) spdk_nvme_ctrlr_data { /** controller multi-path I/O and namespace sharing capabilities */ struct { uint8_t multi_port : 1; - uint8_t multi_host : 1; + uint8_t multi_ctrlr : 1; uint8_t sr_iov : 1; uint8_t ana_reporting : 1; uint8_t reserved : 4; diff --git a/lib/nvmf/ctrlr.c b/lib/nvmf/ctrlr.c index 98e2a8b84..342126e0c 100644 --- a/lib/nvmf/ctrlr.c +++ b/lib/nvmf/ctrlr.c @@ -2346,7 +2346,7 @@ spdk_nvmf_ctrlr_identify_ctrlr(struct spdk_nvmf_ctrlr *ctrlr, struct spdk_nvme_c cdata->rab = 6; cdata->cmic.multi_port = 1; - cdata->cmic.multi_host = 1; + cdata->cmic.multi_ctrlr = 1; if (subsystem->flags.ana_reporting) { /* Asymmetric Namespace Access Reporting is supported. */ cdata->cmic.ana_reporting = 1; diff --git a/test/external_code/nvme/identify.c b/test/external_code/nvme/identify.c index 640ad17df..e63434669 100644 --- a/test/external_code/nvme/identify.c +++ b/test/external_code/nvme/identify.c @@ -82,7 +82,7 @@ print_controller(struct nvme_ctrlr *ctrlr, const struct spdk_pci_addr *addr) cdata->ieee[0], cdata->ieee[1], cdata->ieee[2]); printf("Multi-path I/O\n"); printf(" May have multiple subsystem ports: %s\n", cdata->cmic.multi_port ? "Yes" : "No"); - printf(" May be connected to multiple hosts: %s\n", cdata->cmic.multi_host ? "Yes" : "No"); + printf(" May have multiple controllers: %s\n", cdata->cmic.multi_ctrlr ? "Yes" : "No"); printf(" Associated with SR-IOV VF: %s\n", cdata->cmic.sr_iov ? "Yes" : "No"); printf("Max Number of Namespaces: %d\n", cdata->nn); if (cdata->ver.raw != 0) {