Skip to content

Commit

Permalink
[tools] Fix QEMU args in gramine-vm.in
Browse files Browse the repository at this point in the history
QEMU arguments changed a bit in v8.2.1 (used in Ubuntu 24.04). Adjust
them in the `gramine-tdx` wrapper script.

Signed-off-by: Dmitrii Kuvaiskii <[email protected]>
  • Loading branch information
dimakuv committed Jul 19, 2024
1 parent 114837e commit 3e35814
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/gramine-vm.in
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ QEMU_PATH="qemu"
QEMU_VM="-cpu host,host-phys-bits,-kvm-steal-time,pmu=off,+tsc-deadline,+invtsc \
-m $QEMU_MEM_SIZE -smp $QEMU_CPU_NUM"
QEMU_OPTS="-enable-kvm -vga none -display none -no-reboot -monitor none \
-object memory-backend-memfd,id=mem,size=$QEMU_MEM_SIZE,private=on \
-object memory-backend-memfd,id=mem,size=$QEMU_MEM_SIZE \
-M memory-backend=mem,hpet=off"

if [ "$TDSHIM_PAL_PATH" == "" ]; then
QEMU_MACHINE="-M q35,kernel_irqchip=split"
QEMU_BINARIES="-kernel $LIBPAL_PATH -device loader,file=$BIOS_PATH"
else
QEMU_MACHINE="-M q35,kernel_irqchip=split,confidential-guest-support=tdx \
-object tdx-guest,id=tdx,quote-generation-service=vsock:2:4050"
-object tdx-guest,id=tdx"
QEMU_BINARIES="-bios $TDSHIM_PAL_PATH"
fi

Expand Down

0 comments on commit 3e35814

Please sign in to comment.