[Qemu-devel] [PULL 0/3] Trivial patches for May 2 to June 8 2012

[Qemu-devel] [PULL 0/3] Trivial patches for May 2 to June 8 2012

[Stefan Hajnoczi]

Now that the tree is open, let's get trivial patches moving!  Only a couple so far...

The following changes since commit 083dbf489d1b0592e910ecfb90b3858c23e49ab7:

  target-microblaze: fix swx build breakage (2012-06-07 10:12:00 +0200)

are available in the git repository at:

  git://github.com/stefanha/qemu.git trivial-patches

for you to fetch changes up to 263ddcc81bf45d475ef86100a8567b3fb2129b8d:

  configure: report missing libraries for virtfs (2012-06-08 10:01:45 +0100)

----------------------------------------------------------------
Harsh Prateek Bora (2):
      trace/simple.c: fix deprecated glib2 interface
      configure: report missing libraries for virtfs

Jan Kiszka (1):
      Clarify comments of tb_invalidate_phys_[page_]range

 configure      |    3 ++-
 exec.c         |   22 ++++++++++++----------
 trace/simple.c |    5 ++++-
 3 files changed, 18 insertions(+), 12 deletions(-)

-- 
1.7.10

[Qemu-devel] [PATCH 1/3] Clarify comments of tb_invalidate_phys_[page_]range

[Stefan Hajnoczi]

From: Jan Kiszka <jan.kiszka@siemens.com>

They could suggest that all TBs of the page containing the range would
be invalidated.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 exec.c |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/exec.c b/exec.c
index 1b65859..eacaf3c 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)
 {
-- 
1.7.10

[Qemu-devel] [PATCH 2/3] trace/simple.c: fix deprecated glib2 interface

[Stefan Hajnoczi]

From: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 trace/simple.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/trace/simple.c b/trace/simple.c
index 33ae486..b4a3c6e 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,
-- 
1.7.10

[Qemu-devel] [PATCH 3/3] configure: report missing libraries for virtfs

[Stefan Hajnoczi]

From: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>

Signed-off-by: Harsh Prateek Bora <harsh@linux.vnet.ibm.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 76dd57f..e8f0172 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
-- 
1.7.10

Re: [Qemu-devel] [PULL 0/3] Trivial patches for May 2 to June 8 2012

[Anthony Liguori]

On 06/08/2012 05:02 AM, Stefan Hajnoczi wrote:
> Now that the tree is open, let's get trivial patches moving!  Only a couple so far...
>
> The following changes since commit 083dbf489d1b0592e910ecfb90b3858c23e49ab7:
>
>    target-microblaze: fix swx build breakage (2012-06-07 10:12:00 +0200)
>
> are available in the git repository at:
>
>    git://github.com/stefanha/qemu.git trivial-patches
>
> for you to fetch changes up to 263ddcc81bf45d475ef86100a8567b3fb2129b8d:
>
>    configure: report missing libraries for virtfs (2012-06-08 10:01:45 +0100)

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> ----------------------------------------------------------------
> Harsh Prateek Bora (2):
>        trace/simple.c: fix deprecated glib2 interface
>        configure: report missing libraries for virtfs
>
> Jan Kiszka (1):
>        Clarify comments of tb_invalidate_phys_[page_]range
>
>   configure      |    3 ++-
>   exec.c         |   22 ++++++++++++----------
>   trace/simple.c |    5 ++++-
>   3 files changed, 18 insertions(+), 12 deletions(-)
>