From 8e0fdce32d5d2b2e8a67a30537d169bb263ca5e1 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 23 May 2012 23:41:53 -0300 Subject: Clarify comments of tb_invalidate_phys_[page_]range They could suggest that all TBs of the page containing the range would be invalidated. Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- exec.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/exec.c b/exec.c index 1b65859e50..eacaf3cf41 100644 --- a/exec.c +++ b/exec.c @@ -1076,11 +1076,11 @@ TranslationBlock *tb_gen_code(CPUArchState *env, } /* - * invalidate all TBs which intersect with the target physical pages - * starting in range [start;end[. NOTE: start and end may refer to - * different physical pages. 'is_cpu_write_access' should be true if called - * from a real cpu write access: the virtual CPU will exit the current - * TB if code is modified inside this TB. + * Invalidate all TBs which intersect with the target physical address range + * [start;end[. NOTE: start and end may refer to *different* physical pages. + * 'is_cpu_write_access' should be true if called from a real cpu write + * access: the virtual CPU will exit the current TB if code is modified inside + * this TB. */ void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end, int is_cpu_write_access) @@ -1092,11 +1092,13 @@ void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end, } } -/* invalidate all TBs which intersect with the target physical page - starting in range [start;end[. NOTE: start and end must refer to - the same physical page. 'is_cpu_write_access' should be true if called - from a real cpu write access: the virtual CPU will exit the current - TB if code is modified inside this TB. */ +/* + * Invalidate all TBs which intersect with the target physical address range + * [start;end[. NOTE: start and end must refer to the *same* physical page. + * 'is_cpu_write_access' should be true if called from a real cpu write + * access: the virtual CPU will exit the current TB if code is modified inside + * this TB. + */ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, int is_cpu_write_access) { -- cgit v1.2.1 From 0d665005c7fd3800f1ae590701f60fe7e4c9a57a Mon Sep 17 00:00:00 2001 From: Harsh Prateek Bora Date: Fri, 8 Jun 2012 03:20:42 +0530 Subject: trace/simple.c: fix deprecated glib2 interface Signed-off-by: Harsh Prateek Bora Signed-off-by: Stefan Hajnoczi --- trace/simple.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/trace/simple.c b/trace/simple.c index 33ae48696d..b4a3c6e950 100644 --- a/trace/simple.c +++ b/trace/simple.c @@ -161,8 +161,11 @@ static void trace(TraceEventID event, uint64_t x1, uint64_t x2, uint64_t x3, } timestamp = get_clock(); - +#if GLIB_CHECK_VERSION(2, 30, 0) + idx = g_atomic_int_add((gint *)&trace_idx, 1) % TRACE_BUF_LEN; +#else idx = g_atomic_int_exchange_and_add((gint *)&trace_idx, 1) % TRACE_BUF_LEN; +#endif trace_buf[idx] = (TraceRecord){ .event = event, .timestamp_ns = timestamp, -- cgit v1.2.1 From 263ddcc81bf45d475ef86100a8567b3fb2129b8d Mon Sep 17 00:00:00 2001 From: Harsh Prateek Bora Date: Fri, 8 Jun 2012 03:20:43 +0530 Subject: configure: report missing libraries for virtfs Signed-off-by: Harsh Prateek Bora Signed-off-by: Stefan Hajnoczi --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 76dd57fc27..e8f0172b4b 100755 --- a/configure +++ b/configure @@ -2915,7 +2915,8 @@ if test "$softmmu" = yes ; then tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)" else if test "$virtfs" = yes; then - feature_not_found "virtfs" + echo "VirtFS is supported only on Linux and requires libcap-devel and libattr-devel" + exit 1 fi virtfs=no fi -- cgit v1.2.1