Merge pull request avocado-framework#3111 from Yingshun/fix_pcie_brg

libvirt_pcicontr: Fix reset_pci_num
vipmike007 · Jul 2, 2021 · 2ef963c · 2ef963c
2 parents 535572c + bd94bc4
commit 2ef963c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/virttest/utils_libvirt/libvirt_pcicontr.py b/virttest/utils_libvirt/libvirt_pcicontr.py
@@ -70,7 +70,10 @@ def reset_pci_num(vm_name, num=15):
         # Default pcie setting
         pcie_root_port = {'controller_model': 'pcie-root-port', 'controller_type': 'pci'}
         ret_indexes = get_max_contr_indexes(vmxml, 'pci', 'pcie-root-port')
-        cur_pci_num = int(ret_indexes[0])
+        pcie_to_pci_brg_indexes = get_max_contr_indexes(
+            vmxml, 'pci', 'pcie-to-pci-bridge')
+        cur_pci_num = ret_indexes[0] if not pcie_to_pci_brg_indexes else \
+            max(ret_indexes[0], pcie_to_pci_brg_indexes[0])
         logging.debug("The current maximum PCI controller index is %d", cur_pci_num)
         if cur_pci_num < num:
             for i in list(range(cur_pci_num + 1, num)):