diff --git a/.github/workflows/kernel_test.yml b/.github/workflows/kernel_test.yml index 8e35d8ea..c02320a6 100644 --- a/.github/workflows/kernel_test.yml +++ b/.github/workflows/kernel_test.yml @@ -82,4 +82,4 @@ jobs: - name: Regression Test (Linux EFI Handover Boot Protocol) id: regression_test_linux - run: make run AUTO_TEST=regression ENABLE_KVM=0 BOOT_PROTOCOL=multiboot2 RELEASE=1 \ No newline at end of file + run: make run AUTO_TEST=regression ENABLE_KVM=0 BOOT_PROTOCOL=linux-efi-handover64 RELEASE=1 diff --git a/.github/workflows/vsock_interaction.yml b/.github/workflows/vsock_interaction.yml index 7c8e38ae..0e22676c 100644 --- a/.github/workflows/vsock_interaction.yml +++ b/.github/workflows/vsock_interaction.yml @@ -1,10 +1,7 @@ name: Vsock Interaction on: - pull_request: - push: - branches: - - main + workflow_dispatch: jobs: vsock-test: diff --git a/OSDK.toml b/OSDK.toml index fdf05dfa..cab5e9ae 100644 --- a/OSDK.toml +++ b/OSDK.toml @@ -72,4 +72,4 @@ qemu.args = """\ -device virtconsole,chardev=mux \ -monitor chardev:mux \ -serial chardev:mux \ -""" +""" \ No newline at end of file diff --git a/regression/apps/scripts/run_vsock_test.sh b/regression/apps/scripts/run_vsock_test.sh index a07f3dc4..25c6a458 100644 --- a/regression/apps/scripts/run_vsock_test.sh +++ b/regression/apps/scripts/run_vsock_test.sh @@ -2,6 +2,10 @@ # SPDX-License-Identifier: MPL-2.0 +# To successfully run the vsock test, you should +# 1. Run vsock server binding port 1234 on the host, before running ./vsock_client +# 2. Run vsock client connecting (cid,port)=(3,4321) on the host, after running ./vsock_server + set -e VSOCK_DIR=/regression/vsock diff --git a/tools/qemu_args.sh b/tools/qemu_args.sh index e9ee7fa5..b07ff91a 100755 --- a/tools/qemu_args.sh +++ b/tools/qemu_args.sh @@ -5,7 +5,7 @@ # This script is used to generate QEMU arguments for OSDK. # The positional argument $1 is the scheme. # A switch "-ovmf" can be passed as an argument to enable OVMF. -# The positional argument $2 can be passed as "vsock" to trigger vsock module. +# The enrivonmental variable VSOCK can be passed as 1 to trigger vsock module. RAND_PORT_NUM1=$(shuf -i 1024-65535 -n 1) RAND_PORT_NUM2=$(shuf -i 1024-65535 -n 1)