From 929770264ddc3693cf0a6aa4d791c167942a38bf Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 9 Nov 2022 21:55:42 +0800 Subject: [PATCH] fix(host): remove has pcie extend bus check Signed-off-by: wanyaoqi --- pkg/hostman/guestman/pci.go | 2 +- pkg/hostman/guestman/qemu-kvm.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/hostman/guestman/pci.go b/pkg/hostman/guestman/pci.go index 746f9f250d..692d009886 100644 --- a/pkg/hostman/guestman/pci.go +++ b/pkg/hostman/guestman/pci.go @@ -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) diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 8ec941a572..52f42fb48c 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -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)