[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 12/19] cputlb: tweak qemu_ram_addr_from_host_nofa
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v6 12/19] cputlb: tweak qemu_ram_addr_from_host_nofail reporting |
Date: |
Wed, 9 Nov 2016 14:57:41 +0000 |
This moves the helper function closer to where it is called and updates
the error message to report via error_report instead of the deprecated
fprintf.
Signed-off-by: Alex Bennée <address@hidden>
---
cputlb.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/cputlb.c b/cputlb.c
index d75bf8f..cd1ff71 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -316,18 +316,6 @@ void tlb_reset_dirty_range(CPUTLBEntry *tlb_entry,
uintptr_t start,
}
}
-static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
-{
- ram_addr_t ram_addr;
-
- ram_addr = qemu_ram_addr_from_host(ptr);
- if (ram_addr == RAM_ADDR_INVALID) {
- fprintf(stderr, "Bad ram pointer %p\n", ptr);
- abort();
- }
- return ram_addr;
-}
-
void tlb_reset_dirty(CPUState *cpu, ram_addr_t start1, ram_addr_t length)
{
CPUArchState *env;
@@ -539,6 +527,18 @@ static void report_bad_exec(CPUState *cpu, target_ulong
addr)
log_cpu_state_mask(LOG_GUEST_ERROR, cpu, CPU_DUMP_FPU | CPU_DUMP_CCOP);
}
+static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr)
+{
+ ram_addr_t ram_addr;
+
+ ram_addr = qemu_ram_addr_from_host(ptr);
+ if (ram_addr == RAM_ADDR_INVALID) {
+ error_report("Bad ram pointer %p", ptr);
+ abort();
+ }
+ return ram_addr;
+}
+
/* NOTE: this function can trigger an exception */
/* NOTE2: the returned address is not exactly the physical address: it
* is actually a ram_addr_t (in system mode; the user mode emulation
--
2.10.1
- [Qemu-devel] [PATCH v6 04/19] tcg: rename tcg_current_cpu to tcg_current_rr_cpu, (continued)
- [Qemu-devel] [PATCH v6 04/19] tcg: rename tcg_current_cpu to tcg_current_rr_cpu, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 05/19] tcg: drop global lock during TCG code execution, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 09/19] tcg: handle EXCP_ATOMIC exception for system emulation, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 02/19] tcg: add options for enabling MTTCG, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 08/19] tcg: enable thread-per-vCPU, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 06/19] tcg: remove global exit_request, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 12/19] cputlb: tweak qemu_ram_addr_from_host_nofail reporting,
Alex Bennée <=
- [Qemu-devel] [PATCH v6 07/19] tcg: enable tb_lock() for SoftMMU, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 10/19] cputlb: add assert_cpu_is_self checks, Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 11/19] cputlb: introduce tlb_flush_* async work., Alex Bennée, 2016/11/09
- [Qemu-devel] [PATCH v6 15/19] target-arm/cpu: don't reset TLB structures, use cputlb to do it, Alex Bennée, 2016/11/09