From 7cf7d545a6ccd0fb6e097cd0978da5da81140cb8 Mon Sep 17 00:00:00 2001
From: Andrea Fioraldi <andreafioraldi@gmail.com>
Date: Tue, 17 Jan 2023 11:06:31 +0100
Subject: [PATCH] Update QEMU and fix snapshot restore mem leak (#998)

* Update qemu

* Fix leak

* upd

* fmt
---
 libafl_qemu/libafl_qemu_build/src/bindings.rs |  4 ++++
 libafl_qemu/libafl_qemu_build/src/build.rs    | 10 ++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/libafl_qemu/libafl_qemu_build/src/bindings.rs b/libafl_qemu/libafl_qemu_build/src/bindings.rs
index 1fa77f6d3b..250fef06f4 100644
--- a/libafl_qemu/libafl_qemu_build/src/bindings.rs
+++ b/libafl_qemu/libafl_qemu_build/src/bindings.rs
@@ -17,6 +17,10 @@ const WRAPPER_HEADER: &str = r#"
 #define QEMU_BUILD_BUG_ON(x) 
 #define QEMU_BUILD_BUG_ON_ZERO(x) 
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0]))
+#endif
+
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 
diff --git a/libafl_qemu/libafl_qemu_build/src/build.rs b/libafl_qemu/libafl_qemu_build/src/build.rs
index 813297d47a..c10a6aa7e8 100644
--- a/libafl_qemu/libafl_qemu_build/src/build.rs
+++ b/libafl_qemu/libafl_qemu_build/src/build.rs
@@ -8,7 +8,7 @@ use which::which;
 
 const QEMU_URL: &str = "https://github.com/AFLplusplus/qemu-libafl-bridge";
 const QEMU_DIRNAME: &str = "qemu-libafl-bridge";
-const QEMU_REVISION: &str = "e5424c34d223c2b638af6e4c9eef039db8b69dd4";
+const QEMU_REVISION: &str = "f49d184a90e766d4d4f409160acb6b6c645156cf";
 
 fn build_dep_check(tools: &[&str]) {
     for tool in tools {
@@ -138,12 +138,7 @@ pub fn build(
                 //.arg("--as-static-lib")
                 .arg("--as-shared-lib")
                 .arg(&format!("--target-list={cpu_target}-{target_suffix}"))
-                .args([
-                    "--disable-blobs",
-                    "--disable-bsd-user",
-                    "--disable-fdt",
-                    "--disable-system",
-                ]);
+                .args(["--disable-bsd-user", "--disable-fdt", "--disable-system"]);
             if cfg!(feature = "debug_assertions") {
                 cmd.arg("--enable-debug");
             }
@@ -165,7 +160,6 @@ pub fn build(
                 .arg("--disable-attr")
                 .arg("--disable-auth-pam")
                 .arg("--disable-dbus-display")
-                .arg("--disable-blobs")
                 .arg("--disable-bochs")
                 .arg("--disable-bpf")
                 .arg("--disable-brlapi")