Merge branch 'fix/ZSTAC-81735@@2' into '5.5.12'

<fix>[kvm]: pass guestOsType to kvmagent for SMBIOS auto-configuration

See merge request zstackio/zstack!9517

Author: gitlab

plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java

@@ -2283,6 +2283,8 @@ public static class StartVmCmd extends vdiCmd implements VmAddOnsCmd {
         private boolean isApplianceVm;
         @GrayVersion(value = "5.0.0")
         private String systemSerialNumber;
+        @GrayVersion(value = "5.5.12")
+        private String guestOsType;
         @GrayVersion(value = "5.0.0")
         private String bootMode;
         // used when bootMode == 'UEFI'
@@ -2476,6 +2478,14 @@ public void setSystemSerialNumber(String systemSerialNumber) {
             this.systemSerialNumber = systemSerialNumber;
         }
 
+        public String getGuestOsType() {
+            return guestOsType;
+        }
+
+        public void setGuestOsType(String guestOsType) {
+            this.guestOsType = guestOsType;
+        }
+
         public String getVmCpuModel() {
             return vmCpuModel;
         }

plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java

@@ -4436,6 +4436,7 @@ protected void startVm(final VmInstanceSpec spec, final NeedReplyMessage msg, fi
         cmd.setAdditionalQmp(VmGlobalConfig.ADDITIONAL_QMP.value(Boolean.class));
         cmd.setApplianceVm(spec.getVmInventory().getType().equals("ApplianceVm"));
         cmd.setSystemSerialNumber(makeAndSaveVmSystemSerialNumber(spec.getVmInventory().getUuid()));
+        cmd.setGuestOsType(spec.getVmInventory().getGuestOsType());
         if (!NetworkGlobalProperty.CHASSIS_ASSET_TAG.isEmpty()) {
             cmd.setChassisAssetTag(NetworkGlobalProperty.CHASSIS_ASSET_TAG);
         }