Add some checks to handle misc cases from gpudiscovery.sh

Author: vishesh92

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -2052,13 +2052,19 @@ protected List<VgpuTypesInfo> parseGpuDevicesFromResult(String result) {
                 gpuDevices.add(vgpuType);
 
                 for (JsonElement vgpuInstance : vgpuInstances) {
-                    gpuDevices.add(getGpuDeviceFromVgpuInstance(vgpuInstance, busAddress, vendorId, vendorName, deviceId,
-                            deviceName, numaNode, pciRoot));
+                    VgpuTypesInfo vgpu = getGpuDeviceFromVgpuInstance(vgpuInstance, busAddress, vendorId, vendorName,
+                            deviceId, deviceName, numaNode, pciRoot);
+                    if (vgpu != null) {
+                        gpuDevices.add(vgpu);
+                    }
                 }
 
                 for (JsonElement vfInstance : vfInstances) {
-                    gpuDevices.add(getGpuDeviceFromVfInstance(vfInstance, busAddress, vendorId, vendorName, deviceId,
-                            deviceName, numaNode, pciRoot));
+                    VgpuTypesInfo vf = getGpuDeviceFromVfInstance(vfInstance, busAddress, vendorId, vendorName,
+                            deviceId, deviceName, numaNode, pciRoot);
+                    if (vf != null) {
+                        gpuDevices.add(vf);
+                    }
                 }
             }
 
@@ -2073,6 +2079,9 @@ protected VgpuTypesInfo getGpuDeviceFromVgpuInstance(JsonElement vgpuInstance, S
         JsonObject vgpuInstanceJsonObject = vgpuInstance.getAsJsonObject();
         String mdevUuid = getJsonStringValueOrNull(vgpuInstanceJsonObject, "mdev_uuid");
         String profileName = getJsonStringValueOrNull(vgpuInstanceJsonObject, "profile_name");
+        if (profileName == null || profileName.isEmpty()) {
+            return null; // Skip if profile name is not provided
+        }
         Long maxInstances = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_instances");
         Long videoRam = getJsonLongValueOrNull(vgpuInstanceJsonObject, "video_ram");
         Long maxHeads = getJsonLongValueOrNull(vgpuInstanceJsonObject, "max_heads");
@@ -2094,6 +2103,9 @@ protected VgpuTypesInfo getGpuDeviceFromVfInstance(JsonElement vfInstance, Strin
         JsonObject vfInstanceJsonObject = vfInstance.getAsJsonObject();
         String vfPciAddress = vfInstanceJsonObject.get("vf_pci_address").getAsString();
         String vfProfile = vfInstanceJsonObject.get("vf_profile").getAsString();
+        if (vfProfile == null || vfProfile.isEmpty()) {
+            return null; // Skip if profile name is not provided
+        }
         Long maxInstances = getJsonLongValueOrNull(vfInstanceJsonObject, "max_instances");
         Long videoRam = getJsonLongValueOrNull(vfInstanceJsonObject, "video_ram");
         Long maxHeads = getJsonLongValueOrNull(vfInstanceJsonObject, "max_heads");

scripts/vm/hypervisor/kvm/gpudiscovery.sh

@@ -556,7 +556,12 @@ for LINE in "${LINES[@]}"; do
 		continue
 	fi
 
-	# Only process GPU classes
+	# If this is a VF, skip it. It will be processed under its PF.
+	if [[ -e "/sys/bus/pci/devices/0000:$PCI_ADDR/physfn" ]]; then
+		continue
+	fi
+
+	# Only process GPU classes (3D controller)
 	if [[ ! "$PCI_CLASS" =~ (3D\ controller) ]]; then
 		continue
 	fi
@@ -639,10 +644,7 @@ for LINE in "${LINES[@]}"; do
 					USED_JSON=$(to_json_vm "$raw")
 
 					vlist+=(
-						"{\"mdev_uuid\":\"$MDEV_UUID\",\"profile_name\":$(json_escape "$PROFILE_NAME"),"
-						"\"max_instances\":$MAX_INSTANCES,\"video_ram\":$VIDEO_RAM,\"max_heads\":$MAX_HEADS,"
-						"\"max_resolution_x\":$MAX_RESOLUTION_X,\"max_resolution_y\":$MAX_RESOLUTION_Y,\"libvirt_address\":{"
-						"\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
+						"{\"mdev_uuid\":\"$MDEV_UUID\",\"profile_name\":$(json_escape "$PROFILE_NAME"),\"max_instances\":$MAX_INSTANCES,\"video_ram\":$VIDEO_RAM,\"max_heads\":$MAX_HEADS,\"max_resolution_x\":$MAX_RESOLUTION_X,\"max_resolution_y\":$MAX_RESOLUTION_Y,\"libvirt_address\":{\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
 				done
 			fi
 		done
@@ -669,8 +671,7 @@ for LINE in "${LINES[@]}"; do
 			SLOT="0x${VF_BDF:3:2}"
 			FUNC="0x${VF_BDF:6:1}"
 
-			# Determine vf_type and vf_profile
-			VF_TYPE="sr-iov"
+			# Determine vf_profile
 			VF_PROFILE=""
 			if VF_LINE=$(lspci -nnm -s "$VF_BDF" 2>/dev/null); then
 				if [[ $VF_LINE =~ \"([^\"]+)\"[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\"[[:space:]]\"([^\"]+)\" ]]; then
@@ -685,8 +686,7 @@ for LINE in "${LINES[@]}"; do
 			USED_JSON=$(to_json_vm "$raw")
 
 			flist+=(
-				"{\"vf_pci_address\":\"$VF_BDF\",\"vf_profile\":$VF_PROFILE_JSON,\"libvirt_address\":{"
-				"\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
+				"{\"vf_pci_address\":\"$VF_BDF\",\"vf_profile\":$VF_PROFILE_JSON,\"libvirt_address\":{\"domain\":\"$DOMAIN\",\"bus\":\"$BUS\",\"slot\":\"$SLOT\",\"function\":\"$FUNC\"},\"used_by_vm\":$USED_JSON}")
 		done
 		if [ ${#flist[@]} -gt 0 ]; then
 			VF_ARRAY="[$(