Skip to content

Commit

Permalink
[guest-test] Test Enhance: enhance qemu config option support
Browse files Browse the repository at this point in the history
1. extend for no -kernel qemu option support
2. extend for -monitor telnet option support

[Test Components] tdx
[Test Types] any
[Supported Devices] spr,emr,gnr,srf

Signed-off-by: Hongyu Ning <[email protected]>
  • Loading branch information
hongyuni committed Oct 31, 2023
1 parent 5dcdad9 commit 0604daf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions guest-test/guest.qemu_runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ echo "$SCRIPT_DIR"
# list all the variables value
tdx_pre_check() {
if [[ ! -f $KERNEL_IMG ]]; then
test_print_wrg "In qemu.config.json file, need to set guest kernel properly"
die "TDX guest kernel does not exist..."
test_print_wrg "Guest kernel not set in qemu.config.json file, \
please make sure if it's correct!"
else
test_print_trc "TDX guest kernel to test: $KERNEL_IMG"
fi
Expand Down
3 changes: 2 additions & 1 deletion guest-test/qemu.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"cfg_var_7": "-netdev user,id=mynet0,hostfwd=tcp::$PORT-:22 ",
"cfg_var_8": "-drive file=$GUEST_IMG,if=virtio,format=$IMG_FORMAT ",
"cfg_var_9": "-append \"root=/dev/vda3 ro console=hvc0 earlyprintk=ttyS0 ignore_loglevel debug earlyprintk l1tf=off initcall_debug log_buf_len=200M nokaslr tsc=reliable efi=debug mce=off efi=debug $CMDLINE\" ",
"cfg_var_10": "-bios $BIOS_IMG "
"cfg_var_10": "-bios $BIOS_IMG ",
"cfg_var_11": "-monitor telnet:127.0.0.1:$PORT_TEL,server,nowait "
},

"tdx": {
Expand Down

0 comments on commit 0604daf

Please sign in to comment.