Skip to content

Consolidate duplicate HypervisorType enum #1203

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
Jgprog117 wants to merge 1 commit into
base: main
Choose a base branch
from
+1 −13
Open

Consolidate duplicate HypervisorType enum #1203

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
14 changes: 1 addition & 13 deletions src/hyperlight_host/src/sandbox/hypervisor.rs
View file
Open in desktop
Copy link
Contributor

@dblnz dblnz Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there are also a couple other things that are defined in both files.

I've had a look, and it looks like this file is not used at all, it may be an artifact of some conflict.
Can you remove it please?

If it turns out to not be used at all, could you modify the PR title and/or commit message to reflect that?

Copy link
Contributor

@ludfjig ludfjig Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree with this! Thanks a lot for you contribution!

Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use std::sync::OnceLock;
use crate::hypervisor::virtual_machine::kvm;
#[cfg(mshv3)]
use crate::hypervisor::virtual_machine::mshv;
use crate::hypervisor::virtual_machine::HypervisorType;

static AVAILABLE_HYPERVISOR: OnceLock<Option<HypervisorType>> = OnceLock::new();

Expand Down Expand Up @@ -65,19 +66,6 @@ pub fn get_available_hypervisor() -> &'static Option<HypervisorType> {
})
}

/// The hypervisor types available for the current platform
#[derive(PartialEq, Eq, Debug)]
pub(crate) enum HypervisorType {
#[cfg(kvm)]
Kvm,

#[cfg(mshv3)]
Mshv,

#[cfg(target_os = "windows")]
Whp,
}

// Compiler error if no hypervisor type is available
#[cfg(not(any(kvm, mshv3, target_os = "windows")))]
compile_error!(
Expand Down
Loading