Skip to content

Migrate to Rust Edition 2024 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hky1999 merged 4 commits into from
Jan 8, 2025
Merged

Migrate to Rust Edition 2024 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d40e9a
Migrate to Rust Edition 2024
hky1999 Jan 1, 2025
1e48a6c
[fix] update rust toolchain version
hky1999 Jan 1, 2025
7a35c93
[fix] change toolchain version in ci doc to fix ci error
hky1999 Jan 2, 2025
8c39a19
[fix] update url
hky1999 Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust-toolchain: [nightly-2024-05-02, nightly-2024-08-24]
rust-toolchain: [nightly-2024-12-25, nightly]
targets: [x86_64-unknown-linux-gnu, x86_64-unknown-none, riscv64gc-unknown-none-elf, aarch64-unknown-none-softfloat]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@nightly
with:
toolchain: nightly-2024-05-02
toolchain: nightly-2024-12-25
- name: Build docs
continue-on-error: ${{ github.ref != env.default-branch && github.event_name != 'pull_request' }}
run: |
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "axvm"
version = "0.1.0"
edition = "2021"
edition = "2024"

[features]
default = ["vmx"]
Expand All @@ -16,8 +16,8 @@ spin = "0.9"
axerrno = "0.1.0"
# kspin = "0.1.0"
memory_addr = "0.3.1"
page_table_entry = { version = "0.4.2", features = ["arm-el2"] }
page_table_multiarch = "0.4.2"
page_table_entry = { version = "0.5", features = ["arm-el2"] }
page_table_multiarch = "0.5"
percpu = { version = "0.1.4", features = ["arm-el2"] }

# System dependent modules provided by ArceOS-Hypervisor.
Expand Down
5 changes: 0 additions & 5 deletions rust-toolchain.toml
View file
Open in desktop

This file was deleted.

8 changes: 5 additions & 3 deletions src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use alloc::sync::Arc;
use alloc::vec::Vec;
use core::sync::atomic::{AtomicBool, Ordering};

use axerrno::{ax_err, ax_err_type, AxResult};
use axerrno::{AxResult, ax_err, ax_err_type};
use spin::Mutex;

use axaddrspace::{AddrSpace, GuestPhysAddr, HostPhysAddr, MappingFlags};
Expand All @@ -13,7 +13,7 @@ use axvcpu::{AxArchVCpu, AxVCpu, AxVCpuExitReason, AxVCpuHal};

use crate::config::{AxVMConfig, VmMemMappingType};
use crate::vcpu::{AxArchVCpuImpl, AxVCpuCreateConfig};
use crate::{has_hardware_support, AxVMHal};
use crate::{AxVMHal, has_hardware_support};

const VM_ASPACE_BASE: usize = 0x0;
const VM_ASPACE_SIZE: usize = 0x7fff_ffff_f000;
Expand Down Expand Up @@ -104,7 +104,9 @@ impl<H: AxVMHal, U: AxVCpuHal> AxVM<H, U> {

// Check mapping flags.
if mapping_flags.contains(MappingFlags::DEVICE) {
warn!("Do not include DEVICE flag in memory region flags, it should be configured in pass_through_devices");
warn!(
"Do not include DEVICE flag in memory region flags, it should be configured in pass_through_devices"
);
continue;
}

Expand Down
Loading