aboutsummaryrefslogtreecommitdiff
path: root/hw/block
diff options
context:
space:
mode:
authorKlaus Jensen <k.jensen@samsung.com>2021-03-23 22:12:36 +0100
committerKlaus Jensen <k.jensen@samsung.com>2021-04-07 10:46:47 +0200
commitf447f92c886576ebc7e2354e3af443760966e514 (patch)
tree2188cfd7ef9b8d09a3bfa27268726bcb0660a1da /hw/block
parentdae8be368e7b9ad36bc8af1cd365d28b199a6502 (diff)
downloadqemu-f447f92c886576ebc7e2354e3af443760966e514.zip
qemu-f447f92c886576ebc7e2354e3af443760966e514.tar.gz
qemu-f447f92c886576ebc7e2354e3af443760966e514.tar.bz2
hw/block/nvme: fix warning about legacy namespace configuration
Remove the unused BlockConf from the controller structure and remove the noop constraint checking. Device works just fine with both legacy drive parameter namespace and nvme-ns namespace definitions. Signed-off-by: Klaus Jensen <k.jensen@samsung.com> Reviewed-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Diffstat (limited to 'hw/block')
-rw-r--r--hw/block/nvme.c5
-rw-r--r--hw/block/nvme.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 7244534..5911adc 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -5805,11 +5805,6 @@ static void nvme_check_constraints(NvmeCtrl *n, Error **errp)
params->max_ioqpairs = params->num_queues - 1;
}
- if (n->conf.blk) {
- warn_report("drive property is deprecated; "
- "please use an nvme-ns device instead");
- }
-
if (params->max_ioqpairs < 1 ||
params->max_ioqpairs > NVME_MAX_IOQPAIRS) {
error_setg(errp, "max_ioqpairs must be between 1 and %d",
diff --git a/hw/block/nvme.h b/hw/block/nvme.h
index 9edc86d..8d1806c 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;