[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/18] nvme: factor out block backend setup
From: |
Klaus Jensen |
Subject: |
[PATCH v4 11/18] nvme: factor out block backend setup |
Date: |
Wed, 22 Apr 2020 13:01:45 +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 72e838a476af..acdd735e0aca 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1408,6 +1408,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);
@@ -1432,9 +1439,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
- [PATCH v4 00/18] nvme: factor out cmb/pmr setup, Klaus Jensen, 2020/04/22
- [PATCH v4 01/18] nvme: fix pci doorbell size calculation, Klaus Jensen, 2020/04/22
- [PATCH v4 03/18] nvme: remove superfluous breaks, Klaus Jensen, 2020/04/22
- [PATCH v4 10/18] nvme: factor out device state setup, Klaus Jensen, 2020/04/22
- [PATCH v4 11/18] nvme: factor out block backend setup,
Klaus Jensen <=
- [PATCH v4 06/18] nvme: refactor nvme_addr_read, Klaus Jensen, 2020/04/22
- [PATCH v4 04/18] nvme: move device parameters to separate struct, Klaus Jensen, 2020/04/22
- [PATCH v4 02/18] nvme: rename trace events to pci_nvme, Klaus Jensen, 2020/04/22
- [PATCH v4 09/18] nvme: factor out property/constraint checks, Klaus Jensen, 2020/04/22
- [PATCH v4 05/18] nvme: use constants in identify, Klaus Jensen, 2020/04/22
- [PATCH v4 07/18] nvme: add max_ioqpairs device parameter, Klaus Jensen, 2020/04/22
- [PATCH v4 08/18] nvme: remove redundant cmbloc/cmbsz members, Klaus Jensen, 2020/04/22
- [PATCH v4 15/18] nvme: factor out cmb setup, Klaus Jensen, 2020/04/22
- [PATCH v4 14/18] nvme: factor out pci setup, Klaus Jensen, 2020/04/22
- [PATCH v4 12/18] nvme: add namespace helpers, Klaus Jensen, 2020/04/22