[Qemu-devel] [PULL 0/8] Trivial patches for September 3 to 9 2011

[Qemu-devel] [PULL 0/8] Trivial patches for September 3 to 9 2011

[Stefan Hajnoczi]

The following changes since commit 07ff2c4475df77e38a31d50ee7f3932631806c15:

  Merge remote-tracking branch 'origin/master' into staging (2011-09-08 09:25:36 -0500)

are available in the git repository at:

  ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Markus Armbruster (1):
      docs: Fix qdev-device-use.txt typo in -chardev serial, path=COM<NUM>

Nathan Kunkee (1):
      SPARC: Trivial patch to clean up npc monitor output

Stefan Weil (6):
      Fix comment (install patch -> install path)
      configure: Remove relicts from --enable-io-thread
      qemu-options: Improve help texts for options which depend on configure
      configure: Avoid duplicate flags when calling compile_prog
      virtio-9p: Fix syntax error in debug code
      Fix include statements for qemu-common.h

 configure                 |    3 +--
 docs/qdev-device-use.txt  |    2 +-
 hw/9pfs/virtio-9p-debug.c |    2 +-
 hw/virtio-blk.c           |    2 +-
 linux-user/syscall.c      |    3 +--
 monitor.c                 |    2 +-
 nbd.h                     |    2 +-
 qemu-nbd.c                |    2 +-
 qemu-options.hx           |   10 +++++-----
 slirp/libslirp.h          |    2 +-
 vl.c                      |    2 +-
 11 files changed, 15 insertions(+), 17 deletions(-)

-- 
1.7.5.4

[Qemu-devel] [PATCH 1/8] Fix comment (install patch -> install path)

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 vl.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/vl.c b/vl.c
index 5ba9b35..c9e1975 100644
--- a/vl.c
+++ b/vl.c
@@ -3061,7 +3061,7 @@ int main(int argc, char **argv, char **envp)
     if (!data_dir) {
         data_dir = os_find_datadir(argv[0]);
     }
-    /* If all else fails use the install patch specified when building.  */
+    /* If all else fails use the install path specified when building. */
     if (!data_dir) {
         data_dir = CONFIG_QEMU_DATADIR;
     }
-- 
1.7.5.4

[Qemu-devel] [PATCH 2/8] configure: Remove relicts from --enable-io-thread

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

Commit 12d4536f7d911b6d87a766ad7300482ea663cea2 removed
configure option --enable-io-thread.

Remove help message which is now no longer valid.

Cc: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index fe3147b..f808f48 100755
--- a/configure
+++ b/configure
@@ -1025,7 +1025,6 @@ echo "  --disable-linux-aio      disable Linux AIO support"
 echo "  --enable-linux-aio       enable Linux AIO support"
 echo "  --disable-attr           disables attr and xattr support"
 echo "  --enable-attr            enable attr and xattr support"
-echo "  --enable-io-thread       enable IO thread"
 echo "  --disable-blobs          disable installing provided firmware blobs"
 echo "  --enable-docs            enable documentation build"
 echo "  --disable-docs           disable documentation build"
-- 
1.7.5.4

[Qemu-devel] [PATCH 3/8] docs: Fix qdev-device-use.txt typo in -chardev serial, path=COM<NUM>

[Stefan Hajnoczi]

From: Markus Armbruster <armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 docs/qdev-device-use.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt
index 057c322..136d271 100644
--- a/docs/qdev-device-use.txt
+++ b/docs/qdev-device-use.txt
@@ -208,7 +208,7 @@ LEGACY-CHARDEV translates to -chardev HOST-OPTS... as follows:
 
 * con: becomes -chardev console
 
-* COM<NUM> becomes -chardev serial,path=<NUM>
+* COM<NUM> becomes -chardev serial,path=COM<NUM>
 
 * file:FNAME becomes -chardev file,path=FNAME
 
-- 
1.7.5.4

[Qemu-devel] [PATCH 4/8] qemu-options: Improve help texts for options which depend on configure

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

* Replace "available only" by the more common "only available".

* Tracing options depend on the configuration of the QEMU executable,
  so clarify the help text for both options.

