[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 19/22] hw/block/nvme: factor out controller identify setup
From: |
Klaus Jensen |
Subject: |
[PATCH v7 19/22] hw/block/nvme: factor out controller identify setup |
Date: |
Tue, 9 Jun 2020 21:03:30 +0200 |
From: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200514044611.734782-21-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
hw/block/nvme.c | 49 ++++++++++++++++++++++++++-----------------------
1 file changed, 26 insertions(+), 23 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 02a6a97df925..e10fc774fc34 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1533,32 +1533,11 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice
*pci_dev)
}
}
-static void nvme_realize(PCIDevice *pci_dev, Error **errp)
+static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
{
- NvmeCtrl *n = NVME(pci_dev);
NvmeIdCtrl *id = &n->id_ctrl;
- Error *local_err = NULL;
+ uint8_t *pci_conf = pci_dev->config;
- int i;
- uint8_t *pci_conf;
-
- nvme_check_constraints(n, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
-
- nvme_init_state(n);
-
- nvme_init_blk(n, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
-
- nvme_init_pci(n, pci_dev);
-
- pci_conf = pci_dev->config;
id->vid = cpu_to_le16(pci_get_word(pci_conf + PCI_VENDOR_ID));
id->ssvid = cpu_to_le16(pci_get_word(pci_conf + PCI_SUBSYSTEM_VENDOR_ID));
strpadcpy((char *)id->mn, sizeof(id->mn), "QEMU NVMe Ctrl", ' ');
@@ -1591,6 +1570,30 @@ static void nvme_realize(PCIDevice *pci_dev, Error
**errp)
n->bar.vs = 0x00010200;
n->bar.intmc = n->bar.intms = 0;
+}
+
+static void nvme_realize(PCIDevice *pci_dev, Error **errp)
+{
+ NvmeCtrl *n = NVME(pci_dev);
+ Error *local_err = NULL;
+
+ int i;
+
+ nvme_check_constraints(n, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ nvme_init_state(n);
+ nvme_init_blk(n, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+
+ nvme_init_pci(n, pci_dev);
+ nvme_init_ctrl(n, pci_dev);
for (i = 0; i < n->num_namespaces; i++) {
nvme_init_namespace(n, &n->namespaces[i], &local_err);
--
2.27.0
- [PATCH v7 03/22] hw/block/nvme: remove superfluous breaks, (continued)
- [PATCH v7 03/22] hw/block/nvme: remove superfluous breaks, Klaus Jensen, 2020/06/09
- [PATCH v7 05/22] hw/block/nvme: use constants in identify, Klaus Jensen, 2020/06/09
- [PATCH v7 06/22] hw/block/nvme: refactor nvme_addr_read, Klaus Jensen, 2020/06/09
- [PATCH v7 13/22] hw/block/nvme: add namespace helpers, Klaus Jensen, 2020/06/09
- [PATCH v7 10/22] hw/block/nvme: factor out property/constraint checks, Klaus Jensen, 2020/06/09
- [PATCH v7 11/22] hw/block/nvme: factor out device state setup, Klaus Jensen, 2020/06/09
- [PATCH v7 16/22] hw/block/nvme: factor out cmb setup, Klaus Jensen, 2020/06/09
- [PATCH v7 15/22] hw/block/nvme: factor out pci setup, Klaus Jensen, 2020/06/09
- [PATCH v7 14/22] hw/block/nvme: factor out namespace setup, Klaus Jensen, 2020/06/09
- [PATCH v7 17/22] hw/block/nvme: factor out pmr setup, Klaus Jensen, 2020/06/09
- [PATCH v7 19/22] hw/block/nvme: factor out controller identify setup,
Klaus Jensen <=
- [PATCH v7 21/22] hw/block/nvme: add msix_qsize parameter, Klaus Jensen, 2020/06/09
- [PATCH v7 12/22] hw/block/nvme: factor out block backend setup, Klaus Jensen, 2020/06/09
- [PATCH v7 20/22] hw/block/nvme: Verify msix_vector_use() returned value, Klaus Jensen, 2020/06/09
- [PATCH v7 18/22] hw/block/nvme: do cmb/pmr init as part of pci init, Klaus Jensen, 2020/06/09
- [PATCH v7 22/22] hw/block/nvme: verify msix_init_exclusive_bar() return value, Klaus Jensen, 2020/06/09
- Re: [PATCH v7 00/22] nvme: small fixes, refactoring and cleanups, Kevin Wolf, 2020/06/15