opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15334 from wanyaoqi/fix/remove-pcie-extend-bus-check

Browse Source 
fix(host): remove has pcie extend bus check
This commit is contained in:
Zexi Li
2022-11-09 23:06:19 +08:00
committed by GitHub
parent aa9492578f 929770264d
commit 4b2baaac3f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/guestman/pci.go
+1 -1
View File
@@ -175,7 +175,7 @@ func (s *SKVMGuestInstance) initMachineDefaultDevices() error {
func (s *SKVMGuestInstance) initGuestPciControllers() (*desc.PCIController, *desc.PCIController) {
var isPcie = s.isPcie()
var pciRoot, pciBridge *desc.PCIController
if isPcie && s.hasPcieExtendBus() {
if isPcie {
pciRoot = s.addPCIController(desc.CONTROLLER_TYPE_PCIE_ROOT, "")
s.addPCIController(desc.CONTROLLER_TYPE_PCIE_TO_PCI_BRIDGE, desc.CONTROLLER_TYPE_PCIE_ROOT)
pciBridge = s.addPCIController(desc.CONTROLLER_TYPE_PCI_BRIDGE, desc.CONTROLLER_TYPE_PCIE_TO_PCI_BRIDGE)
pkg/hostman/guestman/qemu-kvm.go
+1 -3
View File
@@ -2163,9 +2163,7 @@ func (s *SKVMGuestInstance) OnResumeSyncMetadataInfo() {
} else {
meta.Set("__cpu_mode", jsonutils.NewString(api.CPU_MODE_HOST))
}
if s.hasPcieExtendBus() {
meta.Set("__pcie_extend_bus", jsonutils.JSONTrue)
}
meta.Set("__pcie_extend_bus", jsonutils.JSONTrue)
cmdline, err := s.getQemuCmdline()
if err != nil {
log.Errorf("Get qemu process cmdline error: %v", err)