fix SEV policy calculation and remove thp change from grub

2 files changed, 5 insertions, 19 deletions

diff --git a/install.sh b/install.sh
index 216c741..c73911b 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. /etc/os-release
+[ -e /etc/os-release ] && . /etc/os-release
 
 # This will install all the dependent packages for qemu and ovmf to run
 if [ "$ID_LIKE" = "debian" ]; then
@@ -15,23 +15,6 @@ else
 	rpm -ivh linux/kernel-*.rpm
 fi
 
-# update grub.cfg to disable THP
-if ! grep "transparent_hugepage=never" /etc/default/grub >/dev/null; then
-	orig_cmdline="`grep GRUB_CMDLINE_LINUX /etc/default/grub | cut -f2- -d=`"
-	cmdline="${orig_cmdline::-1}"
-	cmdline="${cmdline:1}"
-	cmdline="${cmdline} transparent_hugepage=never"
-
-	sed -i "/GRUB_CMDLINE_LINUX/c\GRUB_CMDLINE_LINUX=\"${cmdline}\"" /etc/default/grub
-
-	if [ "$ID_LIKE" = "debian" ]; then
-		update-grub2
-	else
-		grub2-mkconfig
-	fi
-fi
-
-# 
 cp kvm.conf /etc/modprobe.d/
 
 echo
diff --git a/launch-qemu.sh b/launch-qemu.sh
index db13e7f..43cec9b 100755
--- a/launch-qemu.sh
+++ b/launch-qemu.sh
@@ -220,12 +220,15 @@ if [ ${SEV} = "1" ]; then
 		[ "${ALLOW_DEBUG}" = "1" ] && POLICY=$((POLICY & ~0x01))
 		[ "${SEV_ES}" = "1" ] && POLICY=$((POLICY | 0x04))
 		SEV_POLICY=$(printf ",policy=%#x" $POLICY)
-		SEV_POLICY=",policy=0xB0000"
 	fi
 
 	if [ "${SEV_SNP}" = 1 ]; then
 		SEV_GUEST_SNP=",snp=yes"
 
+		POLICY=$((0x30000))
+		SEV_POLICY=$(printf ",policy=%#x" $POLICY)
+		[ "${ALLOW_DEBUG}" = "1" ] && POLICY=$((POLICY | 0x80000))
+
 		# check if THP is disable
 		cat /sys/kernel/mm/transparent_hugepage/enabled  | grep -w "\[never\]"
 		if [ $? -ne 0 ]; then