From af26490a03c984ba64a770da7ecc219c261dc03f Mon Sep 17 00:00:00 2001
From: Brijesh Singh <brijesh.singh@amd.com>
Date: Fri, 11 Sep 2020 11:00:03 -0500
Subject: Update stable commit to use newer version and drop thp check

---
 kvm.conf       | 2 +-
 launch-qemu.sh | 8 --------
 stable-commits | 4 ++--
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/kvm.conf b/kvm.conf
index 57f008a..339f0dc 100644
--- a/kvm.conf
+++ b/kvm.conf
@@ -3,4 +3,4 @@
 ###
 
 # Enable SEV-SNP Support
-options kvm_amd sev-snp=1
+options kvm_amd sev-snp=1 sev=1
diff --git a/launch-qemu.sh b/launch-qemu.sh
index bb66d09..c5fff7b 100755
--- a/launch-qemu.sh
+++ b/launch-qemu.sh
@@ -228,14 +228,6 @@ if [ ${SEV} = "1" ]; then
 		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
-			echo "ERROR: THP is enabled, run the following command to disable it and retry"
-			echo "echo never > /sys/kernel/mm/transparent_hugepage/enabled"
-			exit 1
-		fi
 	fi
 
 	get_cbitpos
diff --git a/stable-commits b/stable-commits
index 9fbf1af..165863d 100644
--- a/stable-commits
+++ b/stable-commits
@@ -8,8 +8,8 @@ KERNEL_BRANCH="sev-es-5.7-v4+snp"
 
 # qemu commit
 QEMU_GIT_URL="https://github.com/AMDESE/qemu.git"
-QEMU_BRANCH="sev-es-v4+snp"
+QEMU_BRANCH="sev-es-v7+snp"
 
 # guest bios
 OVMF_GIT_URL="https://github.com/AMDESE/ovmf.git"
-OVMF_BRANCH="sev-es-v16+snp"
+OVMF_BRANCH="sev-es-v21+snp"
-- 
cgit v1.2.3-71-gd317