From 60634eef36a982ce2e9b733fc1902a1c19668297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 19 Feb 2024 23:09:57 +0100 Subject: [PATCH 1/2] fix(aarch64): typo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was introduced in https://github.com/hermit-os/uhyve/commit/d1f277ab11d6b7cfc59c6c1c3b32d234f3a9dac2 Signed-off-by: Martin Kröning --- src/macos/aarch64/vcpu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/macos/aarch64/vcpu.rs b/src/macos/aarch64/vcpu.rs index 6758c26e..43a96e53 100644 --- a/src/macos/aarch64/vcpu.rs +++ b/src/macos/aarch64/vcpu.rs @@ -179,7 +179,7 @@ impl VirtualCPU for UhyveCPU { let data_addr = self.vcpu.read_register(Register::X8)?; if let Some(hypercall) = - unsafe { self.address_to_hypercall(port, data_addr as usize) } + unsafe { self.address_to_hypercall(addr, data_addr as usize) } { match hypercall { Hypercall::SerialWriteByte(_char) => { From ab7d47e1453f2cd8fafd1d7a08fb3e5f4b5b9777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Mon, 19 Feb 2024 23:10:16 +0100 Subject: [PATCH 2/2] ci: unify and fix clippy jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/ci.yml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dc2b0755..c57bc207 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,32 +82,18 @@ jobs: clippy: name: Clippy - runs-on: ${{ matrix.os }} - strategy: - matrix: - arch: [x86_64, aarch64] - os: [ubuntu-latest, macos-latest] - exclude: - - arch: aarch64 - os: ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Detect target - run: | - case ${{ matrix.os }} in - ubuntu*) suffix=unknown-linux-gnu ;; - macos*) suffix=apple-darwin ;; - esac - echo "target=${{ matrix.arch }}-$suffix" >> $GITHUB_OUTPUT - id: detect_target - uses: dtolnay/rust-toolchain@stable with: - targets: ${{ steps.detect_target.outputs.target }} + targets: x86_64-unknown-linux-gnu, x86_64-apple-darwin, aarch64-apple-darwin + components: clippy - uses: Swatinem/rust-cache@v2 with: save-if: ${{ github.ref == 'refs/heads/main' }} - name: Clippy - run: cargo clippy --all-targets -- -D warnings + run: cargo clippy --all-targets --target x86_64-unknown-linux-gnu --target x86_64-apple-darwin --target aarch64-apple-darwin -- -D warnings clippy-test-kernel: name: Clippy test-kernels