[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL for-6.0 v2 04/10] hw/block/nvme: fix warning about legacy namespac
From: |
Klaus Jensen |
Subject: |
[PULL for-6.0 v2 04/10] hw/block/nvme: fix warning about legacy namespace configuration |
Date: |
Wed, 7 Apr 2021 07:46:29 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Remove the unused BlockConf from the controller structure and fix the
constraint checking to actually check the right BlockConf and issue the
warning.
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
---
hw/block/nvme.h | 1 -
hw/block/nvme.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 9edc86d79e98..8d1806cc942f 100644
--- a/hw/block/nvme.h
+++ b/hw/block/nvme.h
@@ -166,7 +166,6 @@ typedef struct NvmeCtrl {
NvmeBar bar;
NvmeParams params;
NvmeBus bus;
- BlockConf conf;
uint16_t cntlid;
bool qs_created;
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 7244534a89e9..09c38fb35e0d 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -5805,7 +5805,7 @@ static void nvme_check_constraints(NvmeCtrl *n, Error
**errp)
params->max_ioqpairs = params->num_queues - 1;
}
- if (n->conf.blk) {
+ if (n->namespace.blkconf.blk) {
warn_report("drive property is deprecated; "
"please use an nvme-ns device instead");
}
--
2.31.1
- [PULL for-6.0 v2 00/10] emulated nvme fixes for -rc3, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 01/10] hw/block/nvme: fix pi constraint check, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 03/10] hw/block/nvme: fix the nsid 'invalid' value, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 02/10] hw/block/nvme: fix missing string representation for ns attachment, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 04/10] hw/block/nvme: fix warning about legacy namespace configuration,
Klaus Jensen <=
- [PULL for-6.0 v2 05/10] hw/block/nvme: update dmsrl limit on namespace detachment, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 06/10] hw/block/nvme: fix handling of private namespaces, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 07/10] hw/block/nvme: add missing copyright headers, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 09/10] hw/block/nvme: fix assert crash in nvme_subsys_ns, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 08/10] hw/block/nvme: fix ns attachment out-of-bounds read, Klaus Jensen, 2021/04/07
- [PULL for-6.0 v2 10/10] hw/block/nvme: fix out-of-bounds read in nvme_subsys_ctrl, Klaus Jensen, 2021/04/07
- Re: [PULL for-6.0 v2 00/10] emulated nvme fixes for -rc3, Peter Maydell, 2021/04/07