qemu changes

Removing bogus code in build qemu experimental Fixes: #5593 Signed-off-by: Unmesh Deodhar <[email protected]>
kata-containers · Jul 7, 2023 · 6487c74 · 6487c74
1 parent 7c24bef
commit 6487c74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/.ci/install_kata.sh b/.ci/install_kata.sh
@@ -65,7 +65,7 @@ install_qemu(){
 	echo "Installing qemu"
 	if [ "$experimental_qemu" == "true" ]; then
 		echo "Install experimental Qemu"
-		"${cidir}/install_qemu_experimental.sh" -t "${KATA_BUILD_QEMU_TYPE}"
+		"${cidir}/install_qemu_experimental.sh"
 	else
 		"${cidir}/install_qemu.sh" -t "${KATA_BUILD_QEMU_TYPE}"
 	fi

diff --git a/.ci/install_qemu_experimental.sh b/.ci/install_qemu_experimental.sh
@@ -16,7 +16,6 @@ source "${cidir}/../lib/common.bash"
 source /etc/os-release || source /usr/lib/os-release
 
 KATA_DEV_MODE="${KATA_DEV_MODE:-}"
-KATA_BUILD_QEMU_TYPE=""
 
 CURRENT_QEMU_TAG=$(get_version "assets.hypervisor.qemu-experimental.version")
 PACKAGING_DIR="${katacontainers_repo_dir}/tools/packaging"
@@ -27,11 +26,7 @@ qemu_experimental_latest_build_url="${jenkins_url}/job/qemu-experimental-nightly
 bindir="${DESTDIR:-}/usr/bin"
 libexecdir="${DESTDIR:-}/usr/libexec/"
 
-if [ "${KATA_BUILD_QEMU_TYPE}" == "snp" ]; then
-	QEMU_PATH="/opt/confidential-containers/bin/qemu-system-x86_64-snp"
-else
-	QEMU_PATH="/opt/kata/bin/qemu-system-x86_64-experimental"
-fi
+QEMU_PATH="/opt/kata/bin/qemu-system-x86_64-experimental"
 DEST_QEMU_PATH="${bindir}/qemu-system-$(uname -m)"
 VIRTIOFSD_PATH="/opt/kata/libexec/kata-qemu-experimental/virtiofsd-experimental"
 DEST_VIRTIOFSD_PATH="${libexecdir}/kata-qemu/virtiofsd"
@@ -69,17 +64,6 @@ main() {
 	if [ "$arch" != "x86_64" ]; then
 		die "Unsupported architecture: $arch"
 	fi
-
-	while getopts "ht:" opt; do
-		case "$opt" in
-			h)
-				usage 0
-				;;
-			t)
-				KATA_BUILD_QEMU_TYPE="${OPTARG}"
-				;;
-		esac
-	done
 	cached_qemu_experimental_version=$(curl -sfL "${qemu_experimental_latest_build_url}/latest") || cached_qemu_experimental_version="none"
 	info "Cached qemu experimental version: $cached_qemu_experimental_version"
 	info "Current qemu experimental version: $CURRENT_QEMU_TAG"