Skip to content

add loongarch64 support #368

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add loongarch64 support #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ jobs:
## ARMv6
- { os: 'ubuntu-latest', target: 'arm-unknown-linux-gnueabihf', cross: true }
- { os: 'ubuntu-latest', target: 'arm-unknown-linux-musleabihf', cross: true }
## LOONGARCH64
- { os: 'ubuntu-latest', target: 'loongarch64-unknown-linux-gnu', cross: true }

toolchain:
- 1.46.0 # MSRV
- stable
Expand Down
4 changes: 2 additions & 2 deletions heim-host/src/os/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use std::net::IpAddr;
use crate::Pid;

cfg_if::cfg_if! {
// aarch64-unknown-linux-gnu has different type
if #[cfg(all(target_arch = "aarch64", not(target_family = "musl")))] {
// aarch64-unknown-linux-gnu and loongarch64-unknown-linux-gnu has different type
if #[cfg(all(any(target_arch = "aarch64", target_arch = "loongarch64"), not(target_family = "musl")))] {
/// User session ID.
pub type SessionId = i64;
} else {
Expand Down
9 changes: 6 additions & 3 deletions heim-virt/src/sys/linux/device_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use heim_common::prelude::StreamExt;
target_arch = "arm",
target_arch = "aarch64",
target_arch = "powerpc",
target_arch = "powerpc64"
target_arch = "powerpc64",
target_arch = "loongarch64"
))]
use heim_common::prelude::TryFutureExt;
use heim_runtime as rt;
Expand Down Expand Up @@ -54,7 +55,8 @@ where
target_arch = "arm",
target_arch = "aarch64",
target_arch = "powerpc",
target_arch = "powerpc64"
target_arch = "powerpc64",
target_arch = "loongarch64"
))]
pub async fn detect_vm_device_tree() -> Result<Virtualization, ()> {
hypervisor(HYPERVISOR_COMPAT_PATH)
Expand All @@ -66,7 +68,8 @@ pub async fn detect_vm_device_tree() -> Result<Virtualization, ()> {
target_arch = "arm",
target_arch = "aarch64",
target_arch = "powerpc",
target_arch = "powerpc64"
target_arch = "powerpc64",
target_arch = "loongarch64"
)))]
pub async fn detect_vm_device_tree() -> Result<Virtualization, ()> {
Err(())
Expand Down
6 changes: 4 additions & 2 deletions heim-virt/src/sys/linux/dmi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use crate::Virtualization;
target_arch = "x86",
target_arch = "x86_64",
target_arch = "arm",
target_arch = "aarch64"
target_arch = "aarch64",
target_arch = "loongarch64"
))]
pub async fn detect_vm_dmi() -> Result<Virtualization, ()> {
let probe_files = vec![
Expand Down Expand Up @@ -43,7 +44,8 @@ pub async fn detect_vm_dmi() -> Result<Virtualization, ()> {
target_arch = "x86",
target_arch = "x86_64",
target_arch = "arm",
target_arch = "aarch64"
target_arch = "aarch64",
target_arch = "loongarch64"
)))]
pub async fn detect_vm_dmi() -> Result<Virtualization, ()> {
Err(())
Expand Down