From 688913b7314e6e0ab3cf9b77b7b83674c90adc2d Mon Sep 17 00:00:00 2001
From: "boce.wang" <boce.wang@zstack.io>
Date: Thu, 4 Sep 2025 16:20:36 +0800
Subject: [PATCH 1/3] <fix>[conf]: add new GuestOS

Add new GuestOS in guestOsCategory and guestOsCharacter

Resolves: ZSV-11411
Related: ZSTAC-77340

Change-Id: I6868776c69929b27a5b34e1bb544e419e4724e10
(cherry picked from commit c4e9257bc9e2d3f49cd0f21c113acd0d233c7b02)
---
 conf/guestOs/guestOsCategory.xml  | 72 +++++++++++++++++++++++++++++++
 conf/guestOs/guestOsCharacter.xml | 70 ++++++++++++++++++++++++++++++
 2 files changed, 142 insertions(+)

diff --git a/conf/guestOs/guestOsCategory.xml b/conf/guestOs/guestOsCategory.xml
index 89b190371b2..5e92ae58c4f 100644
--- a/conf/guestOs/guestOsCategory.xml
+++ b/conf/guestOs/guestOsCategory.xml
@@ -30,6 +30,18 @@
         <version>9</version>
         <osRelease>CentOS 9</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>CentOS Stream</name>
+        <version>9</version>
+        <osRelease>CentOS Stream 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>CentOS Stream</name>
+        <version>10</version>
+        <osRelease>CentOS Stream 10</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>RedHat</name>
@@ -60,6 +72,12 @@
         <version>9</version>
         <osRelease>RHEL 9</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>RedHat</name>
+        <version>10</version>
+        <osRelease>RHEL 10</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Ubuntu</name>
@@ -132,12 +150,24 @@
         <version>12</version>
         <osRelease>Debian 12</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Debian</name>
+        <version>13</version>
+        <osRelease>Debian 13</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Fedora</name>
         <version></version>
         <osRelease>Fedora</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Fedora</name>
+        <version>42</version>
+        <osRelease>Fedora 42</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Kylin</name>
@@ -168,6 +198,12 @@
         <version>V7Update6</version>
         <osRelease>NeoKylin V7 Update6</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Kylin</name>
+        <version>11</version>
+        <osRelease>Kylin 11</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>UOS</name>
@@ -282,6 +318,42 @@
         <version>7</version>
         <osRelease>Oracle Linux 7</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Oracle</name>
+        <version>8</version>
+        <osRelease>Oracle Linux 8</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Oracle</name>
+        <version>9</version>
+        <osRelease>Oracle Linux 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Rocky Linux</name>
+        <version>8</version>
+        <osRelease>Rocky Linux 8</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Rocky Linux</name>
+        <version>9</version>
+        <osRelease>Rocky Linux 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Rocky Linux</name>
+        <version>10</version>
+        <osRelease>Rocky Linux 10</osRelease>
+    </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>AnolisOS</name>
+        <version>8</version>
+        <osRelease>AnolisOS 8</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Linux</name>
diff --git a/conf/guestOs/guestOsCharacter.xml b/conf/guestOs/guestOsCharacter.xml
index 6431e26c35e..6d6adc9bff5 100644
--- a/conf/guestOs/guestOsCharacter.xml
+++ b/conf/guestOs/guestOsCharacter.xml
@@ -48,6 +48,16 @@
         <platform>Linux</platform>
         <osRelease>CentOS 9</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>CentOS Stream 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>CentOS Stream 10</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -73,6 +83,11 @@
         <platform>Linux</platform>
         <osRelease>RHEL 9</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>RHEL 10</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -133,11 +148,21 @@
         <platform>Linux</platform>
         <osRelease>Debian 12</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Debian 13</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
         <osRelease>Fedora</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Fedora 42</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -163,6 +188,11 @@
         <platform>Linux</platform>
         <osRelease>NeoKylin V7 Update6</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Kylin 11</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -253,6 +283,46 @@
         <platform>Linux</platform>
         <osRelease>Oracle Linux 7</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Oracle Linux 8</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Oracle Linux 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>SUSE Linux 12</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>SUSE Linux 15</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Rocky Linux 8</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Rocky Linux 9</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Rocky Linux 10</osRelease>
+    </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>AnolisOS 8</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>

From 57fde0ed9e30be7049dd911bf376273a79c193ad Mon Sep 17 00:00:00 2001
From: "boce.wang" <boce.wang@zstack.io>
Date: Mon, 15 Sep 2025 10:32:51 +0800
Subject: [PATCH 2/3] <fix>[conf]: add GuestOS AlmaLinux

