From c136b6b2bf4c186fafe60b17c757b42126588899 Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Mon, 22 Apr 2024 20:03:07 +0800
Subject: [PATCH] fix some compiler warnings

---
 qemu/target/arm/op_helper.c | 4 ++--
 tests/unit/test_x86.c       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/qemu/target/arm/op_helper.c b/qemu/target/arm/op_helper.c
index 813133ae..a9cbc792 100644
--- a/qemu/target/arm/op_helper.c
+++ b/qemu/target/arm/op_helper.c
@@ -967,6 +967,6 @@ uint32_t HELPER(uc_hooksys64)(CPUARMState *env, uint32_t insn, void *hk)
     }
 
     uint32_t ret;
-    JIT_CALLBACK_GUARD_VAR(ret, ((uc_cb_insn_sys_t)(hook->callback))(env->uc, uc_rt, &cp_reg, hook->user_data));
+    JIT_CALLBACK_GUARD_VAR(ret, ((uc_cb_insn_sys_t)(hook->callback))(uc, uc_rt, &cp_reg, hook->user_data));
     return ret;
-}
\ No newline at end of file
+}
diff --git a/tests/unit/test_x86.c b/tests/unit/test_x86.c
index bc438da7..ff9cd43b 100644
--- a/tests/unit/test_x86.c
+++ b/tests/unit/test_x86.c
@@ -1535,7 +1535,6 @@ static void test_fxsave_fpip_x86(void)
         // fxsave stores FPIP at an 8-byte offset, move FPIP to eax register
         0x8b, 0x44, 0x24, 0x08 // movl 0x8(%esp), %eax
     };
-    uc_err err;
     uint32_t X86_NOP_OFFSET = 4;
     uint32_t stack_top = (uint32_t)MEM_STACK;
     uint32_t value;
@@ -1572,7 +1571,6 @@ static void test_fxsave_fpip_x64(void)
         0x48, 0x8b, 0x44, 0x24, 0x08, // movq 0x8(%rsp), %rax
     };
 
-    uc_err err;
     uint64_t stack_top = (uint64_t)MEM_STACK;
     uint64_t X64_NOP_OFFSET = 8;
     uint64_t value;