From f447f92c886576ebc7e2354e3af443760966e514 Mon Sep 17 00:00:00 2001 From: Klaus Jensen Date: Tue, 23 Mar 2021 22:12:36 +0100 Subject: [PATCH] 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 Reviewed-by: Gollu Appalanaidu --- hw/block/nvme.c | 5 ----- hw/block/nvme.h | 1 - 2 files changed, 6 deletions(-) diff --git a/hw/block/nvme.c b/hw/block/nvme.c index 7244534a89..5911adcf57 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 9edc86d79e..8d1806cc94 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; -- 2.11.0