From 1b37a6ab950ebaf90f0532ab018558adf610ca06 Mon Sep 17 00:00:00 2001
From: wanyaoqi <18528551+wanyaoqi@users.noreply.github.com>
Date: Fri, 28 Feb 2025 14:12:28 +0800
Subject: [PATCH] Fix/deploy guest add cpu vendor (#22206)

* fix(host-deployer): deploy guest add cpu vendor

* fix(host): host generate passwd use strong ruler
---
 pkg/hostman/diskutils/qemu_kvm/driver.go | 10 +++++++++-
 pkg/hostman/guestman/guestman.go         |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/hostman/diskutils/qemu_kvm/driver.go b/pkg/hostman/diskutils/qemu_kvm/driver.go
index 138f4cbc73..06d1a5b8a2 100644
--- a/pkg/hostman/diskutils/qemu_kvm/driver.go
+++ b/pkg/hostman/diskutils/qemu_kvm/driver.go
@@ -620,7 +620,15 @@ func (d *QemuBaseDriver) startCmds(
 
 	if sysutils.IsKvmSupport() {
 		cmd += __("-enable-kvm")
-		cmd += __("-cpu host")
+		isCPUIntel := sysutils.IsProcessorIntel()
+		isCPUAMD := sysutils.IsProcessorAmd()
+		if isCPUIntel {
+			cmd += __("-cpu host,vendor=GenuineIntel")
+		} else if isCPUAMD {
+			cmd += __("-cpu host,vendor=AuthenticAMD")
+		} else {
+			cmd += __("-cpu host")
+		}
 	} else {
 		cmd += __("-cpu max")
 	}
diff --git a/pkg/hostman/guestman/guestman.go b/pkg/hostman/guestman/guestman.go
index 5e093e28fe..9e632f913f 100644
--- a/pkg/hostman/guestman/guestman.go
+++ b/pkg/hostman/guestman/guestman.go
@@ -794,7 +794,7 @@ func (m *SGuestManager) startDeploy(
 	password, _ := deployParams.Body.GetString("password")
 	resetPassword := jsonutils.QueryBoolean(deployParams.Body, "reset_password", false)
 	if resetPassword && len(password) == 0 {
-		password = seclib.RandomPassword(12)
+		password = seclib.RandomPassword2(14)
 	}
 	enableCloudInit := jsonutils.QueryBoolean(deployParams.Body, "enable_cloud_init", false)
 	loginAccount, _ := deployParams.Body.GetString("login_account")