Cc: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 qemu-options.hx |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qemu-options.hx b/qemu-options.hx
index 659ecb2..552d41c 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -1412,7 +1412,7 @@ qemu linux.img -net nic,macaddr=52:54:00:12:34:56 \
 Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and
 listening for incoming connections on @var{socketpath}. Use GROUP @var{groupname}
 and MODE @var{octalmode} to change default ownership and permissions for
-communication port. This option is available only if QEMU has been compiled
+communication port. This option is only available if QEMU has been compiled
 with vde support enabled.
 
 Example:
@@ -2453,13 +2453,13 @@ Specify tracing options.
 Immediately enable events listed in @var{file}.
 The file must contain one event name (as listed in the @var{trace-events} file)
 per line.
-
-This option is only available when using the @var{simple} and @var{stderr}
-tracing backends.
+This option is only available if QEMU has been compiled with
+either @var{simple} or @var{stderr} tracing backend.
 @item file=@var{file}
 Log output traces to @var{file}.
 
-This option is only available when using the @var{simple} tracing backend.
+This option is only available if QEMU has been compiled with
+the @var{simple} tracing backend.
 @end table
 ETEXI
 
-- 
1.7.5.4

[Qemu-devel] [PATCH 5/8] configure: Avoid duplicate flags when calling compile_prog

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

This patch removes redundant shell code and cleans it a little bit.

Shell macro compile_prog takes two arguments:
local_cflags and local ldflags.

$QEMU_CFLAGS is added automatically to the cflags, so there is no need
to pass it as an argument.

It is also unnecessary to pass -Werror twice.

$flag is a compiler warning option, so it should be in local_cflags
instead of local_ldflags.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 configure |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure b/configure
index f808f48..348f36a 100755
--- a/configure
+++ b/configure
@@ -1070,7 +1070,7 @@ cat > $TMPC << EOF
 int main(void) { return 0; }
 EOF
 for flag in $gcc_flags; do
-    if compile_prog "-Werror $QEMU_CFLAGS" "-Werror $flag" ; then
+    if compile_prog "$flag -Werror" "" ; then
 	QEMU_CFLAGS="$QEMU_CFLAGS $flag"
     fi
 done
-- 
1.7.5.4

[Qemu-devel] [PATCH 6/8] SPARC: Trivial patch to clean up npc monitor output

[Stefan Hajnoczi]

From: Nathan Kunkee <nkunkee42@hotmail.com>

This patch fixes the spacing of the PC output from 'info cpus' for
SPARC.

Signed-off-by: Nathan Kunkee <nkunkee42@hotmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 monitor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/monitor.c b/monitor.c
index df0f622..03ae997 100644
--- a/monitor.c
+++ b/monitor.c
@@ -886,7 +886,7 @@ static void print_cpu_iter(QObject *obj, void *opaque)
     monitor_printf(mon, "nip=0x" TARGET_FMT_lx,
                    (target_long) qdict_get_int(cpu, "nip"));
 #elif defined(TARGET_SPARC)
