qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Klaus Jensen <its@irrelevant.dk>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Fam Zheng <fam@euphon.net>,
	qemu-block@nongnu.org, Klaus Jensen <k.jensen@samsung.com>,
	Gollu Appalanaidu <anaidu.gollu@samsung.com>,
	Max Reitz <mreitz@redhat.com>, Klaus Jensen <its@irrelevant.dk>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Keith Busch <kbusch@kernel.org>
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	[thread overview]
Message-ID: <20210407054635.189440-5-its@irrelevant.dk> (raw)
In-Reply-To: <20210407054635.189440-1-its@irrelevant.dk>

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



  parent reply	other threads:[~2021-04-07  5:58 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-07  5:46 [PULL for-6.0 v2 00/10] emulated nvme fixes for -rc3 Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 01/10] hw/block/nvme: fix pi constraint check Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 02/10] hw/block/nvme: fix missing string representation for ns attachment Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 03/10] hw/block/nvme: fix the nsid 'invalid' value Klaus Jensen
2021-04-07  5:46 ` Klaus Jensen [this message]
2021-04-07  5:46 ` [PULL for-6.0 v2 05/10] hw/block/nvme: update dmsrl limit on namespace detachment Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 06/10] hw/block/nvme: fix handling of private namespaces Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 07/10] hw/block/nvme: add missing copyright headers Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 08/10] hw/block/nvme: fix ns attachment out-of-bounds read Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 09/10] hw/block/nvme: fix assert crash in nvme_subsys_ns Klaus Jensen
2021-04-07  5:46 ` [PULL for-6.0 v2 10/10] hw/block/nvme: fix out-of-bounds read in nvme_subsys_ctrl Klaus Jensen
2021-04-07  8:03 ` [PULL for-6.0 v2 00/10] emulated nvme fixes for -rc3 Peter Maydell
2021-04-07  8:45   ` Klaus Jensen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210407054635.189440-5-its@irrelevant.dk \
    --to=its@irrelevant.dk \
    --cc=anaidu.gollu@samsung.com \
    --cc=fam@euphon.net \
    --cc=k.jensen@samsung.com \
    --cc=kbusch@kernel.org \
    --cc=kwolf@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --subject='Re: [PULL for-6.0 v2 04/10] hw/block/nvme: fix warning about legacy namespace configuration' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox