On Wed, 2020-04-15 at 15:01 +0200, Klaus Jensen wrote: > From: Klaus Jensen <k.jen...@samsung.com> > > Signed-off-by: Klaus Jensen <k.jen...@samsung.com> > --- > hw/block/nvme.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index 45a352b63d89..80da0825d295 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -1351,6 +1351,13 @@ static void nvme_init_state(NvmeCtrl *n) > n->cq = g_new0(NvmeCQueue *, n->params.max_ioqpairs + 1); > } > > +static void nvme_init_blk(NvmeCtrl *n, Error **errp) > +{ > + blkconf_blocksizes(&n->conf); > + blkconf_apply_backend_options(&n->conf, blk_is_read_only(n->conf.blk), > + false, errp); > +} > + > static void nvme_realize(PCIDevice *pci_dev, Error **errp) > { > NvmeCtrl *n = NVME(pci_dev); > @@ -1375,9 +1382,9 @@ static void nvme_realize(PCIDevice *pci_dev, Error > **errp) > return; > } > > - blkconf_blocksizes(&n->conf); > - if (!blkconf_apply_backend_options(&n->conf, > blk_is_read_only(n->conf.blk), > - false, errp)) { > + nvme_init_blk(n, &err); > + if (err) { > + error_propagate(errp, err); > return; > } >
Reviewed-by: Maxim Levitsky <mlevi...@redhat.com> Best regards, Maxim Levitsky