From 07155358d047b434ec0451ef0378437c916707be Mon Sep 17 00:00:00 2001 From: Lukas Frank Date: Wed, 14 Oct 2026 14:18:09 +0200 Subject: [PATCH] Use upstream ch Signed-off-by: Lukas Frank --- .github/workflows/cloud-hypervisor.yml | 5 ++--- dev-vm/cloud-hypervisor-prepare.sh | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cloud-hypervisor.yml b/.github/workflows/cloud-hypervisor.yml index 9e0b8df..5731581 100644 --- a/.github/workflows/cloud-hypervisor.yml +++ b/.github/workflows/cloud-hypervisor.yml @@ -4,9 +4,8 @@ on: permissions: contents: read env: - #TODO change to upstream once https://github.com/cloud-hypervisor/cloud-hypervisor/pull/8965 is merged - CH_REPO: lukasfrank/cloud-hypervisor - CH_REF: feat/arm-acpi + CH_REPO: cloud-hypervisor/cloud-hypervisor + CH_REF: 0ffe6c9148c7d3d4db53a30b965f4748577ef400 RELEASE_TAG: cloud-hypervisor-fw_cfg jobs: build: diff --git a/dev-vm/cloud-hypervisor-prepare.sh b/dev-vm/cloud-hypervisor-prepare.sh index 1d53af1..7b3c9c3 100644 --- a/dev-vm/cloud-hypervisor-prepare.sh +++ b/dev-vm/cloud-hypervisor-prepare.sh @@ -2,18 +2,25 @@ set -Eeuo pipefail export DEBIAN_FRONTEND=noninteractive +CH_RELEASE_REPO="${CH_RELEASE_REPO:-ironcore-dev/cloud-hypervisor-provider}" +CH_RELEASE_TAG="${CH_RELEASE_TAG:-cloud-hypervisor-fw_cfg}" -curl -L "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v51.1/cloud-hypervisor-static-aarch64" -o "cloud-hypervisor" -curl -L "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v51.1/ch-remote-static-aarch64" -o "ch-remote" +case "$(uname -m)" in + x86_64) SUFFIX="" ;; + aarch64) SUFFIX="-aarch64" ;; + *) echo "unsupported arch $(uname -m)" >&2; exit 1 ;; +esac -#curl -L "https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v51.1/cloud-hypervisor-static" -o "cloud-hypervisor" +BASE_URL="https://github.com/${CH_RELEASE_REPO}/releases/download/${CH_RELEASE_TAG}" -sudo mv cloud-hypervisor /usr/local/bin/ -sudo mv ch-remote /usr/local/bin/ +curl -fL "${BASE_URL}/cloud-hypervisor-static${SUFFIX}" -o cloud-hypervisor -chmod a+x /usr/local/bin/cloud-hypervisor -chmod a+x /usr/local/bin/ch-remote +sudo install -m 0755 cloud-hypervisor /usr/local/bin/cloud-hypervisor +rm -f cloud-hypervisor +sudo curl -fL "https://github.com/cloud-hypervisor/rust-hypervisor-firmware/releases/download/0.5.0/hypervisor-fw${SUFFIX}" -o "/usr/local/bin/hypervisor-fw" +sudo chmod 0755 /usr/local/bin/hypervisor-fw -#sudo curl -L "https://github.com/cloud-hypervisor/rust-hypervisor-firmware/releases/download/0.5.0/hypervisor-fw" -o "/usr/local/bin/hypervisor-fw" -sudo curl -L "https://github.com/cloud-hypervisor/rust-hypervisor-firmware/releases/download/0.5.0/hypervisor-fw-aarch64" -o "/usr/local/bin/hypervisor-fw" +/usr/local/bin/cloud-hypervisor --version +/usr/local/bin/cloud-hypervisor --help | grep -q fw-cfg-config \ + || echo "WARNING: cloud-hypervisor was not built with --features fw_cfg" >&2