[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/13] nvme: use pci_dev directly in nvme_realize
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PULL 10/13] nvme: use pci_dev directly in nvme_realize |
Date: |
Thu, 31 Jan 2019 01:59:42 +0100 |
From: Li Qiang <address@hidden>
There is no need to make another reference.
Signed-off-by: Li Qiang <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
hw/block/nvme.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index 0b77b49b36..8325b5e88a 100644
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -1238,7 +1238,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
pci_conf[PCI_INTERRUPT_PIN] = 1;
pci_config_set_prog_interface(pci_dev->config, 0x2);
pci_config_set_class(pci_dev->config, PCI_CLASS_STORAGE_EXPRESS);
- pcie_endpoint_cap_init(&n->parent_obj, 0x80);
+ pcie_endpoint_cap_init(pci_dev, 0x80);
n->num_namespaces = 1;
n->reg_size = pow2ceil(0x1004 + 2 * (n->num_queues + 1) * 4);
@@ -1250,10 +1250,10 @@ static void nvme_realize(PCIDevice *pci_dev, Error
**errp)
memory_region_init_io(&n->iomem, OBJECT(n), &nvme_mmio_ops, n,
"nvme", n->reg_size);
- pci_register_bar(&n->parent_obj, 0,
+ pci_register_bar(pci_dev, 0,
PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64,
&n->iomem);
- msix_init_exclusive_bar(&n->parent_obj, n->num_queues, 4, NULL);
+ msix_init_exclusive_bar(pci_dev, n->num_queues, 4, NULL);
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));
@@ -1308,7 +1308,7 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n,
"nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
- pci_register_bar(&n->parent_obj, NVME_CMBLOC_BIR(n->bar.cmbloc),
+ pci_register_bar(pci_dev, NVME_CMBLOC_BIR(n->bar.cmbloc),
PCI_BASE_ADDRESS_SPACE_MEMORY | PCI_BASE_ADDRESS_MEM_TYPE_64 |
PCI_BASE_ADDRESS_MEM_PREFETCH, &n->ctrl_mem);
--
2.20.1
- [Qemu-devel] [PULL 00/13] Block patches, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 01/13] qapi: add x-debug-query-block-graph, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 02/13] scripts: add render_block_graph function for QEMUMachine, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 03/13] block/ssh: Convert from DPRINTF() macro to trace events, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 04/13] block/curl: Convert from DPRINTF() macro to trace events, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 05/13] block/file-posix: Convert from DPRINTF() macro to trace events, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 07/13] qemu-io: Add generic function for reinitializing optind., Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 06/13] block/sheepdog: Convert from DPRINTF() macro to trace events, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 08/13] nvme: use TYPE_NVME instead of constant string, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 09/13] nvme: ensure the num_queues is not zero, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 10/13] nvme: use pci_dev directly in nvme_realize,
Max Reitz <=
- [Qemu-devel] [PULL 11/13] iotests.py: Add qemu_nbd_pipe(), Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 13/13] iotests: Allow 147 to be run concurrently, Max Reitz, 2019/01/30
- [Qemu-devel] [PULL 12/13] iotests: Bind qemu-nbd to localhost in 147, Max Reitz, 2019/01/30