[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-6.1 01/11] hw/nvme: remove NvmeCtrl parameter from ns setup/ch
From: |
Klaus Jensen |
Subject: |
[PULL for-6.1 01/11] hw/nvme: remove NvmeCtrl parameter from ns setup/check functions |
Date: |
Mon, 26 Jul 2021 21:18:51 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
The nvme_ns_setup and nvme_ns_check_constraints should not depend on the
controller state. Refactor and remove it.
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
---
hw/nvme/nvme.h | 2 +-
hw/nvme/ctrl.c | 2 +-
hw/nvme/ns.c | 37 ++++++++++++++++++-------------------
3 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/hw/nvme/nvme.h b/hw/nvme/nvme.h
index 56f8eceed2ad..0868359a1e86 100644
--- a/hw/nvme/nvme.h
+++ b/hw/nvme/nvme.h
@@ -246,7 +246,7 @@ static inline void nvme_aor_dec_active(NvmeNamespace *ns)
}
void nvme_ns_init_format(NvmeNamespace *ns);
-int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error **errp);
+int nvme_ns_setup(NvmeNamespace *ns, Error **errp);
void nvme_ns_drain(NvmeNamespace *ns);
void nvme_ns_shutdown(NvmeNamespace *ns);
void nvme_ns_cleanup(NvmeNamespace *ns);
diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
index 629b0d38c2a2..dd1801510032 100644
--- a/hw/nvme/ctrl.c
+++ b/hw/nvme/ctrl.c
@@ -6498,7 +6498,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
ns = &n->namespace;
ns->params.nsid = 1;
- if (nvme_ns_setup(n, ns, errp)) {
+ if (nvme_ns_setup(ns, errp)) {
return;
}
diff --git a/hw/nvme/ns.c b/hw/nvme/ns.c
index 4275c3db6301..3c4f5b8c714a 100644
--- a/hw/nvme/ns.c
+++ b/hw/nvme/ns.c
@@ -346,8 +346,7 @@ static void nvme_zoned_ns_shutdown(NvmeNamespace *ns)
assert(ns->nr_open_zones == 0);
}
-static int nvme_ns_check_constraints(NvmeCtrl *n, NvmeNamespace *ns,
- Error **errp)
+static int nvme_ns_check_constraints(NvmeNamespace *ns, Error **errp)
{
if (!ns->blkconf.blk) {
error_setg(errp, "block backend not configured");
@@ -366,20 +365,6 @@ static int nvme_ns_check_constraints(NvmeCtrl *n,
NvmeNamespace *ns,
return -1;
}
- if (!n->subsys) {
- if (ns->params.detached) {
- error_setg(errp, "detached requires that the nvme device is "
- "linked to an nvme-subsys device");
- return -1;
- }
-
- if (ns->params.shared) {
- error_setg(errp, "shared requires that the nvme device is "
- "linked to an nvme-subsys device");
- return -1;
- }
- }
-
if (ns->params.zoned) {
if (ns->params.max_active_zones) {
if (ns->params.max_open_zones > ns->params.max_active_zones) {
@@ -411,9 +396,9 @@ static int nvme_ns_check_constraints(NvmeCtrl *n,
NvmeNamespace *ns,
return 0;
}
-int nvme_ns_setup(NvmeCtrl *n, NvmeNamespace *ns, Error **errp)
+int nvme_ns_setup(NvmeNamespace *ns, Error **errp)
{
- if (nvme_ns_check_constraints(n, ns, errp)) {
+ if (nvme_ns_check_constraints(ns, errp)) {
return -1;
}
@@ -465,7 +450,21 @@ static void nvme_ns_realize(DeviceState *dev, Error **errp)
uint32_t nsid = ns->params.nsid;
int i;
- if (nvme_ns_setup(n, ns, errp)) {
+ if (!n->subsys) {
+ if (ns->params.detached) {
+ error_setg(errp, "detached requires that the nvme device is "
+ "linked to an nvme-subsys device");
+ return;
+ }
+
+ if (ns->params.shared) {
+ error_setg(errp, "shared requires that the nvme device is "
+ "linked to an nvme-subsys device");
+ return;
+ }
+ }
+
+ if (nvme_ns_setup(ns, errp)) {
return;
}
--
2.32.0
- [PULL for-6.1 00/11] hw/nvme fixes, Klaus Jensen, 2021/07/26
- [PULL for-6.1 01/11] hw/nvme: remove NvmeCtrl parameter from ns setup/check functions,
Klaus Jensen <=
- [PULL for-6.1 02/11] hw/nvme: mark nvme-subsys non-hotpluggable, Klaus Jensen, 2021/07/26
- [PULL for-6.1 03/11] hw/nvme: unregister controller with subsystem at exit, Klaus Jensen, 2021/07/26
- [PULL for-6.1 04/11] hw/nvme: error handling for too many mappings, Klaus Jensen, 2021/07/26
- [PULL for-6.1 05/11] tests/qtest/nvme-test: add persistent memory region test, Klaus Jensen, 2021/07/26
- [PULL for-6.1 06/11] hw/nvme: fix controller hot unplugging, Klaus Jensen, 2021/07/26
- [PULL for-6.1 07/11] hw/nvme: split pmrmsc register into upper and lower, Klaus Jensen, 2021/07/26
- [PULL for-6.1 08/11] hw/nvme: use symbolic names for registers, Klaus Jensen, 2021/07/26
- [PULL for-6.1 09/11] hw/nvme: fix out-of-bounds reads, Klaus Jensen, 2021/07/26
- [PULL for-6.1 10/11] hw/nvme: fix mmio read, Klaus Jensen, 2021/07/26
- [PULL for-6.1 11/11] tests/qtest/nvme-test: add mmio read test, Klaus Jensen, 2021/07/26