[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 13/20] hw/block/nvme: factor out block backend setup
From: |
Klaus Jensen |
Subject: |
[PATCH v6 13/20] hw/block/nvme: factor out block backend setup |
Date: |
Thu, 14 May 2020 06:46:04 +0200 |
From: Klaus Jensen <address@hidden>
Signed-off-by: Klaus Jensen <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: Keith Busch <address@hidden>
---
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 617b2f0005df..c83f0bb1ab20 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1412,6 +1412,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);
@@ -1436,9 +1443,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, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
return;
}
--
2.26.2
- Re: [PATCH v6 07/20] hw/block/nvme: fix pin-based interrupt behavior, (continued)
- [PATCH v6 10/20] hw/block/nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/05/14
- [PATCH v6 06/20] hw/block/nvme: refactor nvme_addr_read, Klaus Jensen, 2020/05/14
- [PATCH v6 05/20] hw/block/nvme: use constants in identify, Klaus Jensen, 2020/05/14
- [PATCH v6 12/20] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/05/14
- [PATCH v6 11/20] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/05/14
- [PATCH v6 16/20] hw/block/nvme: factor out pci setup, Klaus Jensen, 2020/05/14
- [PATCH v6 19/20] hw/block/nvme: do cmb/pmr init as part of pci init, Klaus Jensen, 2020/05/14
- [PATCH v6 20/20] hw/block/nvme: factor out controller identify setup, Klaus Jensen, 2020/05/14
- [PATCH v6 13/20] hw/block/nvme: factor out block backend setup,
Klaus Jensen <=
- [PATCH v6 14/20] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/05/14
- [PATCH v6 15/20] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/05/14
- [PATCH v6 17/20] hw/block/nvme: factor out cmb setup, Klaus Jensen, 2020/05/14
- [PATCH v6 18/20] hw/block/nvme: factor out pmr setup, Klaus Jensen, 2020/05/14