fix(region,host): select isolated devs misc fix (#21905)

yunionio · Dec 30, 2024 · 2448bb4 · 2448bb4
1 parent 8e1c0ef
commit 2448bb4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go
@@ -972,6 +972,7 @@ func (manager *SIsolatedDeviceManager) attachHostDeviceToGuestByModel(
 					continue
 				} else {
 					selectedDev = &groupDevs[i].Devs[0]
+					break
 				}
 			}
 			if selectedDev != nil {
@@ -983,6 +984,8 @@ func (manager *SIsolatedDeviceManager) attachHostDeviceToGuestByModel(
 	if selectedDev == nil {
 		selectedDev = &groupDevs[0].Devs[0]
 	}
+	devAddr := strings.Split(selectedDev.Addr, "-")[0]
+	usedDevMap[devAddr] = selectedDev
 
 	return guest.attachIsolatedDevice(ctx, userCred, selectedDev, devConfig.NetworkIndex, devConfig.DiskIndex)
 }

diff --git a/pkg/hostman/isolated_device/isolated_device.go b/pkg/hostman/isolated_device/isolated_device.go
@@ -484,6 +484,9 @@ func (man *isolatedDeviceManager) CheckDevIsNeedUpdate(dev IDevice, devInfo *Clo
 	if dev.GetDeviceType() != devInfo.DevType {
 		return true
 	}
+	if dev.GetDevicePath() != devInfo.DevicePath {
+		return true
+	}
 	if dev.GetModelName() != devInfo.Model {
 		return true
 	}