Skip to content

Commit

Permalink
Switches from hv-sys to applevisor-sys (#1031)
Browse files Browse the repository at this point in the history
  • Loading branch information
ultimaweapon authored Oct 12, 2024
1 parent 8b6acdc commit 28f1156
Show file tree
Hide file tree
Showing 13 changed files with 165 additions and 583 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,7 @@ jobs:
build-linux:
name: Build
uses: ./.github/workflows/ci-linux.yml
build-mac-intel:
name: Build
uses: ./.github/workflows/ci-mac.yml
with:
name: Mac Intel
macos: macos-12
kernel-target: x86_64-unknown-none
artifact-name: obliteration-mac-intel
build-mac-m1:
build-mac:
name: Build
uses: ./.github/workflows/ci-mac.yml
with:
Expand Down
13 changes: 2 additions & 11 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,7 @@ jobs:
name: Build
uses: ./.github/workflows/ci-linux.yml
needs: prebuild
build-mac-intel:
name: Build
uses: ./.github/workflows/ci-mac.yml
needs: prebuild
with:
name: Mac Intel
macos: macos-12
kernel-target: x86_64-unknown-none
artifact-name: obliteration-mac-intel
build-mac-m1:
build-mac:
name: Build
uses: ./.github/workflows/ci-mac.yml
needs: prebuild
Expand All @@ -42,7 +33,7 @@ jobs:
postbuild:
name: Post build
runs-on: ubuntu-latest
needs: [build-windows, build-linux, build-mac-intel, build-mac-m1]
needs: [build-windows, build-linux, build-mac]
steps:
- name: Generate build information
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can download binaries from the latest commits [here](https://github.com/obhq

- Windows 10, Linux or macOS 11+.
- On Windows and Linux make sure you have Vulkan 1.3 installed. If you encountered `Failed to initialize Vulkan (-9)` that mean you don't have a Vulkan installed.
- x86-64 CPU. We want to support non-x86 but currently we don't have any developers who are willing to work on this.
- x86-64 CPU.
- CPU with hardware virtualization supports.
- Windows and Linux users may need to enable this feature on the BIOS/UEFI settings.
- A PS4 with system software version 11.00 for firmware dumping.
Expand Down
2 changes: 1 addition & 1 deletion gui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ features = [
]

[target.'cfg(target_os = "macos")'.dependencies]
applevisor-sys = "0.1.3"
core-graphics-types = "0.1.3"
hv-sys = "0.1.1"
metal = "0.29.0"
objc = "0.2.7"

Expand Down
2 changes: 1 addition & 1 deletion gui/src/vmm/hv/aarch64.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use bitfield_struct::bitfield;

/// Features available on a PE.
#[derive(Clone)]
#[derive(Default, Clone)]
pub struct CpuFeats {
/// Raw value of `ID_AA64MMFR0_EL1`.
pub mmfr0: Mmfr0,
Expand Down
4 changes: 2 additions & 2 deletions gui/src/vmm/hv/linux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ impl Hypervisor for Kvm {
type Cpu<'a> = KvmCpu<'a>;
type CpuErr = KvmCpuError;

fn cpu_features(&mut self) -> Result<CpuFeats, Self::CpuErr> {
Ok(self.feats.clone())
fn cpu_features(&self) -> &CpuFeats {
&self.feats
}

fn ram(&self) -> &Ram {
Expand Down
39 changes: 0 additions & 39 deletions gui/src/vmm/hv/macos/aarch64.rs

This file was deleted.

Loading

0 comments on commit 28f1156

Please sign in to comment.