[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 16/16] nvme: factor out controller identify setup
From: |
Klaus Jensen |
Subject: |
[PATCH 16/16] nvme: factor out controller identify setup |
Date: |
Wed, 15 Apr 2020 12:24:45 +0200 |
From: Klaus Jensen <address@hidden>
Signed-off-by: Klaus Jensen <address@hidden>
---
hw/block/nvme.c | 42 ++++++++++++++++++++++++------------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 7387cf409f96..d1566b56381d 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1428,27 +1428,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;
+ uint8_t *pci_conf = pci_dev->config;
- int i;
- uint8_t *pci_conf;
-
- if (nvme_check_constraints(n, errp)) {
- return;
- }
-
- nvme_init_state(n);
-
- if (nvme_init_blk(n, errp)) {
- 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", ' ');
@@ -1482,6 +1466,28 @@ 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);
+
+ int i;
+
+ if (nvme_check_constraints(n, errp)) {
+ return;
+ }
+
+ nvme_init_state(n);
+
+ if (nvme_init_blk(n, errp)) {
+ return;
+ }
+
+ nvme_init_pci(n, pci_dev);
+ nvme_init_ctrl(n, pci_dev);
+
for (i = 0; i < n->num_namespaces; i++) {
if (nvme_init_namespace(n, &n->namespaces[i], errp)) {
return;
--
2.26.0
- [PATCH 13/16] nvme: factor out namespace setup, (continued)
- [PATCH 12/16] nvme: add namespace helpers, Klaus Jensen, 2020/04/15
- [PATCH 14/16] nvme: factor out pci setup, Klaus Jensen, 2020/04/15
- [PATCH 15/16] nvme: factor out cmb setup, Klaus Jensen, 2020/04/15
- [PATCH 16/16] nvme: factor out controller identify setup,
Klaus Jensen <=
- Re: [PATCH 00/16] nvme: refactoring and cleanups, no-reply, 2020/04/15