-    monitor_printf(mon, "pc=0x " TARGET_FMT_lx,
+    monitor_printf(mon, "pc=0x" TARGET_FMT_lx,
                    (target_long) qdict_get_int(cpu, "pc"));
     monitor_printf(mon, "npc=0x" TARGET_FMT_lx,
                    (target_long) qdict_get_int(cpu, "npc"));
-- 
1.7.5.4

[Qemu-devel] [PATCH 7/8] virtio-9p: Fix syntax error in debug code

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

This error was reported by cppcheck:

qemu/hw/9pfs/virtio-9p-debug.c:342:
error: Invalid number of character ({) when these macros are defined:
'DEBUG_DATA'.

Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/9pfs/virtio-9p-debug.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c
index 4636ad5..96925f0 100644
--- a/hw/9pfs/virtio-9p-debug.c
+++ b/hw/9pfs/virtio-9p-debug.c
@@ -295,7 +295,7 @@ static void pprint_data(V9fsPDU *pdu, int rx, size_t *offsetp, const char *name)
 
     if (rx) {
         count = pdu->elem.in_num;
-    } else
+    } else {
         count = pdu->elem.out_num;
     }
 
-- 
1.7.5.4

[Qemu-devel] [PATCH 8/8] Fix include statements for qemu-common.h

[Stefan Hajnoczi]

From: Stefan Weil <weil@mail.berlios.de>

* qemu-common.h is not a system include file, so it should be included
  with "" instead of <>. Otherwise incremental builds might fail
  because only local include files are checked for changes.

* linux-user/syscall.c included the file twice.

Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Jan Kiszka <jan.kiszka@siemens.com>
Acked-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
 hw/virtio-blk.c      |    2 +-
 linux-user/syscall.c |    3 +--
 nbd.h                |    2 +-
 qemu-nbd.c           |    2 +-
 slirp/libslirp.h     |    2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 4df23f4..d5d4757 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -11,7 +11,7 @@
  *
  */
 
-#include <qemu-common.h>
+#include "qemu-common.h"
 #include "qemu-error.h"
 #include "trace.h"
 #include "blockdev.h"
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6bdf4e6..e87e174 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -60,7 +60,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <linux/wireless.h>
-#include <qemu-common.h>
+#include "qemu-common.h"
 #ifdef TARGET_GPROF
 #include <sys/gmon.h>
 #endif
@@ -96,7 +96,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
 #include "cpu-uname.h"
 
 #include "qemu.h"
-#include "qemu-common.h"
 
 #if defined(CONFIG_USE_NPTL)
 #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
diff --git a/nbd.h b/nbd.h
index 96f77fe..273cfa1 100644
--- a/nbd.h
+++ b/nbd.h
@@ -21,7 +21,7 @@
 
 #include <sys/types.h>
 
-#include <qemu-common.h>
+#include "qemu-common.h"
 
 #include "block_int.h"
 
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 0b25a4d..3a39145 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <qemu-common.h>
+#include "qemu-common.h"
 #include "block_int.h"
 #include "nbd.h"
 
diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 67c70e3..a755123 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -1,7 +1,7 @@
 #ifndef _LIBSLIRP_H
 #define _LIBSLIRP_H
 
-#include <qemu-common.h>
+#include "qemu-common.h"
 
 #ifdef CONFIG_SLIRP
 
-- 
1.7.5.4

Re: [Qemu-devel] [PULL 0/8] Trivial patches for September 3 to 9 2011

[Anthony Liguori]

On 09/09/2011 04:24 AM, Stefan Hajnoczi wrote:
> The following changes since commit 07ff2c4475df77e38a31d50ee7f3932631806c15:
>
>    Merge remote-tracking branch 'origin/master' into staging (2011-09-08 09:25:36 -0500)
>
> are available in the git repository at:
>
>    ssh://repo.or.cz/srv/git/qemu/stefanha.git trivial-patches

Pulled.  Thanks.

Regards,

Anthony Liguori

>
> Markus Armbruster (1):
>        docs: Fix qdev-device-use.txt typo in -chardev serial, path=COM<NUM>
>
> Nathan Kunkee (1):
>        SPARC: Trivial patch to clean up npc monitor output
>
> Stefan Weil (6):
>        Fix comment (install patch ->  install path)
>        configure: Remove relicts from --enable-io-thread
>        qemu-options: Improve help texts for options which depend on configure
>        configure: Avoid duplicate flags when calling compile_prog
>        virtio-9p: Fix syntax error in debug code
>        Fix include statements for qemu-common.h
>
>   configure                 |    3 +--
>   docs/qdev-device-use.txt  |    2 +-
>   hw/9pfs/virtio-9p-debug.c |    2 +-
>   hw/virtio-blk.c           |    2 +-
>   linux-user/syscall.c      |    3 +--
>   monitor.c                 |    2 +-
>   nbd.h                     |    2 +-
>   qemu-nbd.c                |    2 +-
>   qemu-options.hx           |   10 +++++-----
>   slirp/libslirp.h          |    2 +-
>   vl.c                      |    2 +-
>   11 files changed, 15 insertions(+), 17 deletions(-)
>