Fixed some format string specifiers

TrungNguyen1909 · Mar 3, 2021 · c6ad970 · c6ad970
1 parent c0fbbf7
commit c6ad970
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
@@ -154,7 +154,7 @@ static inline tcg_target_ulong cpu_tb_exec(CPUState *cpu, TranslationBlock *itb)
 
     qemu_log_mask_and_addr(CPU_LOG_EXEC, itb->pc,
                            "Trace %d: %p ["
-                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#lx] %s\n",
+                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#llx] %s\n",
                            cpu->cpu_index, itb->tc.ptr,
                            itb->cs_base, itb->pc, itb->flags,
                            lookup_symbol(itb->pc));

diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c
@@ -158,7 +158,7 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env)
     }
     qemu_log_mask_and_addr(CPU_LOG_EXEC, pc,
                            "Chain %d: %p ["
-                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#lx] %s\n",
+                           TARGET_FMT_lx "/" TARGET_FMT_lx "/%#llx] %s\n",
                            cpu->cpu_index, tb->tc.ptr, cs_base, pc, flags,
                            lookup_symbol(pc));
     return tb->tc.ptr;

diff --git a/hw/arm/t8030.c b/hw/arm/t8030.c
@@ -186,7 +186,7 @@ static void T8030_ipi_rr_local(CPUARMState *env, const ARMCPRegInfo *ri,
         }
         // fprintf(stderr, "CPU %x sending fast IPI to local CPU %x: value: 0x%llx\n", tcpu->phys_id, phys_id, value);
         if(cpu_id == -1 || c->cpus[cpu_id] == NULL) {
-            fprintf(stderr, "CPU %x failed to send fast IPI to local CPU %x: value: 0x%lx\n", tcpu->phys_id, phys_id, value);
+            fprintf(stderr, "CPU %x failed to send fast IPI to local CPU %x: value: 0x" TARGET_FMT_lx "\n", tcpu->phys_id, phys_id, value);
             return;
         }
         if ((value & ARM64_REG_IPI_RR_TYPE_NOWAKE) == ARM64_REG_IPI_RR_TYPE_NOWAKE){
@@ -230,7 +230,7 @@ static void T8030_ipi_rr_global(CPUARMState *env, const ARMCPRegInfo *ri,
         }
         // fprintf(stderr, "CPU %x sending fast IPI to global CPU %x: value: 0x%llx\n", tcpu->phys_id, phys_id, value);
         if(cpu_id == -1 || c->cpus[cpu_id] == NULL) {
-            fprintf(stderr, "CPU %x failed to send fast IPI to global CPU %x: value: 0x%lx\n", tcpu->phys_id, phys_id, value);
+            fprintf(stderr, "CPU %x failed to send fast IPI to global CPU %x: value: 0x" TARGET_FMT_lx "\n", tcpu->phys_id, phys_id, value);
             return;
         };
         if ((value & ARM64_REG_IPI_RR_TYPE_NOWAKE) == ARM64_REG_IPI_RR_TYPE_NOWAKE){
@@ -286,7 +286,7 @@ static uint64_t T8030_ipi_read_cr(CPUARMState *env, const ARMCPRegInfo *ri)
 static void T8030_ipi_write_cr(CPUARMState *env, const ARMCPRegInfo *ri,
                                          uint64_t value)
 {
-    fprintf(stderr, "T8030 adjusting deferred IPI timeout to %lu\n", value);
+    fprintf(stderr, "T8030 adjusting deferred IPI timeout to " TARGET_FMT_lu "\n", value);
     T8030CPUState *tcpu = T8030_cs_from_env(env);
     T8030MachineState *tms = T8030_MACHINE(tcpu->machine);
     WITH_QEMU_LOCK_GUARD(&tms->mutex){

diff --git a/target/arm/helper.c b/target/arm/helper.c
@@ -13269,7 +13269,7 @@ static inline void assert_hflags_rebuild_correctly(CPUARMState *env)
     uint64_t env_flags_rebuilt = rebuild_hflags_internal(env);
 
     if (unlikely(env_flags_current != env_flags_rebuilt)) {
-        fprintf(stderr, "TCG hflags mismatch (current:0x%16llx rebuilt:0x%16llx)\n",
+        fprintf(stderr, "TCG hflags mismatch (current:0x" TARGET_FMT_plx " rebuilt:0x" TARGET_FMT_plx ")\n",
                 env_flags_current, env_flags_rebuilt);
         abort();
     }