From 3b2097f313e9555609836c4c1f3036ab0f7b5923 Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Mon, 29 Aug 2022 03:58:43 +0200 Subject: [PATCH] vmd: use vmd_container.count when iterating over domains It makes it possible to call this function even if the VMD library wasn't initialized. Signed-off-by: Konrad Sztyber Change-Id: I3d0f4677c4a1189f9d8acf07baee50a4e2050459 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14260 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Tom Nabarro --- lib/vmd/vmd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/vmd/vmd.c b/lib/vmd/vmd.c index 3c8b49021..e490fe126 100644 --- a/lib/vmd/vmd.c +++ b/lib/vmd/vmd.c @@ -1240,9 +1240,9 @@ vmd_find_device(const struct spdk_pci_addr *addr) { struct vmd_pci_bus *bus; struct vmd_pci_device *dev; - int i; + uint32_t i; - for (i = 0; i < MAX_VMD_TARGET; ++i) { + for (i = 0; i < g_vmd_container.count; ++i) { TAILQ_FOREACH(bus, &g_vmd_container.vmd[i].bus_list, tailq) { if (bus->self) { if (spdk_pci_addr_compare(&bus->self->pci.addr, addr) == 0) { @@ -1311,12 +1311,13 @@ spdk_vmd_pci_device_list(struct spdk_pci_addr vmd_addr, struct spdk_pci_device * int cnt = 0; struct vmd_pci_bus *bus; struct vmd_pci_device *dev; + uint32_t i; if (!nvme_list) { return -1; } - for (int i = 0; i < MAX_VMD_TARGET; ++i) { + for (i = 0; i < g_vmd_container.count; ++i) { if (spdk_pci_addr_compare(&vmd_addr, &g_vmd_container.vmd[i].pci->addr) == 0) { TAILQ_FOREACH(bus, &g_vmd_container.vmd[i].bus_list, tailq) { TAILQ_FOREACH(dev, &bus->dev_list, tailq) {