diff --git a/hypervisor/arch/x86/configs/pci_dev.c b/hypervisor/arch/x86/configs/pci_dev.c
index 9f7426641..efb2d75c1 100644
--- a/hypervisor/arch/x86/configs/pci_dev.c
+++ b/hypervisor/arch/x86/configs/pci_dev.c
@@ -56,7 +56,7 @@ static bool is_allocated_to_prelaunched_vm(struct pci_pdev *pdev)
 /*
  * @pre: pdev != NULL
  */
-void fill_pci_dev_config(struct pci_pdev *pdev)
+void init_one_dev_config(struct pci_pdev *pdev)
 {
 	uint16_t vmid;
 	struct acrn_vm_config *vm_config;
diff --git a/hypervisor/hw/pci.c b/hypervisor/hw/pci.c
index a9ab92547..722cfff4d 100644
--- a/hypervisor/hw/pci.c
+++ b/hypervisor/hw/pci.c
@@ -305,8 +305,13 @@ static uint32_t pci_check_override_drhd_index(union pci_bdf pbdf,
 	return bdf_drhd_index;
 }
 
-/* Scan part of PCI hierarchy, starting with the given bus. */
-static void init_pci_hierarchy(uint8_t bus, uint64_t buses_visited[BUSES_BITMAP_LEN],
+/* @brief: scan PCI physical devices from specific bus.
+ * walks through the bus to scan PCI physical devices and using the discovered physical devices
+ * to initialize pdevs, each pdev can only provdie a physical device information (like bdf, bar,
+ * capabilities) before using this pdev, it needs to use the pdev to initialize a per VM device
+ * configuration(acrn_vm_pci_dev_config), call init_one_dev_config or init_all_dev_config to do this.
+ */
+static void scan_pci_hierarchy(uint8_t bus, uint64_t buses_visited[BUSES_BITMAP_LEN],
 				const struct pci_bdf_set *const bdfs_from_drhds, uint32_t drhd_index)
 {
 	bool is_mfdev;
@@ -375,7 +380,7 @@ static void init_pci_hierarchy(uint8_t bus, uint64_t buses_visited[BUSES_BITMAP_
 
 /*
  * @brief: Setup bdfs_from_drhds data structure as the DMAR tables are walked searching
- * for PCI device scopes. bdfs_from_drhds is used later in init_pci_hierarchy
+ * for PCI device scopes. bdfs_from_drhds is used later in scan_pci_hierarchy
  * to map the right DRHD unit to the PCI device
  */
 static void pci_add_bdf_from_drhd(union pci_bdf bdf, struct pci_bdf_set *const bdfs_from_drhds,
@@ -394,7 +399,7 @@ static void pci_add_bdf_from_drhd(union pci_bdf bdf, struct pci_bdf_set *const b
 
 /*
  * @brief: Setup bdfs_from_drhds data structure as the DMAR tables are walked searching
- * for PCI device scopes. bdfs_from_drhds is used later in init_pci_hierarchy
+ * for PCI device scopes. bdfs_from_drhds is used later in scan_pci_hierarchy
  * to map the right DRHD unit to the PCI device.
  * TODO: bdfs_from_drhds is a good candidate to be part of generated platform
  * info.
@@ -431,6 +436,43 @@ static void pci_parse_iommu_devscopes(struct pci_bdf_set *const bdfs_from_drhds,
 	}
 }
 
+/*
+ * @brief: walks through all pdevs that have been initialized and determine
+ * which pdevs need to be added to pci dev_config. The pdevs added to pci
+ * dev_config will be exposed to SOS finally.
+ */
+static void init_all_dev_config(void)
+{
+	uint32_t idx, cnt = 0U;
+	uint32_t total = num_pci_pdev;
+	struct pci_pdev *pdev = NULL;
+
+	for (idx = 0U; idx < num_pci_pdev; idx++) {
+		pdev = &pci_pdev_array[idx];
+
+		/*
+		 * FIXME: Mask the SR-IOV capability instead drop the device
+		 * when supporting PCIe extended capabilities whitelist.
+		 */
+		if (pdev->sriov.capoff != 0U) {
+			cnt = pci_pdev_read_cfg(pdev->bdf,
+				pdev->sriov.capoff + PCIR_SRIOV_TOTAL_VFS, 2U);
+			/*
+			 * For SRIOV-Capable device, drop the device
+			 * if no room for its all of virtual functions.
+			 */
+			if ((total + cnt) > CONFIG_MAX_PCI_DEV_NUM) {
+				pr_err("%s, %x:%x.%x is dropped since no room for %u VFs",
+						__func__, pdev->bdf.bits.b, pdev->bdf.bits.d, pdev->bdf.bits.f, cnt);
+				continue;
+			} else {
+				total += cnt;
+			}
+		}
+		init_one_dev_config(pdev);
+	}
+}
+
 /*
  * @brief Walks the PCI heirarchy and initializes array of pci_pdev structs
  * Uses DRHD info from ACPI DMAR tables to cover the endpoints and
@@ -451,9 +493,10 @@ void init_pci_pdev_list(void)
 	for (bus = 0U; bus <= PCI_BUSMAX; bus++) {
 		was_visited = bitmap_test((bus & 0x3FU), &buses_visited[bus >> 6U]);
 		if (!was_visited) {
-			init_pci_hierarchy((uint8_t)bus, buses_visited, &bdfs_from_drhds, drhd_idx_pci_all);
+			scan_pci_hierarchy((uint8_t)bus, buses_visited, &bdfs_from_drhds, drhd_idx_pci_all);
 		}
 	}
+	init_all_dev_config();
 }
 
 static inline uint32_t pci_pdev_get_nr_bars(uint8_t hdr_type)
@@ -589,9 +632,6 @@ static void init_pdev(uint16_t pbdf, uint32_t drhd_index)
 			}
 
 			pdev->drhd_index = drhd_index;
-
-			fill_pci_dev_config(pdev);
-
 			num_pci_pdev++;
 		} else {
 			pr_err("%s, %x:%x.%x unsupported headed type: 0x%x\n",
diff --git a/hypervisor/include/arch/x86/pci_dev.h b/hypervisor/include/arch/x86/pci_dev.h
index 0306ad975..24f588c9d 100644
--- a/hypervisor/include/arch/x86/pci_dev.h
+++ b/hypervisor/include/arch/x86/pci_dev.h
@@ -14,6 +14,6 @@
 extern struct acrn_vm_pci_dev_config sos_pci_devs[CONFIG_MAX_PCI_DEV_NUM];
 
 struct pci_pdev;
-void fill_pci_dev_config(struct pci_pdev *pdev);
+void init_one_dev_config(struct pci_pdev *pdev);
 
 #endif /* PCI_DEV_H_ */
diff --git a/hypervisor/include/hw/pci.h b/hypervisor/include/hw/pci.h
index de78e0e47..6ab1fb9c5 100644
--- a/hypervisor/include/hw/pci.h
+++ b/hypervisor/include/hw/pci.h
@@ -114,6 +114,7 @@
 
 /* SRIOV Definitions */
 #define PCI_SRIOV_CAP_LEN	0x40U
+#define PCIR_SRIOV_TOTAL_VFS	0xEU
 
 /* PCI Message Signalled Interrupts (MSI) */
 #define PCIR_MSI_CTRL         0x02U