From 2b47fe6f961044f41a6427ea65ab2ce8da0115e9 Mon Sep 17 00:00:00 2001
From: Brijesh Singh <brijesh.singh@amd.com>
Date: Thu, 14 May 2020 07:46:07 -0500
Subject: Multiple fixes

1) SEV-SNP spec says the BIT17 must be 1 in the policy
2) Source the /etc/os-release to get the distro information
---
 launch-qemu.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'launch-qemu.sh')

diff --git a/launch-qemu.sh b/launch-qemu.sh
index a2c4c53..b396af2 100755
--- a/launch-qemu.sh
+++ b/launch-qemu.sh
@@ -191,8 +191,8 @@ add_opts "-drive if=pflash,format=raw,unit=0,file=${UEFI_CODE},readonly"
 # add network support and fwd port 22 to 8000
 echo "guest port 22 is fwd to host 8000..."
 #add_opts "-netdev user,id=vmnic,hostfwd=tcp::8000-:22 -device e1000,netdev=vmnic,romfile="
-add_opts "-netdev user,id=vmnic,hostfwd=tcp::8000-:22"
-add_opts " -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile="
+#add_opts "-netdev user,id=vmnic,hostfwd=tcp::8000-:22"
+#add_opts " -device virtio-net-pci,disable-legacy=on,iommu_platform=true,netdev=vmnic,romfile="
 
 # If harddisk file is specified then add the HDD drive
 if [ -n "${HDA}" ]; then
@@ -220,7 +220,7 @@ 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=0x90000"
+		SEV_POLICY=",policy=0xB0000"
 	fi
 
 	if [ "${SEV_SNP}" = 1 ]; then
@@ -250,11 +250,6 @@ fi
 # start monitor on pty and named socket 'monitor'
 add_opts "-monitor pty -monitor unix:monitor,server,nowait"
 
-# add virtio ring
-if [ "$USE_VIRTIO" = "1" ]; then
-	add_opts "-device virtio-rng-pci,disable-legacy=on,iommu_platform=true"
-fi
-
 # log the console  output in stdout.log
 QEMU_CONSOLE_LOG=`pwd`/stdout.log
 
-- 
cgit v1.2.3-71-gd317