hw/block/nvme: do cmb/pmr init as part of pci init
Signed-off-by: Klaus Jensen <k.jensen@samsung.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200609190333.59390-19-its@irrelevant.dk> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
37712e00b1
commit
0c35ad46b6
@ -1525,6 +1525,12 @@ static void nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev)
|
||||
pci_register_bar(pci_dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY |
|
||||
PCI_BASE_ADDRESS_MEM_TYPE_64, &n->iomem);
|
||||
msix_init_exclusive_bar(pci_dev, n->params.max_ioqpairs + 1, 4, NULL);
|
||||
|
||||
if (n->params.cmb_size_mb) {
|
||||
nvme_init_cmb(n, pci_dev);
|
||||
} else if (n->pmrdev) {
|
||||
nvme_init_pmr(n, pci_dev);
|
||||
}
|
||||
}
|
||||
|
||||
static void nvme_realize(PCIDevice *pci_dev, Error **errp)
|
||||
@ -1586,12 +1592,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
|
||||
n->bar.vs = 0x00010200;
|
||||
n->bar.intmc = n->bar.intms = 0;
|
||||
|
||||
if (n->params.cmb_size_mb) {
|
||||
nvme_init_cmb(n, pci_dev);
|
||||
} else if (n->pmrdev) {
|
||||
nvme_init_pmr(n, pci_dev);
|
||||
}
|
||||
|
||||
for (i = 0; i < n->num_namespaces; i++) {
|
||||
nvme_init_namespace(n, &n->namespaces[i], &local_err);
|
||||
if (local_err) {
|
||||
|
Loading…
Reference in New Issue
Block a user