Resovles: ZSV-11411
Related: ZSTAC-77340

Change-Id: I6868776cffea076a7ac641a2bb96626c8b23af31
(cherry picked from commit 07ec0e5df8d74d79bfa0c830dee37cf1ba491e83)
---
 conf/guestOs/guestOsCategory.xml  | 6 ++++++
 conf/guestOs/guestOsCharacter.xml | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/conf/guestOs/guestOsCategory.xml b/conf/guestOs/guestOsCategory.xml
index 5e92ae58c4f..8396440ac03 100644
--- a/conf/guestOs/guestOsCategory.xml
+++ b/conf/guestOs/guestOsCategory.xml
@@ -348,6 +348,12 @@
         <version>10</version>
         <osRelease>Rocky Linux 10</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>AlmaLinux</name>
+        <version>9</version>
+        <osRelease>AlmaLinux 9</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>AnolisOS</name>
diff --git a/conf/guestOs/guestOsCharacter.xml b/conf/guestOs/guestOsCharacter.xml
index 6d6adc9bff5..f405f42d74a 100644
--- a/conf/guestOs/guestOsCharacter.xml
+++ b/conf/guestOs/guestOsCharacter.xml
@@ -318,6 +318,11 @@
         <platform>Linux</platform>
         <osRelease>Rocky Linux 10</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>AlmaLinux 9</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>

From 338cd58e516a7721b5011e66ae65244b8d249d24 Mon Sep 17 00:00:00 2001
From: "tao.yang" <tao.yang@zstack.io>
Date: Thu, 16 Apr 2026 16:11:41 +0800
Subject: [PATCH 3/3] <fix>[conf]: add GuestOS support

Resolves: ZSV-11411

Change-Id: I6b716670656274747474647174746270736e7465
---
 conf/guestOs/guestOsCategory.xml  | 24 ++++++++++++++++++------
 conf/guestOs/guestOsCharacter.xml | 15 ++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/conf/guestOs/guestOsCategory.xml b/conf/guestOs/guestOsCategory.xml
index 8396440ac03..74a49b1e6c1 100644
--- a/conf/guestOs/guestOsCategory.xml
+++ b/conf/guestOs/guestOsCategory.xml
@@ -36,12 +36,6 @@
         <version>9</version>
         <osRelease>CentOS Stream 9</osRelease>
     </osInfo>
-    <osInfo>
-        <platform>Linux</platform>
-        <name>CentOS Stream</name>
-        <version>10</version>
-        <osRelease>CentOS Stream 10</osRelease>
-    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>RedHat</name>
@@ -306,6 +300,12 @@
         <version>9</version>
         <osRelease>AlmaLinux 9</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>AlmaLinux</name>
+        <version>10</version>
+        <osRelease>AlmaLinux 10</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Linux</name>
@@ -330,6 +330,12 @@
         <version>9</version>
         <osRelease>Oracle Linux 9</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Oracle</name>
+        <version>10</version>
+        <osRelease>Oracle Linux 10</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Rocky Linux</name>
@@ -360,6 +366,12 @@
         <version>8</version>
         <osRelease>AnolisOS 8</osRelease>
     </osInfo>
+    <osInfo>
+        <platform>Linux</platform>
+        <name>Amazon</name>
+        <version>2023</version>
+        <osRelease>Amazon Linux 2023</osRelease>
+    </osInfo>
     <osInfo>
         <platform>Linux</platform>
         <name>Linux</name>
diff --git a/conf/guestOs/guestOsCharacter.xml b/conf/guestOs/guestOsCharacter.xml
index f405f42d74a..5d132e0a172 100644
--- a/conf/guestOs/guestOsCharacter.xml
+++ b/conf/guestOs/guestOsCharacter.xml
@@ -53,11 +53,6 @@
         <platform>Linux</platform>
         <osRelease>CentOS Stream 9</osRelease>
     </osInfo>
-    <osInfo>
-        <architecture>x86_64</architecture>
-        <platform>Linux</platform>
-        <osRelease>CentOS Stream 10</osRelease>
-    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -278,6 +273,11 @@
         <platform>Linux</platform>
         <osRelease>AlmaLinux 9</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>AlmaLinux 10</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>
@@ -293,6 +293,11 @@
         <platform>Linux</platform>
         <osRelease>Oracle Linux 9</osRelease>
     </osInfo>
+    <osInfo>
+        <architecture>x86_64</architecture>
+        <platform>Linux</platform>
+        <osRelease>Oracle Linux 10</osRelease>
+    </osInfo>
     <osInfo>
         <architecture>x86_64</architecture>
         <platform>Linux</platform>