From 578a22a3d93c8cb08544226e6210ec705f7cf3c9 Mon Sep 17 00:00:00 2001
From: Dominik Maier <domenukk@gmail.com>
Date: Fri, 16 Feb 2024 20:50:18 +0100
Subject: [PATCH] Revert "Companion patch to qemu-libafl-bridge #46 (#1830)"
 (#1865)

This reverts commit b999b4aac591818d4342773ff48e98f2896f141e.
---
 libafl_qemu/libafl_qemu_build/src/build.rs | 2 +-
 libafl_qemu/src/emu.rs                     | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libafl_qemu/libafl_qemu_build/src/build.rs b/libafl_qemu/libafl_qemu_build/src/build.rs
index 616be88527..17ffe69a07 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 = "194b3a987c751f98c0db0f3537fa789b43b4e663";
+const QEMU_REVISION: &str = "75d15d54f4417a4766d2dcb493982d9df0e8eac4";
 
 pub struct BuildResult {
     pub qemu_path: PathBuf,
diff --git a/libafl_qemu/src/emu.rs b/libafl_qemu/src/emu.rs
index 1289856cd8..e870dbeeca 100644
--- a/libafl_qemu/src/emu.rs
+++ b/libafl_qemu/src/emu.rs
@@ -390,7 +390,7 @@ extern_c_checked! {
     fn read_self_maps() -> *const c_void;
     fn free_self_maps(map_info: *const c_void);
 
-    fn libafl_maps_next(map_info: *const c_void, ret: *mut MapInfo, is_root: bool) -> *const c_void;
+    fn libafl_maps_next(map_info: *const c_void, ret: *mut MapInfo) -> *const c_void;
 
     static exec_path: *const u8;
     static guest_base: usize;
@@ -461,7 +461,6 @@ extern_c_checked! {
 pub struct GuestMaps {
     orig_c_iter: *const c_void,
     c_iter: *const c_void,
-    first_iter: bool,
 }
 
 // Consider a private new only for Emulator
@@ -474,7 +473,6 @@ impl GuestMaps {
             Self {
                 orig_c_iter: maps,
                 c_iter: maps,
-                first_iter: true,
             }
         }
     }
@@ -491,10 +489,7 @@ impl Iterator for GuestMaps {
         }
         unsafe {
             let mut ret = MaybeUninit::uninit();
-            self.c_iter = libafl_maps_next(self.c_iter, ret.as_mut_ptr(), self.first_iter);
-
-            self.first_iter = false;
-
+            self.c_iter = libafl_maps_next(self.c_iter, ret.as_mut_ptr());
             if self.c_iter.is_null() {
                 None
             } else {