Address comments

Author: vishesh92

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

@@ -82,33 +82,42 @@ private void generatePciXml(StringBuilder gpuBuilder) {
         // Parse the bus address into domain, bus, slot, function. Two input formats are accepted:
         //   - "dddd:bb:ss.f"  full PCI address with domain (e.g. 0000:00:02.0)
         //   - "bb:ss.f"       legacy short BDF; domain defaults to 0000
-        String domain = "0x0000";
-        String bus = "0x00";
-        String slot = "0x00";
-        String function = "0x0";
+        // Each segment is parsed as a hex integer and formatted with fixed widths
+        // (domain: 4 hex digits, bus/slot: 2 hex digits, function: 1 hex digit) to
+        // produce canonical libvirt XML values regardless of input casing or padding.
+        int domainVal = 0, busVal = 0, slotVal = 0, funcVal = 0;
 
         if (busAddress != null && !busAddress.isEmpty()) {
             String[] parts = busAddress.split(":");
             String slotFunction = null;
-            if (parts.length == 3) {
-                domain = "0x" + parts[0];
-                bus = "0x" + parts[1];
-                slotFunction = parts[2];
-            } else if (parts.length == 2) {
-                bus = "0x" + parts[0];
-                slotFunction = parts[1];
-            }
-            if (slotFunction != null) {
-                String[] slotFunctionParts = slotFunction.split("\\.");
-                if (slotFunctionParts.length > 0) {
-                    slot = "0x" + slotFunctionParts[0];
-                    if (slotFunctionParts.length > 1) {
-                        function = "0x" + slotFunctionParts[1].trim();
+            try {
+                if (parts.length == 3) {
+                    domainVal = Integer.parseInt(parts[0], 16);
+                    busVal = Integer.parseInt(parts[1], 16);
+                    slotFunction = parts[2];
+                } else if (parts.length == 2) {
+                    busVal = Integer.parseInt(parts[0], 16);
+                    slotFunction = parts[1];
+                }
+                if (slotFunction != null) {
+                    String[] slotFunctionParts = slotFunction.split("\\.");
+                    if (slotFunctionParts.length > 0) {
+                        slotVal = Integer.parseInt(slotFunctionParts[0], 16);
+                        if (slotFunctionParts.length > 1) {
+                            funcVal = Integer.parseInt(slotFunctionParts[1].trim(), 16);
+                        }
                     }
                 }
+            } catch (NumberFormatException e) {
+                // leave all values at 0 (safe defaults)
             }
         }
 
+        String domain = String.format("0x%04x", domainVal);
+        String bus = String.format("0x%02x", busVal);
+        String slot = String.format("0x%02x", slotVal);
+        String function = String.format("0x%x", funcVal);
+
         gpuBuilder.append("    <address domain='").append(domain).append("' bus='").append(bus).append("' slot='")
                 .append(slot).append("' function='").append(function.trim()).append("'/>\n");
         gpuBuilder.append("  </source>\n");

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtGpuDefTest.java

@@ -156,13 +156,15 @@ public void testGpuDef_withFullPciAddressNonZeroDomain() {
     }
 
     @Test
-    public void testGpuDef_withFullPciAddressWideDomain() {
+    public void testGpuDef_withNvidiaStyleEightDigitDomain() {
+        // nvidia-smi reports PCI addresses with an 8-digit domain (e.g. "00000001:af:00.1").
+        // generatePciXml must normalize it to the canonical 4-digit form "0x0001".
         LibvirtGpuDef gpuDef = new LibvirtGpuDef();
         VgpuTypesInfo pciGpuInfo = new VgpuTypesInfo(
                 GpuDevice.DeviceType.PCI,
                 "passthrough",
                 "passthrough",
-                "10000:af:00.1",
+                "00000001:af:00.1",
                 "10de",
                 "NVIDIA Corporation",
                 "1b38",
@@ -172,7 +174,7 @@ public void testGpuDef_withFullPciAddressWideDomain() {
 
         String gpuXml = gpuDef.toString();
 
-        assertTrue(gpuXml.contains("<address domain='0x10000' bus='0xaf' slot='0x00' function='0x1'/>"));
+        assertTrue(gpuXml.contains("<address domain='0x0001' bus='0xaf' slot='0x00' function='0x1'/>"));
     }
 
     @Test