QemuHCK: Update Q35 related platforms

As Q35 is a default platform, no need to add Q35 in platform name and in image name. This brake backward compatibility with previously installed images. Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
kostyanf14 · Sep 30, 2024 · c350c76 · c350c76
1 parent 762c78d
commit c350c76
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 63 deletions.
diff --git a/lib/engines/hcktest/platforms/Win10_1903x64_q35.json b/lib/engines/hcktest/platforms/Win10_1903x64_q35.json
diff --git a/...t/platforms/Win10_1903x64_q35_viommu.json → ...ktest/platforms/Win10_1903x64_viommu.json b/...t/platforms/Win10_1903x64_q35_viommu.json → ...ktest/platforms/Win10_1903x64_viommu.json
@@ -1,26 +1,24 @@
 {
-  "name": "Win10_1903x64_q35_viommu",
+  "name": "Win10_1903x64_viommu",
   "kit": "HLK1903",
   "setupmanager": "qemuhck",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
-  "device_extra": "",
   "st_image": "HLK1903.qcow2",
   "clients": {
     "c1": {
       "name": "CL1",
       "cpus": 8,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK1903-C1-Win10_1903x64_q35.qcow2"
+      "image": "HLK1903-C1-Win10_1903x64.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 8,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK1903-C2-Win10_1903x64_q35.qcow2"
+      "image": "HLK1903-C2-Win10_1903x64.qcow2"
     }
   }
 }
diff --git a/...s/Win11_22H2x64_host_uefi_q35_viommu.json → ...forms/Win11_22H2x64_host_uefi_viommu.json b/...s/Win11_22H2x64_host_uefi_q35_viommu.json → ...forms/Win11_22H2x64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win11_22H2x64_host_uefi_q35_viommu",
+  "name": "Win11_22H2x64_host_uefi_viommu",
   "kit": "HLK11_22H2",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK11_22H2-C1-Win11_22H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_22H2-C1-Win11_22H2x64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK11_22H2-C2-Win11_22H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_22H2-C2-Win11_22H2x64-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/...s/Win11_23H2x64_host_uefi_q35_viommu.json → ...forms/Win11_23H2x64_host_uefi_viommu.json b/...s/Win11_23H2x64_host_uefi_q35_viommu.json → ...forms/Win11_23H2x64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win11_23H2x64_host_uefi_q35_viommu",
+  "name": "Win11_23H2x64_host_uefi_viommu",
   "kit": "HLK11_23H2",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK11_23H2-C1-Win11_23H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_23H2-C1-Win11_23H2x64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK11_23H2-C2-Win11_23H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_23H2-C2-Win11_23H2x64-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/...s/Win11_24H2x64_host_uefi_q35_viommu.json → ...forms/Win11_24H2x64_host_uefi_viommu.json b/...s/Win11_24H2x64_host_uefi_q35_viommu.json → ...forms/Win11_24H2x64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win11_24H2x64_host_uefi_q35_viommu",
+  "name": "Win11_24H2x64_host_uefi_viommu",
   "kit": "HLK11_24H2",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK11_24H2-C1-Win11_24H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_24H2-C1-Win11_24H2x64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK11_24H2-C2-Win11_24H2x64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_24H2-C2-Win11_24H2x64-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/...ms/Win11nextx64_host_uefi_q35_viommu.json → ...tforms/Win11nextx64_host_uefi_viommu.json b/...ms/Win11nextx64_host_uefi_q35_viommu.json → ...tforms/Win11nextx64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win11nextx64_host_uefi_q35_viommu",
+  "name": "Win11nextx64_host_uefi_viommu",
   "kit": "HLK11_next",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK11_next-C1-Win11nextx64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_next-C1-Win11nextx64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK11_next-C2-Win11nextx64-uefi-q35-viommu.qcow2"
