From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fg2j2-0006X6-Dy for qemu-devel@nongnu.org; Thu, 19 Jul 2018 02:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fg2j1-00010H-Ds for qemu-devel@nongnu.org; Thu, 19 Jul 2018 02:47:44 -0400 Date: Thu, 19 Jul 2018 14:47:34 +0800 From: Fam Zheng Message-ID: <20180719064734.GC29900@lemon.usersys.redhat.com> References: <20180719043239.GA22006@bogon.didichuxing.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180719043239.GA22006@bogon.didichuxing.com> Subject: Re: [Qemu-devel] [PATCH] hw/block/nvme: add optional parameter num_namespaces for nvme device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Weiping Zhang Cc: keith.busch@intel.com, qemu-devel@nongnu.org, qemu-block@nongnu.org On Thu, 07/19 12:33, Weiping Zhang wrote: > Add an optional paramter num_namespaces for device, and set it > to 1 by default. > > Signed-off-by: Weiping Zhang > --- > hw/block/nvme.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 156ecf3c41..b53be4b5c0 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -19,7 +19,7 @@ > * -drive file=,if=none,id= > * -device nvme,drive=,serial=,id=, \ > * cmb_size_mb=, \ > - * num_queues= > + * num_queues=,num_namespaces= > * > * Note cmb_size_mb denotes size of CMB in MB. CMB is assumed to be at > * offset 0 in BAR2 and supports only WDS, RDS and SQS for now. > @@ -1232,7 +1232,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp) > pci_config_set_class(pci_dev->config, PCI_CLASS_STORAGE_EXPRESS); > pcie_endpoint_cap_init(&n->parent_obj, 0x80); > > - n->num_namespaces = 1; > n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4); > n->ns_size = bs_size / (uint64_t)n->num_namespaces; > > @@ -1342,6 +1341,7 @@ static Property nvme_props[] = { > DEFINE_PROP_STRING("serial", NvmeCtrl, serial), > DEFINE_PROP_UINT32("cmb_size_mb", NvmeCtrl, cmb_size_mb, 0), > DEFINE_PROP_UINT32("num_queues", NvmeCtrl, num_queues, 64), > + DEFINE_PROP_UINT32("num_namespaces", NvmeCtrl, num_namespaces, 1), You need to verify the user provided value. At least 0xFFFFFFFF is the broadcast value and shouldn't be used, and 0 doesn't make much sense too, I guess. > DEFINE_PROP_END_OF_LIST(), > }; > > -- > 2.14.1 > > I think the data_offset calculations in nvme_rw need some changes too? Fam