Skip to content

LibAFL QEMU update to v10.0.0 #3181

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.

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 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ cc = "1.1.21"
cmake = "0.1.51"
document-features = "0.2.10"
fastbloom = { version = "0.9.0", default-features = false }
hashbrown = { version = "0.15.3", default-features = false } # A faster hashmap, nostd compatible
hashbrown = { version = "0.14.5", default-features = false } # A faster hashmap, nostd compatible
just = "1.40.0"
libc = "0.2.159" # For (*nix) libc
libipt = "0.3.0"
Expand Down
8 changes: 3 additions & 5 deletions libafl_qemu/libafl_qemu_build/src/bindings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ const WRAPPER_HEADER: &str = r#"
#include "migration/savevm.h"
#include "hw/core/sysemu-cpu-ops.h"
#include "exec/address-spaces.h"
#include "sysemu/tcg.h"
#include "sysemu/runstate.h"
#include "sysemu/replay.h"
#include "exec/target_page.h"
#include "system/system.h"

#include "libafl/system.h"
#include "libafl/qemu_snapshot.h"
Expand All @@ -67,11 +66,9 @@ const WRAPPER_HEADER: &str = r#"
#include "exec/cpu-common.h"
#include "exec/cpu-all.h"
#include "exec/exec-all.h"
#include "exec/translate-all.h"
#include "exec/log.h"
#include "trace/trace-root.h"
#include "qemu/accel.h"
#include "hw/core/accel-cpu.h"

#include "tcg/tcg.h"
#include "tcg/tcg-op.h"
Expand Down Expand Up @@ -122,6 +119,7 @@ pub fn generate(
.derive_default(true)
.impl_debug(true)
.generate_comments(true)
.wrap_static_fns(true)
.default_enum_style(bindgen::EnumVariation::NewType {
is_global: true,
is_bitfield: true,
Expand Down
2 changes: 1 addition & 1 deletion libafl_qemu/libafl_qemu_build/src/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use crate::cargo_add_rpath;

pub const QEMU_URL: &str = "https://github.com/AFLplusplus/qemu-libafl-bridge";
pub const QEMU_DIRNAME: &str = "qemu-libafl-bridge";
pub const QEMU_REVISION: &str = "97bef506eed24ee8d0eda4a07c4419c55dae4acb";
pub const QEMU_REVISION: &str = "d20fb07d99ffccd481b439e104ae3624ef5c75da";

pub struct BuildResult {
pub qemu_path: PathBuf,
Expand Down
1 change: 1 addition & 0 deletions libafl_qemu/libafl_qemu_sys/src/bindings/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#![expect(improper_ctypes)]
#![expect(unsafe_op_in_unsafe_fn)]
#![allow(unused_imports)]
#![allow(unnecessary_transmutes)]

#[cfg(all(not(feature = "clippy"), target_os = "linux"))]
#[rustfmt::skip]
Expand Down
Loading
Loading