+      "image": "HLK11_next-C2-Win11nextx64-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/lib/engines/hcktest/platforms/Win2016x64_uefi.json b/lib/engines/hcktest/platforms/Win2016x64_uefi.json
@@ -3,7 +3,6 @@
   "kit": "HLK1607",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "st_image": "HLK1607-uefi.qcow2",
   "clients": {
     "c1": {

diff --git a/lib/engines/hcktest/platforms/Win2019x64_uefi.json b/lib/engines/hcktest/platforms/Win2019x64_uefi.json
@@ -3,7 +3,6 @@
   "kit": "HLK1809server",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "st_image": "HLK1809-uefi.qcow2",
   "clients": {
     "c1": {

diff --git a/.../Win2022nextx64_host_uefi_q35_viommu.json → ...orms/Win2022nextx64_host_uefi_viommu.json b/.../Win2022nextx64_host_uefi_q35_viommu.json → ...orms/Win2022nextx64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win2022nextx64_host_uefi_q35_viommu",
+  "name": "Win2022nextx64_host_uefi_viommu",
   "kit": "HLK2022_next",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK2022_next-C1-Win2022nextx64-host-uefi-q35-viommu.qcow2"
+      "image": "HLK2022_next-C1-Win2022nextx64-host-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK2022_next-C2-Win2022nextx64-host-uefi-q35-viommu.qcow2"
+      "image": "HLK2022_next-C2-Win2022nextx64-host-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/...orms/Win2022x64_host_uefi_q35_viommu.json → ...latforms/Win2022x64_host_uefi_viommu.json b/...orms/Win2022x64_host_uefi_q35_viommu.json → ...latforms/Win2022x64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win2022x64_host_uefi_q35_viommu",
+  "name": "Win2022x64_host_uefi_viommu",
   "kit": "HLK2022",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK2022-C1-Win2022x64-uefi-q35-viommu.qcow2"
+      "image": "HLK2022-C1-Win2022x64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK2022-C2-Win2022x64-uefi-q35-viommu.qcow2"
+      "image": "HLK2022-C2-Win2022x64-uefi-viommu.qcow2"
     }
   }
 }
diff --git a/lib/engines/hcktest/platforms/Win2022x64_uefi.json b/lib/engines/hcktest/platforms/Win2022x64_uefi.json
@@ -3,7 +3,6 @@
   "kit": "HLK2022",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "st_image": "HLK2022-uefi.qcow2",
   "clients": {
     "c1": {

diff --git a/...t/platforms/Win2025x64_host_uefi_q35.json → ...ktest/platforms/Win2025x64_host_uefi.json b/...t/platforms/Win2025x64_host_uefi_q35.json → ...ktest/platforms/Win2025x64_host_uefi.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win2025x64_host_uefi_q35",
+  "name": "Win2025x64_host_uefi",
   "kit": "HLK2025",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "enlightenments_state": true,
   "cpu": "host",
   "st_image": "HLK2025-uefi.qcow2",
@@ -13,14 +12,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK2025-C1-Win2025x64-uefi-q35.qcow2"
+      "image": "HLK2025-C1-Win2025x64-uefi.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK2025-C2-Win2025x64-uefi-q35.qcow2"
+      "image": "HLK2025-C2-Win2025x64-uefi.qcow2"
     }
   }
 }
diff --git a/...orms/Win2025x64_host_uefi_q35_viommu.json → ...latforms/Win2025x64_host_uefi_viommu.json b/...orms/Win2025x64_host_uefi_q35_viommu.json → ...latforms/Win2025x64_host_uefi_viommu.json
@@ -1,9 +1,8 @@
 {
-  "name": "Win2025x64_host_uefi_q35_viommu",
+  "name": "Win2025x64_host_uefi_viommu",
   "kit": "HLK2025",
   "setupmanager": "qemuhck",
   "fw_type": "uefi",
-  "machine_type": "q35",
   "viommu_state": true,
   "enlightenments_state": true,
   "cpu": "host",
@@ -14,14 +13,14 @@
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4002,
-      "image": "HLK2025-C1-Win2025x64-uefi-q35-viommu.qcow2"
+      "image": "HLK2025-C1-Win2025x64-uefi-viommu.qcow2"
     },
     "c2": {
       "name": "CL2",
       "cpus": 4,
       "memory_gb": 8,
       "winrm_port": 4003,
-      "image": "HLK2025-C2-Win2025x64-uefi-q35-viommu.qcow2"
+      "image": "HLK2025-C2-Win2025x64-uefi-viommu.qcow2"
     }
   }
 }