diff options
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | docs/qdev-device-use.txt | 2 | ||||
| -rw-r--r-- | hw/9pfs/virtio-9p-debug.c | 2 | ||||
| -rw-r--r-- | hw/virtio-blk.c | 2 | ||||
| -rw-r--r-- | linux-user/syscall.c | 3 | ||||
| -rw-r--r-- | monitor.c | 2 | ||||
| -rw-r--r-- | nbd.h | 2 | ||||
| -rw-r--r-- | qemu-nbd.c | 2 | ||||
| -rw-r--r-- | qemu-options.hx | 10 | ||||
| -rw-r--r-- | slirp/libslirp.h | 2 | ||||
| -rw-r--r-- | vl.c | 2 |
11 files changed, 15 insertions, 17 deletions
@@ -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" @@ -1071,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 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<NUM> becomes -chardev serial,path=<NUM> +* COM<NUM> becomes -chardev serial,path=COM<NUM> * file:FNAME becomes -chardev file,path=FNAME 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; } 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 <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 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 <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 | \ @@ -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")); @@ -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 0b25a4dd48..3a39145174 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/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 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 <qemu-common.h> +#include "qemu-common.h" #ifdef CONFIG_SLIRP @@ -3062,7 +3062,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; } |