From 60474fb56836d1b4cb091c82371157d9b917047c Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 4 Sep 2011 15:17:46 +0200 Subject: [PATCH 1/8] Fix comment (install patch -> install path) Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- vl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vl.c b/vl.c index 5ba9b35860..c9e1975b20 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; } From bca4b9885fc021e5550ac1c488dc0048c2694b79 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 4 Sep 2011 15:29:32 +0200 Subject: [PATCH 2/8] configure: Remove relicts from --enable-io-thread Commit 12d4536f7d911b6d87a766ad7300482ea663cea2 removed configure option --enable-io-thread. Remove help message which is now no longer valid. Cc: Anthony Liguori Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index fe3147b289..f808f48fd3 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" From 6e93a44bc55550fffee80ea314da0357969eea68 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 6 Sep 2011 10:01:36 +0200 Subject: [PATCH 3/8] docs: Fix qdev-device-use.txt typo in -chardev serial, path=COM Signed-off-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- docs/qdev-device-use.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/qdev-device-use.txt b/docs/qdev-device-use.txt index 057c322090..136d271120 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 becomes -chardev serial,path= +* COM becomes -chardev serial,path=COM * file:FNAME becomes -chardev file,path=FNAME From c1ba4e0be16f64567bba8210d8fecf37798f3796 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 5 Sep 2011 18:13:03 +0200 Subject: [PATCH 4/8] qemu-options: Improve help texts for options which depend on configure * 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 Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- qemu-options.hx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 659ecb2db7..552d41ca7e 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 From af2d37de72ea67fddad0d51f5f81d7d7d54fd03a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sun, 4 Sep 2011 18:30:02 +0200 Subject: [PATCH 5/8] configure: Avoid duplicate flags when calling compile_prog 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 Signed-off-by: Stefan Hajnoczi --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f808f48fd3..348f36ae18 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 From 3f9c359507ca3732d1e5669759c95bce098620c5 Mon Sep 17 00:00:00 2001 From: Nathan Kunkee Date: Thu, 8 Sep 2011 21:58:31 -0500 Subject: [PATCH 6/8] SPARC: Trivial patch to clean up npc monitor output This patch fixes the spacing of the PC output from 'info cpus' for SPARC. Signed-off-by: Nathan Kunkee Signed-off-by: Stefan Hajnoczi --- monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor.c b/monitor.c index df0f622067..03ae997ffe 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")); From 069d89b8a8dc5a9af4733bca14763b45bbb2546f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 20 Jul 2011 08:27:28 +0200 Subject: [PATCH 7/8] virtio-9p: Fix syntax error in debug code 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 Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- hw/9pfs/virtio-9p-debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/9pfs/virtio-9p-debug.c b/hw/9pfs/virtio-9p-debug.c index 4636ad51f0..96925f04a4 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; } From 5a61cb60d6ee8d49c553d7959363df26b55f4873 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 8 Sep 2011 17:55:32 +0200 Subject: [PATCH 8/8] Fix include statements for qemu-common.h * 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 Cc: Jan Kiszka Acked-by: Kevin Wolf Signed-off-by: Stefan Weil Signed-off-by: Stefan Hajnoczi --- 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 4df23f4228..d5d4757f62 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -11,7 +11,7 @@ * */ -#include +#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 6bdf4e6ab4..e87e17432e 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 #include #include -#include +#include "qemu-common.h" #ifdef TARGET_GPROF #include #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 96f77fe2d1..273cfa1af4 100644 --- a/nbd.h +++ b/nbd.h @@ -21,7 +21,7 @@ #include -#include +#include "qemu-common.h" #include "block_int.h" diff --git a/qemu-nbd.c b/qemu-nbd.c index 0b25a4dd48..3a39145174 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -16,7 +16,7 @@ * along with this program; if not, see . */ -#include +#include "qemu-common.h" #include "block_int.h" #include "nbd.h" diff --git a/slirp/libslirp.h b/slirp/libslirp.h index 67c70e32e3..a7551235e2 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -1,7 +1,7 @@ #ifndef _LIBSLIRP_H #define _LIBSLIRP_H -#include +#include "qemu-common.h" #ifdef CONFIG_SLIRP