update script and stable-commits to latest code base

3 files changed, 36 insertions, 25 deletions

diff --git a/build.sh b/build.sh
index bfc8479..8099fc1 100755
--- a/build.sh
+++ b/build.sh
@@ -19,18 +19,6 @@ run_cmd()
 
 fetch_kernel()
 {
-	echo "Fetching $1"
-	if [ "$1" = "kvm" ]; then
-		KERNEL_COMMIT=${KVM_KERNEL_COMMIT}
-		KERNEL_GIT_URL=${KVM_GIT_URL}
-	elif [ "$1" = "tip" ]; then
-		KERNEL_COMMIT=${TIP_KERNEL_COMMIT}
-		KERNEL_GIT_URL=${TIP_GIT_URL}
-	else
-		echo "** ERROR **"
-		exit 1
-	fi
-
 	run_cmd "mkdir -p ${BUILD_DIR}/$1"
 	run_cmd "git clone --single-branch -b ${KERNEL_COMMIT} ${KERNEL_GIT_URL} ${BUILD_DIR}/$1"
 }
@@ -40,18 +28,31 @@ build_kernel()
 	if [ ! -d $BUILD_DIR/$1 ]; then
 		fetch_kernel "$1"
 	fi
-	cd $BUILD_DIR/$1
-	cp /boot/config-$(uname -r) .config
+	run_cmd "cd $BUILD_DIR/$1"
+	run_cmd "cp /boot/config-$(uname -r) .config"
 	sed  -ie s/CONFIG_LOCALVERSION.*/CONFIG_LOCALVERSION=\"\"/g .config
 	./scripts/config --enable CONFIG_AMD_MEM_ENCRYPT
-	./scripts/config --enable CONFIG_AMD_KVM_SEV
+	./scripts/config --enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT
+	./scripts/config --enable CONFIG_KVM_AMD_SEV
 	./scripts/config --disable CONFIG_DEBUG_INFO
+	./scripts/config --enable CRYPTO_DEV_SP_PSP
 	./scripts/config --module CRYPTO_DEV_CCP_DD
+	./scripts/config --enable CONFIG_CRYPTO_DEV_CCP
 	./scripts/config --disable CONFIG_LOCALVERSION_AUTO
 	yes "" | make olddefconfig
-	run_cmd "make -j `getconf _NPROCESSORS_ONLN` deb-pkg LOCALVERSION=-$1"
+
+	if [ "$2" = "rpm" ]; then
+		echo "%_topdir    `pwd`/rpmbuild" > $HOME/.rpmmacros
+	fi
+	run_cmd "make -j `getconf _NPROCESSORS_ONLN` $2-pkg LOCALVERSION=-sev"
 	run_cmd "mkdir -p $OUTPUT_DIR/$1"
-	run_cmd "mv ../linux-*${1}*.deb $OUTPUT_DIR/$1"
+	if [ "$2" = "rpm" ]; then
+		run_cmd "mv `pwd`/rpmbuild/RPMS/* $OUTPUT_DIR/$1"
+		run_cmd "rm -rf `pwd`/rpmbuild"
+		run_cmd "rm -rf $HOME/.rpmmacros"
+	else
+		run_cmd "mv ../linux-*sev*.deb $OUTPUT_DIR/$1"
+	fi
 }
 
 fetch_ovmf()
@@ -107,7 +108,14 @@ dep_install ()
 	run_cmd "sudo apt-get -y install git build-essential zlib1g-dev libglib2.0-dev libpixman-1-dev uuid-dev nasm bison acpica-tools libncurses5-dev libssl-dev fakeroot dpkg-dev bc libelf-dev"
 }
 
-dep_install
-build_kernel "kvm"
+grep ubuntu /etc/*-release* >/dev/null
+if [ $? -eq 0 ]; then
+	dep_install
+	pkg="deb"
+else
+	pkg="rpm"
+fi
+
+build_kernel "linux" "$pkg"
 build_qemu
 build_ovmf
diff --git a/launch-qemu.sh b/launch-qemu.sh
index 3c088cc..2903c66 100755
--- a/launch-qemu.sh
+++ b/launch-qemu.sh
@@ -33,6 +33,7 @@ usage() {
 	echo " -hugetlb      use hugetlbfs"
 	echo " -allow-debug  allow debugging the VM"
 	echo " -novirtio     do not use virtio devices"
+	echo " -gdb          start gdbserver"
 	exit 1  
 }
 
@@ -88,7 +89,7 @@ setup_bridge_network() {
 	fi
 	TAP_NUM=`echo $(( TAP_NUM + 1 ))`
 	GUEST_TAP_NAME="tap${TAP_NUM}"
-	GUEST_MAC_ADDR=$(printf "02:16:1e:%02x:01:01" 0x${TAP_NUM})
+	GUEST_MAC_ADDR=$(printf '00:60:2F:%02X:%02X:%02X\n' $[RANDOM%256] $[RANDOM%256] $[RANDOM%256])
 
 	echo "Starting network adapter '${GUEST_TAP_NAME}' MAC=$GUEST_MAC_ADDR"
 	run_cmd "ip tuntap add $GUEST_TAP_NAME mode tap user `whoami`"
@@ -156,6 +157,8 @@ while [[ $1 != "" ]]; do
 				;;
 		-novirtio)      USE_VIRTIO="0"
 				;;
+		-gdb)      	USE_GDB="1"
+				;;
 		*) 		usage;;
 	esac
 	shift
@@ -211,7 +214,7 @@ if [ ${SEV_GUEST} = "1" ]; then
 	if [ "${ALLOW_DEBUG}" = "1" ]; then
 		SEV_DEBUG_POLICY=",policy=0x0"
 	fi
-	add_opts "-object sev-guest,id=sev0${SEV_DEBUG_POLICY}"
+	add_opts "-object sev-guest,id=sev0${SEV_DEBUG_POLICY},cbitpos=47,reduced-phys-bits=1"
 	add_opts "-machine memory-encryption=sev0"
 fi
 
@@ -249,7 +252,7 @@ if [ "$BR0_STATUS" != "" ]; then
 fi
 
 # start gdbserver
-add_opts "-s"
+[ ! -z ${USE_GDB} ] && add_opts "-s"
 
 # add virtio ring
 if [ "$USE_VIRTIO" = "1" ]; then
diff --git a/stable-commits b/stable-commits
index ccde016..daabcdf 100644
--- a/stable-commits
+++ b/stable-commits
@@ -3,12 +3,12 @@
 #
 
 # hypervisor commit
-KVM_GIT_URL=https://github.com/AMDESE/kvm.git
-KVM_KERNEL_COMMIT=sev-v9-p2
+KERNEL_GIT_URL=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+KERNEL_COMMIT=v4.16-rc4
 
 # qemu commit
 QEMU_GIT_URL=https://github.com/AMDESE/qemu.git
-QEMU_COMMIT=v6-wip-1
+QEMU_COMMIT=v12
 
 # guest bios
 EDK2_GIT_URL=https://github.com/tianocore/edk2.git