Skip to content

Fix qemu systemmode: Add nyx feature to gate nyx commands #3432

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
merged 2 commits into from
Oct 1, 2025
Merged

Fix qemu systemmode: Add nyx feature to gate nyx commands #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b8378
Add nyx feature to gate nyx commands
Marcondiro Sep 26, 2025
14ef2a5
disable nyx in CI
Marcondiro Sep 30, 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
2 changes: 2 additions & 0 deletions crates/libafl_qemu/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ slirp = [
intel_pt = ["systemmode", "x86_64", "dep:libafl_intelpt"]
intel_pt_export_raw = ["intel_pt", "libafl_intelpt/export_raw"]

nyx = ["systemmode", "x86_64"]

# Requires the binary's build.rs to call `build_libafl_qemu`
shared = ["libafl_qemu_sys/shared"]

Expand Down
2 changes: 1 addition & 1 deletion crates/libafl_qemu/src/command/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use crate::{
sync_exit::ExitArgs,
};

#[cfg(all(cpu_target = "x86_64", feature = "systemmode"))]
#[cfg(feature = "nyx")]
pub mod nyx;
pub mod parser;

Expand Down
2 changes: 1 addition & 1 deletion crates/libafl_qemu/src/command/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::{
sync_exit::ExitArgs,
};

#[cfg(all(cpu_target = "x86_64", feature = "systemmode"))]
#[cfg(feature = "nyx")]
pub mod nyx;

pub static EMU_EXIT_KIND_MAP: OnceLock<EnumMap<NativeExitKind, Option<ExitKind>>> = OnceLock::new();
Expand Down
4 changes: 2 additions & 2 deletions crates/libafl_qemu/src/emu/drivers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ use crate::{
modules::EmulatorModuleTuple,
};

#[cfg(all(cpu_target = "x86_64", feature = "systemmode"))]
#[cfg(feature = "nyx")]
pub mod nyx;
#[cfg(all(cpu_target = "x86_64", feature = "systemmode"))]
#[cfg(feature = "nyx")]
pub use nyx::{NyxEmulatorDriver, NyxEmulatorDriverBuilder};

#[derive(Debug, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion utils/ci_splitter/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ fn main() -> Result<(), Box<dyn Error>> {
--exclude-features=prelude,python,sancov_pcguard_edges,arm,aarch64,i386,be,systemmode,whole_archive \
--no-dev-deps --exclude libafl_libfuzzer --exclude libafl_qemu --exclude libafl_qemu_sys --exclude libafl_asan_libc --print-command-list; ",
"DOCS_RS=1 cargo hack check -p libafl_qemu -p libafl_qemu_sys --each-feature --clean-per-run \
--exclude-features=prelude,python,sancov_pcguard_edges,arm,aarch64,i386,be,systemmode,whole_archive,slirp,intel_pt,intel_pt_export_raw \
--exclude-features=prelude,python,sancov_pcguard_edges,arm,aarch64,i386,be,systemmode,whole_archive,slirp,intel_pt,intel_pt_export_raw,nyx \
--no-dev-deps --features usermode --print-command-list"
);

Expand Down
Loading