[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/24] cputlb: tweak qemu_ram_addr_from_host_nofail r
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 14/24] cputlb: tweak qemu_ram_addr_from_host_nofail reporting |
Date: |
Fri, 24 Feb 2017 11:20:59 +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>
Reviewed-by: Richard Henderson <address@hidden>
---
cputlb.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/cputlb.c b/cputlb.c
index af0e65cd2c..94fa9977c5 100644
--- a/cputlb.c
+++ b/cputlb.c
@@ -246,18 +246,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;
@@ -469,6 +457,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.11.0
- [Qemu-devel] [PULL 04/24] tcg: move TCG_MO/BAR types into own file, (continued)
- [Qemu-devel] [PULL 04/24] tcg: move TCG_MO/BAR types into own file, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 06/24] tcg: add kick timer for single-threaded vCPU emulation, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 01/24] docs: new design document multi-thread-tcg.txt, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 05/24] tcg: add options for enabling MTTCG, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 07/24] tcg: rename tcg_current_cpu to tcg_current_rr_cpu, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 10/24] tcg: enable tb_lock() for SoftMMU, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 11/24] tcg: enable thread-per-vCPU, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 08/24] tcg: drop global lock during TCG code execution, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 09/24] tcg: remove global exit_request, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 12/24] tcg: handle EXCP_ATOMIC exception for system emulation, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 14/24] cputlb: tweak qemu_ram_addr_from_host_nofail reporting,
Alex Bennée <=
- [Qemu-devel] [PULL 13/24] cputlb: add assert_cpu_is_self checks, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 15/24] cputlb: introduce tlb_flush_* async work., Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 17/24] cputlb: add tlb_flush_by_mmuidx async routines, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 22/24] target-arm: ensure all cross vCPUs TLB flushes complete, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 18/24] cputlb: atomically update tlb fields used by tlb_reset_dirty, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 24/24] tcg: enable MTTCG by default for ARM on x86 hosts, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 23/24] hw/misc/imx6_src: defer clearing of SRC_SCR reset bits, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 20/24] target-arm/powerctl: defer cpu reset work to CPU context, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 16/24] cputlb and arm/sparc targets: convert mmuidx flushes from varg to bitmap, Alex Bennée, 2017/02/24
- [Qemu-devel] [PULL 19/24] cputlb: introduce tlb_flush_*_all_cpus[_synced], Alex Bennée, 2017/02/24