From a2d150f959edc568582149d258599d12872da153 Mon Sep 17 00:00:00 2001 From: Tom Lendacky Date: Thu, 1 Feb 2024 16:36:38 -0600 Subject: [PATCH] scripts: Update the stable commits and launch script Point to the latest versions of the SVSM support - v4. Additionally, adjust the Qemu launch script to work with the latest SNP hypervisor support. Signed-off-by: Tom Lendacky --- scripts/launch-qemu.sh | 4 ++-- scripts/stable-commits | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/launch-qemu.sh b/scripts/launch-qemu.sh index 3267fd2..1588a6e 100755 --- a/scripts/launch-qemu.sh +++ b/scripts/launch-qemu.sh @@ -319,8 +319,8 @@ if [ -n "${SEV_GUEST}" ]; then fi if [ -n "$SEV_SNP_GUEST" -a -n "$SNP_UPM" ]; then - add_opts "-machine type=q35,confidential-guest-support=sev0,memory-backend=ram1,kvm-type=protected,vmport=off${SVSM:+,svsm=$SVSM}" - add_opts "-object memory-backend-memfd-private,id=ram1,size=$MEM,share=true" + add_opts "-machine type=q35,confidential-guest-support=sev0,memory-backend=ram1,vmport=off${SVSM:+,svsm=$SVSM}" + add_opts "-object memory-backend-memfd,id=ram1,size=$MEM,share=true,prealloc=false" else add_opts "-m ${MEM}${MAX_MEM:+,slots=5,maxmem=$MAX_MEM}" add_opts "-machine type=q35,confidential-guest-support=sev0,vmport=off${SVSM:+,svsm=$SVSM}" diff --git a/scripts/stable-commits b/scripts/stable-commits index 9fa63ed..bc273be 100644 --- a/scripts/stable-commits +++ b/scripts/stable-commits @@ -6,13 +6,13 @@ # Hypervisor commit KERNEL_GIT_URL="https://github.com/AMDESE/linux.git" -KERNEL_HOST_BRANCH="svsm-preview-hv-v3" -KERNEL_GUEST_BRANCH="svsm-preview-guest-v3" +KERNEL_HOST_BRANCH="svsm-preview-hv-v4" +KERNEL_GUEST_BRANCH="svsm-preview-guest-v4" # qemu commit QEMU_GIT_URL="https://github.com/AMDESE/qemu.git" -QEMU_BRANCH="svsm-preview-v3" +QEMU_BRANCH="svsm-preview-v4" # Guest BIOS (OVMF) OVMF_GIT_URL="https://github.com/AMDESE/ovmf" -OVMF_BRANCH="svsm-preview-v3" +OVMF_BRANCH="svsm-preview-v4"