* [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31
@ 2017-07-31 10:21 Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 01/25] tests: check-qom-proplist: fix leak Michael Tokarev
` (25 more replies)
0 siblings, 26 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Tokarev, qemu-trivial
Here's a collection of trivial stuff merged to date.
A few minor cleanups, older tests trivial fixes, changing
crash to clean exit for unicore32 and tricore, and many
small documentation fixes mostly by Philippe Mathieu-Daudé.
Please consider applying.
Thanks,
/mjt
The following changes since commit 0c26c080ee592ea47597d3ab8fd712d7d2c4ba0f:
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170731' into staging (2017-07-31 09:59:26 +0100)
are available in the git repository at:
git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
for you to fetch changes up to 25e11d8774630600ef4c5e9906419a77163a28a1:
docs: fix broken paths to docs/specs/ivshmem-spec.txt (2017-07-31 13:13:01 +0300)
----------------------------------------------------------------
trivial patches for 2017-07-31
----------------------------------------------------------------
Cleber Rosa (1):
docs: fix broken paths to docs/interop dir
Eduardo Otubo (2):
fix qemu-system-unicore32 crashing when calling without -kernel
qemu-system-tricore: segfault when entering "x 0" on the monitor
Marc-André Lureau (3):
tests: check-qom-proplist: fix leak
tests: test-netfilter && pxe-test require slirp
build-sys: there is no qemu-ga.c
Philippe Mathieu-Daudé (18):
tests: add missing dependency to build QTEST_QEMU_BINARY
loader: check get_image_size() return value
ivshmem: fix incorrect error handling in ivshmem_recv_msg()
qcow2: fix null pointer dereference
ui/vnc: fix leak of SocketAddress **
net/eth: fix incorrect check of iov_to_buf() return value
m68k/translate: fix incorrect copy/paste
linux-user/sh4: fix incorrect memory write
syscall: fix dereference of undefined pointer
syscall: fix use of uninitialized values
syscall: check inotify() and eventfd() return value
thunk: assert nb_fields is valid
docs: fix broken paths to docs/interop/qcow2.txt
docs: fix broken paths to docs/devel/qapi-code-gen.txt
docs: fix broken paths to docs/devel/atomics.txt
docs: fix broken paths to docs/devel/tracing.txt
docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg
docs: fix broken paths to docs/specs/ivshmem-spec.txt
Thomas Huth (1):
MAINTAINERS: Improve the NetBSD regex pattern
MAINTAINERS | 2 +-
Makefile | 2 +-
audio/trace-events | 2 +-
block/qcow2-refcount.c | 4 ++--
block/trace-events | 2 +-
chardev/trace-events | 2 +-
crypto/trace-events | 2 +-
docs/devel/lockcnt.txt | 2 +-
docs/devel/writing-qmp-commands.txt | 4 ++--
docs/qcow2-cache.txt | 2 +-
docs/specs/pci-ids.txt | 2 +-
docs/usb2.txt | 2 +-
hw/9pfs/trace-events | 2 +-
hw/acpi/trace-events | 2 +-
hw/alpha/trace-events | 2 +-
hw/arm/trace-events | 2 +-
hw/audio/trace-events | 2 +-
hw/block/dataplane/trace-events | 2 +-
hw/block/trace-events | 2 +-
hw/char/trace-events | 2 +-
hw/core/loader.c | 4 ++--
hw/display/trace-events | 2 +-
hw/dma/trace-events | 2 +-
hw/i386/trace-events | 2 +-
hw/input/trace-events | 2 +-
hw/intc/trace-events | 2 +-
hw/isa/trace-events | 2 +-
hw/mem/trace-events | 2 +-
hw/misc/ivshmem.c | 5 ++++-
hw/misc/trace-events | 2 +-
hw/net/trace-events | 2 +-
hw/nvram/trace-events | 2 +-
hw/pci/trace-events | 2 +-
hw/ppc/trace-events | 2 +-
hw/s390x/trace-events | 2 +-
hw/scsi/trace-events | 2 +-
hw/sd/trace-events | 2 +-
hw/sparc/trace-events | 2 +-
hw/timer/trace-events | 2 +-
hw/unicore32/puv3.c | 5 ++++-
hw/usb/trace-events | 2 +-
hw/vfio/trace-events | 2 +-
hw/virtio/trace-events | 2 +-
hw/xen/trace-events | 2 +-
include/qapi/visitor.h | 2 +-
include/qemu/atomic.h | 4 ++--
io/trace-events | 2 +-
linux-user/elfload.c | 2 +-
linux-user/syscall.c | 18 ++++++++++++++----
linux-user/trace-events | 2 +-
migration/trace-events | 2 +-
net/eth.c | 4 ++--
net/trace-events | 2 +-
qapi-schema.json | 4 ++--
qapi/introspect.json | 2 +-
qapi/qapi-util.c | 2 +-
qom/trace-events | 2 +-
scripts/qapi2texi.py | 2 +-
scripts/simpletrace.py | 2 +-
target/arm/trace-events | 2 +-
target/i386/trace-events | 2 +-
target/m68k/translate.c | 2 +-
target/mips/trace-events | 2 +-
target/ppc/trace-events | 2 +-
target/s390x/trace-events | 2 +-
target/sparc/trace-events | 2 +-
target/tricore/cpu.c | 10 ++++++++++
tcg/README | 2 +-
tests/Makefile.include | 10 +++++-----
tests/check-qom-proplist.c | 2 ++
thunk.c | 3 ++-
ui/trace-events | 2 +-
ui/vnc.c | 36 ++++++++++++++++++------------------
util/trace-events | 2 +-
74 files changed, 131 insertions(+), 102 deletions(-)
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 01/25] tests: check-qom-proplist: fix leak
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel Michael Tokarev
` (24 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, qemu-trivial, Michael Tokarev
From: Marc-André Lureau <marcandre.lureau@redhat.com>
user_creatable_add_opts() returns a reference (the other reference is
for the root parent/child link).
Leak introduced in commit a1af255f065cc.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
tests/check-qom-proplist.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index 432b66585f..c51e6e734d 100644
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -428,6 +428,8 @@ static void test_dummy_createcmdl(void)
g_assert(err == NULL);
error_free(err);
+ object_unref(OBJECT(dobj));
+
/*
* cmdline-parsing via qemu_opts_parse() results in a QemuOpts entry
* corresponding to the Object's ID to be added to the QemuOptsList
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 01/25] tests: check-qom-proplist: fix leak Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 03/25] MAINTAINERS: Improve the NetBSD regex pattern Michael Tokarev
` (23 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Eduardo Otubo, qemu-trivial, Michael Tokarev
From: Eduardo Otubo <otubo@redhat.com>
Starting qemu-system-unicore32 without the -kernel parameter results in
an assert() returns false and aborts qemu. This patch replaces it with a
proper error message followed by exit(1).
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/unicore32/puv3.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index e9d1a60b6f..ff62efb4df 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -92,7 +92,10 @@ static void puv3_load_kernel(const char *kernel_filename)
if (kernel_filename == NULL && qtest_enabled()) {
return;
}
- assert(kernel_filename != NULL);
+ if (kernel_filename == NULL) {
+ error_report("kernel parameter cannot be empty");
+ exit(1);
+ }
/* only zImage format supported */
size = load_image_targphys(kernel_filename, KERNEL_LOAD_ADDR,
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 03/25] MAINTAINERS: Improve the NetBSD regex pattern
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 01/25] tests: check-qom-proplist: fix leak Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 04/25] tests: test-netfilter && pxe-test require slirp Michael Tokarev
` (22 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, qemu-trivial, Michael Tokarev
From: Thomas Huth <thuth@redhat.com>
Currently get_maintainers.pl claims that the configure script is
maintained by Kamil:
$ scripts/get_maintainer.pl -f configure
Kamil Rytarowski <kamil@netbsd.org> (maintainer:NETBSD)
qemu-devel@nongnu.org (open list:All patches CC here)
This happens because the regex pattern for the NETBSD entry triggers
on everything that contains the keyword "NetBSD". Ease the situation
a little bit by restricting this to "Subject:" lines only, like
we do it in the "trivial patches" section already.
Reported-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
MAINTAINERS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 5ea273f899..577e17b78d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -353,7 +353,7 @@ NETBSD
L: qemu-devel@nongnu.org
M: Kamil Rytarowski <kamil@netbsd.org>
S: Maintained
-K: (?i)NetBSD
+K: ^Subject:.*(?i)NetBSD
W32, W64
L: qemu-devel@nongnu.org
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 04/25] tests: test-netfilter && pxe-test require slirp
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (2 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 03/25] MAINTAINERS: Improve the NetBSD regex pattern Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 05/25] build-sys: there is no qemu-ga.c Michael Tokarev
` (21 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, qemu-trivial, Michael Tokarev
From: Marc-André Lureau <marcandre.lureau@redhat.com>
If slirp is disabled, it will fail with:
qemu-system-x86_64: -netdev user,id=qtest-bn0: Parameter 'type' expects a netdev backend type
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
tests/Makefile.include | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 7af278db55..98387d3a51 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -219,7 +219,7 @@ gcov-files-i386-y += hw/block/hd-geometry.c
check-qtest-i386-y += tests/boot-order-test$(EXESUF)
check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
check-qtest-i386-y += tests/boot-serial-test$(EXESUF)
-check-qtest-i386-y += tests/pxe-test$(EXESUF)
+check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
@@ -259,7 +259,7 @@ check-qtest-i386-$(CONFIG_VHOST_NET_TEST_i386) += tests/vhost-user-test$(EXESUF)
ifeq ($(CONFIG_VHOST_NET_TEST_i386),)
check-qtest-x86_64-$(CONFIG_VHOST_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
endif
-check-qtest-i386-y += tests/test-netfilter$(EXESUF)
+check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
check-qtest-i386-y += tests/test-filter-mirror$(EXESUF)
check-qtest-i386-y += tests/test-filter-redirector$(EXESUF)
check-qtest-i386-y += tests/postcopy-test$(EXESUF)
@@ -293,7 +293,7 @@ check-qtest-ppc64-y += tests/drive_del-test$(EXESUF)
check-qtest-ppc64-y += tests/postcopy-test$(EXESUF)
check-qtest-ppc64-y += tests/boot-serial-test$(EXESUF)
check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
-check-qtest-ppc64-y += tests/pxe-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-ohci.c
check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
@@ -301,7 +301,7 @@ gcov-files-ppc64-y += hw/usb/hcd-uhci.c
check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
gcov-files-ppc64-y += hw/usb/hcd-xhci.c
check-qtest-ppc64-y += $(check-qtest-virtio-y)
-check-qtest-ppc64-y += tests/test-netfilter$(EXESUF)
+check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
check-qtest-ppc64-y += tests/test-filter-mirror$(EXESUF)
check-qtest-ppc64-y += tests/test-filter-redirector$(EXESUF)
check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 05/25] build-sys: there is no qemu-ga.c
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (3 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 04/25] tests: test-netfilter && pxe-test require slirp Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor Michael Tokarev
` (20 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, qemu-trivial, Michael Tokarev
From: Marc-André Lureau <marcandre.lureau@redhat.com>
It got moved in qga/main.c from commit 2870dc3456c9c.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index ef721480eb..97a58a0f4e 100644
--- a/Makefile
+++ b/Makefile
@@ -443,7 +443,7 @@ $(qapi-modules) $(SRC_PATH)/scripts/qapi-introspect.py $(qapi-py)
"GEN","$@")
QGALIB_GEN=$(addprefix qga/qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qmp-commands.h)
-$(qga-obj-y) qemu-ga.o: $(QGALIB_GEN)
+$(qga-obj-y): $(QGALIB_GEN)
qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (4 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 05/25] build-sys: there is no qemu-ga.c Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY Michael Tokarev
` (19 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Eduardo Otubo, qemu-trivial, Michael Tokarev
From: Eduardo Otubo <otubo@redhat.com>
Starting Qemu with "qemu-system-tricore -nographic -M tricore_testboard -S"
and entering "x 0" at the monitor prompt leads to Segmentation fault.
This happens because tricore_cpu_get_phys_page_debug() is not implemented
yet, this is a temporary workaround to avoid the crash.
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
target/tricore/cpu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/target/tricore/cpu.c b/target/tricore/cpu.c
index 08f50e2ba7..5ab5b56454 100644
--- a/target/tricore/cpu.c
+++ b/target/tricore/cpu.c
@@ -22,6 +22,15 @@
#include "cpu.h"
#include "qemu-common.h"
#include "exec/exec-all.h"
+#include "qemu/error-report.h"
+
+static hwaddr tricore_cpu_get_phys_page_attrs_debug(CPUState *cpu, vaddr addr,
+ MemTxAttrs *attrs)
+{
+ error_report("function cpu_get_phys_page_attrs_debug not "
+ "implemented, aborting");
+ return -1;
+}
static inline void set_feature(CPUTriCoreState *env, int feature)
{
@@ -176,6 +185,7 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data)
cc->dump_state = tricore_cpu_dump_state;
cc->set_pc = tricore_cpu_set_pc;
cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb;
+ cc->get_phys_page_attrs_debug = tricore_cpu_get_phys_page_attrs_debug;
}
static void cpu_register(const TriCoreCPUInfo *info)
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (5 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 08/25] loader: check get_image_size() return value Michael Tokarev
` (18 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
This allow a one liner from fresh repository clone, i.e.:
./configure && make -j check-qtest-aarch64
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
tests/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 98387d3a51..59e536bf0b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -830,7 +830,7 @@ GCOV_OPTIONS = -n $(if $(V),-f,)
# gtester tests, possibly with verbose output
.PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS))
-$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y)
+$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: subdir-%-softmmu $(check-qtest-y)
$(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,)
$(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \
QTEST_QEMU_IMG=qemu-img$(EXESUF) \
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 08/25] loader: check get_image_size() return value
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (6 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg() Michael Tokarev
` (17 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
since a negative value means it errored.
hw/core/loader.c:149:9: warning: Loss of sign in implicit conversion
if (size > max_sz) {
^~~~
hw/core/loader.c:171:9: warning: Loss of sign in implicit conversion
if (size > memory_region_size(mr)) {
^~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/core/loader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/core/loader.c b/hw/core/loader.c
index e5e8cbb638..ebe574c7ea 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -146,7 +146,7 @@ int load_image_targphys_as(const char *filename,
int size;
size = get_image_size(filename);
- if (size > max_sz) {
+ if (size < 0 || size > max_sz) {
return -1;
}
if (size > 0) {
@@ -168,7 +168,7 @@ int load_image_mr(const char *filename, MemoryRegion *mr)
size = get_image_size(filename);
- if (size > memory_region_size(mr)) {
+ if (size < 0 || size > memory_region_size(mr)) {
return -1;
}
if (size > 0) {
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg()
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (7 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 08/25] loader: check get_image_size() return value Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 10/25] qcow2: fix null pointer dereference Michael Tokarev
` (16 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Screwed up in commit 3a55fc0f, v2.6.0.
If qemu_chr_fe_read_all() returns -EINTR the do {} statement continues and the
n accumulator used to complete reads upto sizeof(msg) is decremented by 4 (the
value of EINTR on Linux).
To avoid that, use simpler if() statements and continue if EINTR occured.
hw/misc/ivshmem.c:650:14: warning: Loss of sign in implicit conversion
} while (n < sizeof(msg));
^
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/misc/ivshmem.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index a58f9ee579..47a015f072 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -642,7 +642,10 @@ static int64_t ivshmem_recv_msg(IVShmemState *s, int *pfd, Error **errp)
do {
ret = qemu_chr_fe_read_all(&s->server_chr, (uint8_t *)&msg + n,
sizeof(msg) - n);
- if (ret < 0 && ret != -EINTR) {
+ if (ret < 0) {
+ if (ret == -EINTR) {
+ continue;
+ }
error_setg_errno(errp, -ret, "read from server failed");
return INT64_MIN;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 10/25] qcow2: fix null pointer dereference
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (8 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg() Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 11/25] ui/vnc: fix leak of SocketAddress ** Michael Tokarev
` (15 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
It seems this assert() was somehow misplaced.
block/qcow2-refcount.c:2193:42: warning: Array access (from variable 'on_disk_reftable') results in a null pointer dereference
on_disk_reftable[refblock_index] = refblock_offset;
~~~~~~~~~~~~~~~~ ^
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
block/qcow2-refcount.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index c9b0dcb4f3..168fc32e7b 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -2189,6 +2189,8 @@ write_refblocks:
* this will leak that range, but we can easily fix that by running
* a leak-fixing check after this rebuild operation */
reftable_offset = -1;
+ } else {
+ assert(on_disk_reftable);
}
on_disk_reftable[refblock_index] = refblock_offset;
@@ -2258,8 +2260,6 @@ write_refblocks:
goto write_refblocks;
}
- assert(on_disk_reftable);
-
for (refblock_index = 0; refblock_index < reftable_size; refblock_index++) {
cpu_to_be64s(&on_disk_reftable[refblock_index]);
}
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 11/25] ui/vnc: fix leak of SocketAddress **
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (9 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 10/25] qcow2: fix null pointer dereference Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value Michael Tokarev
` (14 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Extract the (correct) cleaning code as a new function vnc_free_addresses() then
use it to remove the memory leaks.
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
ui/vnc.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index eb91559b6b..651cbb8606 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3521,6 +3521,20 @@ static int vnc_display_get_address(const char *addrstr,
return ret;
}
+static void vnc_free_addresses(SocketAddress ***retsaddr,
+ size_t *retnsaddr)
+{
+ size_t i;
+
+ for (i = 0; i < *retnsaddr; i++) {
+ qapi_free_SocketAddress((*retsaddr)[i]);
+ }
+ g_free(*retsaddr);
+
+ *retsaddr = NULL;
+ *retnsaddr = 0;
+}
+
static int vnc_display_get_addresses(QemuOpts *opts,
bool reverse,
SocketAddress ***retsaddr,
@@ -3538,7 +3552,6 @@ static int vnc_display_get_addresses(QemuOpts *opts,
bool has_ipv6 = qemu_opt_get(opts, "ipv6");
bool ipv4 = qemu_opt_get_bool(opts, "ipv4", false);
bool ipv6 = qemu_opt_get_bool(opts, "ipv6", false);
- size_t i;
int displaynum = -1;
int ret = -1;
@@ -3614,16 +3627,8 @@ static int vnc_display_get_addresses(QemuOpts *opts,
ret = 0;
cleanup:
if (ret < 0) {
- for (i = 0; i < *retnsaddr; i++) {
- qapi_free_SocketAddress((*retsaddr)[i]);
- }
- g_free(*retsaddr);
- for (i = 0; i < *retnwsaddr; i++) {
- qapi_free_SocketAddress((*retwsaddr)[i]);
- }
- g_free(*retwsaddr);
- *retsaddr = *retwsaddr = NULL;
- *retnsaddr = *retnwsaddr = 0;
+ vnc_free_addresses(retsaddr, retnsaddr);
+ vnc_free_addresses(retwsaddr, retnwsaddr);
}
return ret;
}
@@ -3772,7 +3777,6 @@ void vnc_display_open(const char *id, Error **errp)
int acl = 0;
int lock_key_sync = 1;
int key_delay_ms;
- size_t i;
if (!vd) {
error_setg(errp, "VNC display not active");
@@ -3993,12 +3997,8 @@ void vnc_display_open(const char *id, Error **errp)
}
cleanup:
- for (i = 0; i < nsaddr; i++) {
- qapi_free_SocketAddress(saddr[i]);
- }
- for (i = 0; i < nwsaddr; i++) {
- qapi_free_SocketAddress(wsaddr[i]);
- }
+ vnc_free_addresses(&saddr, &nsaddr);
+ vnc_free_addresses(&wsaddr, &nwsaddr);
return;
fail:
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (10 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 11/25] ui/vnc: fix leak of SocketAddress ** Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 13/25] m68k/translate: fix incorrect copy/paste Michael Tokarev
` (13 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
So we have sizeof(struct in6_address) != sizeof(uintptr_t)
and Clang > Coverity on this, see 4555ca6816c :)
net/eth.c:426:30: warning: The code calls sizeof() on a pointer type. This can produce an unexpected result
return bytes_read == sizeof(dst_addr);
^ ~~~~~~~~~~
net/eth.c:475:34: warning: The code calls sizeof() on a pointer type. This can produce an unexpected result
return bytes_read == sizeof(src_addr);
^ ~~~~~~~~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Dmitry Fleytman <dmitry@daynix.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
net/eth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index 5b9ba26a56..ae5d881aae 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -423,7 +423,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int pkt_frags,
rthdr_offset + sizeof(*ext_hdr),
dst_addr, sizeof(*dst_addr));
- return bytes_read == sizeof(dst_addr);
+ return bytes_read == sizeof(*dst_addr);
}
return false;
@@ -472,7 +472,7 @@ _eth_get_rss_ex_src_addr(const struct iovec *pkt, int pkt_frags,
opt_offset + sizeof(opthdr),
src_addr, sizeof(*src_addr));
- return bytes_read == sizeof(src_addr);
+ return bytes_read == sizeof(*src_addr);
}
opt_offset += optlen;
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 13/25] m68k/translate: fix incorrect copy/paste
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (11 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 14/25] linux-user/sh4: fix incorrect memory write Michael Tokarev
` (12 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
db3d7945ae extended gen_cc_cond() for cond [6, 7, 9, 10] but misswrote [4, 5]
target/m68k/translate.c:1323:70: warning: identical expressions on both sides of logical operator
if (op == CC_OP_ADDB || op == CC_OP_ADDW || op == CC_OP_ADDL ||
op == CC_OP_ADDB || op == CC_OP_ADDW || op == CC_OP_ADDL) {
~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~ ^
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
target/m68k/translate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index ada2a91b64..be24355080 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -1321,7 +1321,7 @@ static void gen_cc_cond(DisasCompare *c, DisasContext *s, int cond)
case 5: /* CS (C) */
/* Some cases fold C into X. */
if (op == CC_OP_ADDB || op == CC_OP_ADDW || op == CC_OP_ADDL ||
- op == CC_OP_ADDB || op == CC_OP_ADDW || op == CC_OP_ADDL) {
+ op == CC_OP_SUBB || op == CC_OP_SUBW || op == CC_OP_SUBL) {
tcond = TCG_COND_NE;
c->v1 = QREG_CC_X;
goto done;
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 14/25] linux-user/sh4: fix incorrect memory write
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (12 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 13/25] m68k/translate: fix incorrect copy/paste Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer Michael Tokarev
` (11 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
not hit since 2009! :)
linux-user/elfload.c:1102:20: warning: Out of bound memory access (access exceeds upper limit of memory block)
(*regs[i]) = tswap32(env->gregs[i]);
~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
linux-user/elfload.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 2a902f7806..79062882ba 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -1099,7 +1099,7 @@ static inline void elf_core_copy_regs(target_elf_gregset_t *regs,
int i;
for (i = 0; i < 16; i++) {
- (*regs[i]) = tswapreg(env->gregs[i]);
+ (*regs)[i] = tswapreg(env->gregs[i]);
}
(*regs)[TARGET_REG_PC] = tswapreg(env->pc);
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (13 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 14/25] linux-user/sh4: fix incorrect memory write Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 13:01 ` Peter Maydell
2017-07-31 10:21 ` [Qemu-devel] [PULL 16/25] syscall: fix use of uninitialized values Michael Tokarev
` (10 subsequent siblings)
25 siblings, 1 reply; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
linux-user/syscall.c:5581:9: warning: Dereference of undefined pointer value
if (*host_rt_dev_ptr != 0) {
^~~~~~~~~~~~~~~~
Reported-by: Clang Static Analyzer
Suggested-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
linux-user/syscall.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 003943b736..71d45a9963 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5573,6 +5573,7 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
field_types, THUNK_HOST);
}
unlock_user(argptr, arg, 0);
+ assert(host_rt_dev_ptr);
ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
if (*host_rt_dev_ptr != 0) {
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 16/25] syscall: fix use of uninitialized values
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (14 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 17/25] syscall: check inotify() and eventfd() return value Michael Tokarev
` (9 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
linux-user/syscall.c:1627:35: warning: 1st function call argument is an uninitialized value
target_saddr->sa_family = tswap16(addr->sa_family);
^~~~~~~~~~~~~~~~~~~~~~~~
linux-user/syscall.c:1629:25: warning: The left operand of '==' is a garbage value
if (addr->sa_family == AF_NETLINK && len >= sizeof(struct sockaddr_nl)) {
~~~~~~~~~~~~~~~ ^
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
linux-user/syscall.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 71d45a9963..81f52f7483 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1622,6 +1622,7 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr,
if (len == 0) {
return 0;
}
+ assert(addr);
target_saddr = lock_user(VERIFY_WRITE, target_addr, len, 0);
if (!target_saddr)
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 17/25] syscall: check inotify() and eventfd() return value
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (15 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 16/25] syscall: fix use of uninitialized values Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 18/25] thunk: assert nb_fields is valid Michael Tokarev
` (8 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
linux-user/syscall.c:555:25: warning: Out of bound memory access (accessed memory precedes memory block)
target_fd_trans[fd] = trans;
~~~~~~~~~~~~~~~~~~~~^~~~~~~
Reported-by: Clang Static Analyzer
Suggested-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
linux-user/syscall.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 81f52f7483..dfc1301e63 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11742,7 +11742,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_inotify_init) && defined(__NR_inotify_init)
case TARGET_NR_inotify_init:
ret = get_errno(sys_inotify_init());
- fd_trans_register(ret, &target_inotify_trans);
+ if (ret >= 0) {
+ fd_trans_register(ret, &target_inotify_trans);
+ }
break;
#endif
#ifdef CONFIG_INOTIFY1
@@ -11750,7 +11752,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_inotify_init1:
ret = get_errno(sys_inotify_init1(target_to_host_bitmask(arg1,
fcntl_flags_tbl)));
- fd_trans_register(ret, &target_inotify_trans);
+ if (ret >= 0) {
+ fd_trans_register(ret, &target_inotify_trans);
+ }
break;
#endif
#endif
@@ -11916,7 +11920,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#if defined(TARGET_NR_eventfd)
case TARGET_NR_eventfd:
ret = get_errno(eventfd(arg1, 0));
- fd_trans_register(ret, &target_eventfd_trans);
+ if (ret >= 0) {
+ fd_trans_register(ret, &target_eventfd_trans);
+ }
break;
#endif
#if defined(TARGET_NR_eventfd2)
@@ -11930,7 +11936,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
host_flags |= O_CLOEXEC;
}
ret = get_errno(eventfd(arg1, host_flags));
- fd_trans_register(ret, &target_eventfd_trans);
+ if (ret >= 0) {
+ fd_trans_register(ret, &target_eventfd_trans);
+ }
break;
}
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 18/25] thunk: assert nb_fields is valid
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (16 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 17/25] syscall: check inotify() and eventfd() return value Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 19/25] docs: fix broken paths to docs/interop dir Michael Tokarev
` (7 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
thunk.c:91:32: warning: Call to 'malloc' has an allocation size of 0 bytes
se->field_offsets[i] = malloc(nb_fields * sizeof(int));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Reported-by: Clang Static Analyzer
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
thunk.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/thunk.c b/thunk.c
index 2dac36666d..d5d8645cd4 100644
--- a/thunk.c
+++ b/thunk.c
@@ -67,7 +67,6 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
int nb_fields, offset, max_align, align, size, i, j;
assert(id < max_struct_entries);
- se = struct_entries + id;
/* first we count the number of fields */
type_ptr = types;
@@ -76,6 +75,8 @@ void thunk_register_struct(int id, const char *name, const argtype *types)
type_ptr = thunk_type_next(type_ptr);
nb_fields++;
}
+ assert(nb_fields > 0);
+ se = struct_entries + id;
se->field_types = types;
se->nb_fields = nb_fields;
se->name = name;
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 19/25] docs: fix broken paths to docs/interop dir
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (17 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 18/25] thunk: assert nb_fields is valid Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 20/25] docs: fix broken paths to docs/interop/qcow2.txt Michael Tokarev
` (6 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel
Cc: Cleber Rosa, qemu-trivial, Philippe Mathieu-Daudé, Michael Tokarev
From: Cleber Rosa <crosa@redhat.com>
With the move of some docs to docs/interop on d59157e, a couple of
references were not updated.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
[PMD: fixed a typo and another reference of docs/interop/qmp-spec.txt]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/devel/writing-qmp-commands.txt | 2 +-
qapi-schema.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/devel/writing-qmp-commands.txt b/docs/devel/writing-qmp-commands.txt
index 1e6375495b..69793e320e 100644
--- a/docs/devel/writing-qmp-commands.txt
+++ b/docs/devel/writing-qmp-commands.txt
@@ -8,7 +8,7 @@ into the QAPI framework implementation.
For an in-depth introduction to the QAPI framework, please refer to
docs/qapi-code-gen.txt. For documentation about the QMP protocol,
-start with docs/qmp-intro.txt.
+start with docs/interop/qmp-intro.txt.
== Overview ==
diff --git a/qapi-schema.json b/qapi-schema.json
index c96f0a26f6..802ea53d00 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -23,7 +23,7 @@
# | -> data issued by the Client
# | <- Server data response
#
-# Please, refer to the QMP specification (docs/qmp-spec.txt) for
+# Please, refer to the QMP specification (docs/interop/qmp-spec.txt) for
# detailed information on the Server command and response formats.
#
# = Stability Considerations
@@ -108,7 +108,7 @@
#
# Notes: This command is valid exactly when first connecting: it must be
# issued before any other command will be accepted, and will fail once the
-# monitor is accepting other commands. (see qemu docs/qmp-spec.txt)
+# monitor is accepting other commands. (see qemu docs/interop/qmp-spec.txt)
#
# Since: 0.13
#
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 20/25] docs: fix broken paths to docs/interop/qcow2.txt
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (18 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 19/25] docs: fix broken paths to docs/interop dir Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 21/25] docs: fix broken paths to docs/devel/qapi-code-gen.txt Michael Tokarev
` (5 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
With the move of some docs to docs/interop on d59157ea05,
a reference path was not updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/qcow2-cache.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt
index 1fdd6f9ce7..b0571de4b8 100644
--- a/docs/qcow2-cache.txt
+++ b/docs/qcow2-cache.txt
@@ -15,7 +15,7 @@ not a straightforward operation.
This document attempts to give an overview of the L2 and refcount
caches, and how to configure them.
-Please refer to the docs/specs/qcow2.txt file for an in-depth
+Please refer to the docs/interop/qcow2.txt file for an in-depth
technical description of the qcow2 file format.
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 21/25] docs: fix broken paths to docs/devel/qapi-code-gen.txt
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (19 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 20/25] docs: fix broken paths to docs/interop/qcow2.txt Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt Michael Tokarev
` (4 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
With the move of some docs to docs/interop on ac06724a71,
a couple of references were not updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/devel/writing-qmp-commands.txt | 2 +-
include/qapi/visitor.h | 2 +-
qapi/introspect.json | 2 +-
qapi/qapi-util.c | 2 +-
scripts/qapi2texi.py | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/devel/writing-qmp-commands.txt b/docs/devel/writing-qmp-commands.txt
index 69793e320e..4f5b24c0c4 100644
--- a/docs/devel/writing-qmp-commands.txt
+++ b/docs/devel/writing-qmp-commands.txt
@@ -7,7 +7,7 @@ This document doesn't discuss QMP protocol level details, nor does it dive
into the QAPI framework implementation.
For an in-depth introduction to the QAPI framework, please refer to
-docs/qapi-code-gen.txt. For documentation about the QMP protocol,
+docs/devel/qapi-code-gen.txt. For documentation about the QMP protocol,
start with docs/interop/qmp-intro.txt.
== Overview ==
diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index fe9faf469f..0f3b8cb459 100644
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -36,7 +36,7 @@
* QemuOpts, and clone visitors have some implementation limitations;
* see the documentation for each visitor for more details on what it
* supports. Also, see visitor-impl.h for the callback contracts
- * implemented by each visitor, and docs/qapi-code-gen.txt for more
+ * implemented by each visitor, and docs/devel/qapi-code-gen.txt for more
* about the QAPI code generator.
*
* All of the visitors are created via:
diff --git a/qapi/introspect.json b/qapi/introspect.json
index 1dbaef56eb..cf77ff0669 100644
--- a/qapi/introspect.json
+++ b/qapi/introspect.json
@@ -226,7 +226,7 @@
#
# @members: the alternate type's members, in no particular order.
# The members' wire encoding is distinct, see
-# docs/qapi-code-gen.txt section Alternate types.
+# docs/devel/qapi-code-gen.txt section Alternate types.
#
# On the wire, this can be any of the members.
#
diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index e28dbd0ac3..46eda7d196 100644
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -40,7 +40,7 @@ int qapi_enum_parse(const char * const lookup[], const char *buf,
* It may be prefixed by __RFQDN_ (downstream extension), where RFQDN
* may contain only letters, digits, hyphen and period.
* The special exception for enumeration names is not implemented.
- * See docs/qapi-code-gen.txt for more on QAPI naming rules.
+ * See docs/devel/qapi-code-gen.txt for more on QAPI naming rules.
* Keep this consistent with scripts/qapi.py!
* If @complete, the parse fails unless it consumes @str completely.
* Return its length on success, -1 on failure.
diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
index 9e015002ef..a317526e51 100755
--- a/scripts/qapi2texi.py
+++ b/scripts/qapi2texi.py
@@ -91,7 +91,7 @@ def texi_format(doc):
# doesn't.
#
# Make sure to update section "Documentation markup" in
- # docs/qapi-code-gen.txt when fixing this.
+ # docs/devel/qapi-code-gen.txt when fixing this.
if line.startswith('| '):
line = EXAMPLE_FMT(code=line[2:])
elif line.startswith('= '):
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (20 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 21/25] docs: fix broken paths to docs/devel/qapi-code-gen.txt Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 23/25] docs: fix broken paths to docs/devel/tracing.txt Michael Tokarev
` (3 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
With the move of some docs/ to docs/devel/ on ac06724a71,
a couple of references were not updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/devel/lockcnt.txt | 2 +-
include/qemu/atomic.h | 4 ++--
tcg/README | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/devel/lockcnt.txt b/docs/devel/lockcnt.txt
index 2a79b3205b..7c099bc6c8 100644
--- a/docs/devel/lockcnt.txt
+++ b/docs/devel/lockcnt.txt
@@ -145,7 +145,7 @@ can also be more efficient in two ways:
- on some platforms, one can implement QemuLockCnt to hold the lock
and the mutex in a single word, making the fast path no more expensive
than simply managing a counter using atomic operations (see
- docs/atomics.txt). This can be very helpful if concurrent access to
+ docs/devel/atomics.txt). This can be very helpful if concurrent access to
the data structure is expected to be rare.
diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h
index e07c7972ab..b6b62fb771 100644
--- a/include/qemu/atomic.h
+++ b/include/qemu/atomic.h
@@ -8,7 +8,7 @@
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*
- * See docs/atomics.txt for discussion about the guarantees each
+ * See docs/devel/atomics.txt for discussion about the guarantees each
* atomic primitive is meant to provide.
*/
@@ -427,7 +427,7 @@
* sequentially consistent operations.
*
* As long as they are used as paired operations they are safe to
- * use. See docs/atomic.txt for more discussion.
+ * use. See docs/devel/atomics.txt for more discussion.
*/
#ifndef atomic_mb_read
diff --git a/tcg/README b/tcg/README
index bf49e8242b..03bfb6acd4 100644
--- a/tcg/README
+++ b/tcg/README
@@ -446,7 +446,7 @@ when MTTCG is enabled.
The guest translators should generate this opcode for all guest instructions
which have ordering side effects.
-Please see docs/atomics.txt for more information on memory barriers.
+Please see docs/devel/atomics.txt for more information on memory barriers.
********* 64-bit guest on 32-bit host support
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 23/25] docs: fix broken paths to docs/devel/tracing.txt
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (21 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 24/25] docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg Michael Tokarev
` (2 subsequent siblings)
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
With the move of some docs/ to docs/devel/ on ac06724a71,
no references were updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
audio/trace-events | 2 +-
block/trace-events | 2 +-
chardev/trace-events | 2 +-
crypto/trace-events | 2 +-
hw/9pfs/trace-events | 2 +-
hw/acpi/trace-events | 2 +-
hw/alpha/trace-events | 2 +-
hw/arm/trace-events | 2 +-
hw/audio/trace-events | 2 +-
hw/block/dataplane/trace-events | 2 +-
hw/block/trace-events | 2 +-
hw/char/trace-events | 2 +-
hw/display/trace-events | 2 +-
hw/dma/trace-events | 2 +-
hw/i386/trace-events | 2 +-
hw/input/trace-events | 2 +-
hw/intc/trace-events | 2 +-
hw/isa/trace-events | 2 +-
hw/mem/trace-events | 2 +-
hw/misc/trace-events | 2 +-
hw/net/trace-events | 2 +-
hw/nvram/trace-events | 2 +-
hw/pci/trace-events | 2 +-
hw/ppc/trace-events | 2 +-
hw/s390x/trace-events | 2 +-
hw/scsi/trace-events | 2 +-
hw/sd/trace-events | 2 +-
hw/sparc/trace-events | 2 +-
hw/timer/trace-events | 2 +-
hw/usb/trace-events | 2 +-
hw/vfio/trace-events | 2 +-
hw/virtio/trace-events | 2 +-
hw/xen/trace-events | 2 +-
io/trace-events | 2 +-
linux-user/trace-events | 2 +-
migration/trace-events | 2 +-
net/trace-events | 2 +-
qom/trace-events | 2 +-
scripts/simpletrace.py | 2 +-
target/arm/trace-events | 2 +-
target/i386/trace-events | 2 +-
target/mips/trace-events | 2 +-
target/ppc/trace-events | 2 +-
target/s390x/trace-events | 2 +-
target/sparc/trace-events | 2 +-
ui/trace-events | 2 +-
util/trace-events | 2 +-
47 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/audio/trace-events b/audio/trace-events
index 517359039e..122604287f 100644
--- a/audio/trace-events
+++ b/audio/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# audio/alsaaudio.c
alsa_revents(int revents) "revents = %d"
diff --git a/block/trace-events b/block/trace-events
index 4a4df25323..8d10a82941 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# block.c
bdrv_open_common(void *bs, const char *filename, int flags, const char *format_name) "bs %p filename \"%s\" flags %#x format_name \"%s\""
diff --git a/chardev/trace-events b/chardev/trace-events
index 822dde668b..d0e5f3bbc1 100644
--- a/chardev/trace-events
+++ b/chardev/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# chardev/wctablet.c
wct_init(void) ""
diff --git a/crypto/trace-events b/crypto/trace-events
index dc6ddd30d6..e589990359 100644
--- a/crypto/trace-events
+++ b/crypto/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# crypto/tlscreds.c
qcrypto_tls_creds_load_dh(void *creds, const char *filename) "TLS creds load DH creds=%p filename=%s"
diff --git a/hw/9pfs/trace-events b/hw/9pfs/trace-events
index fb4de3d465..08a4abf22e 100644
--- a/hw/9pfs/trace-events
+++ b/hw/9pfs/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/9pfs/virtio-9p.c
v9fs_rerror(uint16_t tag, uint8_t id, int err) "tag %d id %d err %d"
diff --git a/hw/acpi/trace-events b/hw/acpi/trace-events
index c379607a3e..e3b41e9df4 100644
--- a/hw/acpi/trace-events
+++ b/hw/acpi/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/acpi/memory_hotplug.c
mhp_acpi_invalid_slot_selected(uint32_t slot) "0x%"PRIx32
diff --git a/hw/alpha/trace-events b/hw/alpha/trace-events
index e44ff01a09..46024cca0b 100644
--- a/hw/alpha/trace-events
+++ b/hw/alpha/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/alpha/pci.c
alpha_pci_iack_write(void) ""
diff --git a/hw/arm/trace-events b/hw/arm/trace-events
index d5f33a2a03..193063ed99 100644
--- a/hw/arm/trace-events
+++ b/hw/arm/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/arm/virt-acpi-build.c
virt_acpi_setup(void) "No fw cfg or ACPI disabled. Bailing out."
diff --git a/hw/audio/trace-events b/hw/audio/trace-events
index 3210386e86..47e2ed53d7 100644
--- a/hw/audio/trace-events
+++ b/hw/audio/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/audio/cs4231.c
cs4231_mem_readl_dreg(uint32_t reg, uint32_t ret) "read dreg %d: 0x%02x"
diff --git a/hw/block/dataplane/trace-events b/hw/block/dataplane/trace-events
index e07673ab1f..1a7ea277b0 100644
--- a/hw/block/dataplane/trace-events
+++ b/hw/block/dataplane/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/block/dataplane/virtio-blk.c
virtio_blk_data_plane_start(void *s) "dataplane %p"
diff --git a/hw/block/trace-events b/hw/block/trace-events
index c332c01ea8..cb6767b3ee 100644
--- a/hw/block/trace-events
+++ b/hw/block/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/block/virtio-blk.c
virtio_blk_req_complete(void *vdev, void *req, int status) "vdev %p req %p status %d"
diff --git a/hw/char/trace-events b/hw/char/trace-events
index daf4ee470a..eeb1a0a527 100644
--- a/hw/char/trace-events
+++ b/hw/char/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/char/virtio-serial-bus.c
virtio_serial_send_control_event(unsigned int port, uint16_t event, uint16_t value) "port %u, event %u, value %u"
diff --git a/hw/display/trace-events b/hw/display/trace-events
index 3e896d2e3f..02d03a9ccc 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/display/jazz_led.c
jazz_led_read(uint64_t addr, uint8_t val) "read addr=0x%"PRIx64": 0x%x"
diff --git a/hw/dma/trace-events b/hw/dma/trace-events
index 22878dfdb6..40e9688325 100644
--- a/hw/dma/trace-events
+++ b/hw/dma/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/dma/rc4030.c
jazzio_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
diff --git a/hw/i386/trace-events b/hw/i386/trace-events
index 42d8a7e27a..d43b4b6cd3 100644
--- a/hw/i386/trace-events
+++ b/hw/i386/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/i386/x86-iommu.c
x86_iommu_iec_notify(bool global, uint32_t index, uint32_t mask) "Notify IEC invalidation: global=%d index=%" PRIu32 " mask=%" PRIu32
diff --git a/hw/input/trace-events b/hw/input/trace-events
index 5a87818b49..e1c8780771 100644
--- a/hw/input/trace-events
+++ b/hw/input/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/input/ps2.c
ps2_put_keycode(void *opaque, int keycode) "%p keycode %d"
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index c586714d89..1788dda197 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/intc/apic_common.c
cpu_set_apic_base(uint64_t val) "%016"PRIx64
diff --git a/hw/isa/trace-events b/hw/isa/trace-events
index 9faca41a97..254500a3f6 100644
--- a/hw/isa/trace-events
+++ b/hw/isa/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/isa/pc87312.c
pc87312_io_read(uint32_t addr, uint32_t val) "read addr=%x val=%x"
diff --git a/hw/mem/trace-events b/hw/mem/trace-events
index 323c3c10d5..e150dcc497 100644
--- a/hw/mem/trace-events
+++ b/hw/mem/trace-events
@@ -1,4 +1,4 @@
-# See docs/trace-events.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/mem/pc-dimm.c
mhp_pc_dimm_assigned_slot(int slot) "%d"
diff --git a/hw/misc/trace-events b/hw/misc/trace-events
index 28b8cd1c2e..56ee4fb5f6 100644
--- a/hw/misc/trace-events
+++ b/hw/misc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/misc/eccmemctl.c
ecc_mem_writel_mer(uint32_t val) "Write memory enable %08x"
diff --git a/hw/net/trace-events b/hw/net/trace-events
index c71480535e..2535d5b0b8 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/net/lance.c
lance_mem_readw(uint64_t addr, uint32_t ret) "addr=%"PRIx64"val=0x%04x"
diff --git a/hw/nvram/trace-events b/hw/nvram/trace-events
index 1f1e05ab69..f9a778d152 100644
--- a/hw/nvram/trace-events
+++ b/hw/nvram/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/nvram/ds1225y.c
nvram_read(uint32_t addr, uint32_t ret) "read addr %d: 0x%02x"
diff --git a/hw/pci/trace-events b/hw/pci/trace-events
index 83c8f5ace7..2f0da76733 100644
--- a/hw/pci/trace-events
+++ b/hw/pci/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/pci/pci.c
pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,%#"PRIx64"+%#"PRIx64
diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events
index 0f7d9be4ef..0501b88477 100644
--- a/hw/ppc/trace-events
+++ b/hw/ppc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/ppc/spapr_pci.c
spapr_pci_msi(const char *msg, uint32_t ca) "%s (cfg=%x)"
diff --git a/hw/s390x/trace-events b/hw/s390x/trace-events
index f07e974678..5086cd9ad9 100644
--- a/hw/s390x/trace-events
+++ b/hw/s390x/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/s390x/css.c
css_enable_facility(const char *facility) "CSS: enable %s"
diff --git a/hw/scsi/trace-events b/hw/scsi/trace-events
index 4a2e5d66df..652a815e77 100644
--- a/hw/scsi/trace-events
+++ b/hw/scsi/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/scsi/scsi-bus.c
scsi_req_alloc(int target, int lun, int tag) "target %d lun %d tag %d"
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index b17e7ba442..42ebc2d0d8 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/sd/milkymist-memcard.c
milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x"
diff --git a/hw/sparc/trace-events b/hw/sparc/trace-events
index 30fb0373e7..efd765cbe6 100644
--- a/hw/sparc/trace-events
+++ b/hw/sparc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/sparc/sun4m.c
sun4m_cpu_interrupt(unsigned int level) "Set CPU IRQ %d"
diff --git a/hw/timer/trace-events b/hw/timer/trace-events
index fd8196be66..62c4e0dc75 100644
--- a/hw/timer/trace-events
+++ b/hw/timer/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/timer/slavio_timer.c
slavio_timer_get_out(uint64_t limit, uint32_t counthigh, uint32_t count) "limit %"PRIx64" count %x%08x"
diff --git a/hw/usb/trace-events b/hw/usb/trace-events
index 0c323d4cac..f74cbd5bcd 100644
--- a/hw/usb/trace-events
+++ b/hw/usb/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/usb/core.c
usb_packet_state_change(int bus, const char *port, int ep, void *p, const char *o, const char *n) "bus %d, port %s, ep %d, packet %p, state %s -> %s"
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index 2561c6d31a..f7f891439a 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/vfio/pci.c
vfio_intx_interrupt(const char *name, char line) " (%s) Pin %c"
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index e24d8fa997..012bbaa694 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# hw/virtio/virtio.c
virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"
diff --git a/hw/xen/trace-events b/hw/xen/trace-events
index 5615dce2c1..bff4f2319b 100644
--- a/hw/xen/trace-events
+++ b/hw/xen/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# include/hw/xen/xen_common.h
xen_default_ioreq_server(void) ""
diff --git a/io/trace-events b/io/trace-events
index ff993bef45..3d233698d0 100644
--- a/io/trace-events
+++ b/io/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# io/task.c
qio_task_new(void *task, void *source, void *func, void *opaque) "Task new task=%p source=%p func=%p opaque=%p"
diff --git a/linux-user/trace-events b/linux-user/trace-events
index fc71f91ccb..80ad957dfd 100644
--- a/linux-user/trace-events
+++ b/linux-user/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# linux-user/signal.c
user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=%"PRIx64
diff --git a/migration/trace-events b/migration/trace-events
index cb2c4b5b40..a7d546b289 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# migration/savevm.c
qemu_loadvm_state_section(unsigned int section_type) "%d"
diff --git a/net/trace-events b/net/trace-events
index 247e5c04db..201813941d 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# net/vhost-user.c
vhost_user_event(const char *chr, int event) "chr: %s got event: %d"
diff --git a/qom/trace-events b/qom/trace-events
index 97db357207..5d86fbf019 100644
--- a/qom/trace-events
+++ b/qom/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# qom/object.c
object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"
diff --git a/scripts/simpletrace.py b/scripts/simpletrace.py
index f1be6e419a..2a977e2ab9 100755
--- a/scripts/simpletrace.py
+++ b/scripts/simpletrace.py
@@ -7,7 +7,7 @@
# This work is licensed under the terms of the GNU GPL, version 2. See
# the COPYING file in the top-level directory.
#
-# For help see docs/tracing.txt
+# For help see docs/devel/tracing.txt
import struct
import re
diff --git a/target/arm/trace-events b/target/arm/trace-events
index e21c84fc6f..c4fcda59b4 100644
--- a/target/arm/trace-events
+++ b/target/arm/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/arm/helper.c
arm_gt_recalc(int timer, int irqstate, uint64_t nexttick) "gt recalc: timer %d irqstate %d next tick %" PRIx64
diff --git a/target/i386/trace-events b/target/i386/trace-events
index de6a1cf0cb..3153fd4454 100644
--- a/target/i386/trace-events
+++ b/target/i386/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/i386/kvm.c
kvm_x86_fixup_msi_error(uint32_t gsi) "VT-d failed to remap interrupt for GSI %" PRIu32
diff --git a/target/mips/trace-events b/target/mips/trace-events
index 43824089b3..05eafd7870 100644
--- a/target/mips/trace-events
+++ b/target/mips/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/mips/translate.c
mips_translate_c0(const char *instr, const char *rn, int reg, int sel) "%s %s (reg %d sel %d)"
diff --git a/target/ppc/trace-events b/target/ppc/trace-events
index b666156114..35ee898566 100644
--- a/target/ppc/trace-events
+++ b/target/ppc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/ppc/kvm.c
kvm_failed_spr_set(int str, const char *msg) "Warning: Unable to set SPR %d to KVM: %s"
diff --git a/target/s390x/trace-events b/target/s390x/trace-events
index 1574033e31..852a248d66 100644
--- a/target/s390x/trace-events
+++ b/target/s390x/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/s390x/mmu_helper.c
get_skeys_nonzero(int rc) "SKEY: Call to get_skeys unexpectedly returned %d"
diff --git a/target/sparc/trace-events b/target/sparc/trace-events
index 8df178a347..8d1ed1b913 100644
--- a/target/sparc/trace-events
+++ b/target/sparc/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# target/sparc/mmu_helper.c
mmu_helper_dfault(uint64_t address, uint64_t context, int mmu_idx, uint32_t tl) "DFAULT at %"PRIx64" context %"PRIx64" mmu_idx=%d tl=%d"
diff --git a/ui/trace-events b/ui/trace-events
index 19ce5f85f6..34c2213700 100644
--- a/ui/trace-events
+++ b/ui/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# ui/console.c
console_gfx_new(void) ""
diff --git a/util/trace-events b/util/trace-events
index fa540c620b..025499f83f 100644
--- a/util/trace-events
+++ b/util/trace-events
@@ -1,4 +1,4 @@
-# See docs/tracing.txt for syntax documentation.
+# See docs/devel/tracing.txt for syntax documentation.
# util/aio-posix.c
run_poll_handlers_begin(void *ctx, int64_t max_ns) "ctx %p max_ns %"PRId64
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 24/25] docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (22 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 23/25] docs: fix broken paths to docs/devel/tracing.txt Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 25/25] docs: fix broken paths to docs/specs/ivshmem-spec.txt Michael Tokarev
2017-07-31 12:01 ` [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Peter Maydell
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
With the move of some docs/ to docs/devel/ on ac06724a71,
a reference path was not updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/usb2.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/usb2.txt b/docs/usb2.txt
index b9e7548073..09df45b5b1 100644
--- a/docs/usb2.txt
+++ b/docs/usb2.txt
@@ -50,7 +50,7 @@ companion controllers with two ports each.
There is a config file in docs which will do all this for you, just
try ...
- qemu -readconfig docs/ich9-ehci-uhci.cfg
+ qemu -readconfig docs/config/ich9-ehci-uhci.cfg
... then use "bus=ehci.0" to assign your usb devices to that bus.
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* [Qemu-devel] [PULL 25/25] docs: fix broken paths to docs/specs/ivshmem-spec.txt
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (23 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 24/25] docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg Michael Tokarev
@ 2017-07-31 10:21 ` Michael Tokarev
2017-07-31 12:01 ` [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Peter Maydell
25 siblings, 0 replies; 28+ messages in thread
From: Michael Tokarev @ 2017-07-31 10:21 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, qemu-trivial, Michael Tokarev
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
When this file was rewritten/renamed in fdee2025dd,
a reference path was not updated.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
docs/specs/pci-ids.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/specs/pci-ids.txt b/docs/specs/pci-ids.txt
index 95adee07d6..bb99a0257e 100644
--- a/docs/specs/pci-ids.txt
+++ b/docs/specs/pci-ids.txt
@@ -40,7 +40,7 @@ maintained as part of the virtio specification.
1af4:1100 Used as PCI Subsystem ID for existing hardware devices emulated
by qemu.
-1af4:1110 ivshmem device (shared memory, docs/specs/ivshmem_device_spec.txt)
+1af4:1110 ivshmem device (shared memory, docs/specs/ivshmem-spec.txt)
All other device IDs are reserved.
--
2.11.0
^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
` (24 preceding siblings ...)
2017-07-31 10:21 ` [Qemu-devel] [PULL 25/25] docs: fix broken paths to docs/specs/ivshmem-spec.txt Michael Tokarev
@ 2017-07-31 12:01 ` Peter Maydell
25 siblings, 0 replies; 28+ messages in thread
From: Peter Maydell @ 2017-07-31 12:01 UTC (permalink / raw)
To: Michael Tokarev; +Cc: QEMU Developers, QEMU Trivial
On 31 July 2017 at 11:21, Michael Tokarev <mjt@tls.msk.ru> wrote:
> Here's a collection of trivial stuff merged to date.
> A few minor cleanups, older tests trivial fixes, changing
> crash to clean exit for unicore32 and tricore, and many
> small documentation fixes mostly by Philippe Mathieu-Daudé.
>
> Please consider applying.
>
> Thanks,
>
> /mjt
>
> The following changes since commit 0c26c080ee592ea47597d3ab8fd712d7d2c4ba0f:
>
> Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.10-20170731' into staging (2017-07-31 09:59:26 +0100)
>
> are available in the git repository at:
>
> git://git.corpit.ru/qemu.git tags/trivial-patches-fetch
>
> for you to fetch changes up to 25e11d8774630600ef4c5e9906419a77163a28a1:
>
> docs: fix broken paths to docs/specs/ivshmem-spec.txt (2017-07-31 13:13:01 +0300)
>
> ----------------------------------------------------------------
> trivial patches for 2017-07-31
>
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer
2017-07-31 10:21 ` [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer Michael Tokarev
@ 2017-07-31 13:01 ` Peter Maydell
0 siblings, 0 replies; 28+ messages in thread
From: Peter Maydell @ 2017-07-31 13:01 UTC (permalink / raw)
To: Michael Tokarev
Cc: QEMU Developers, QEMU Trivial, Philippe Mathieu-Daudé
On 31 July 2017 at 11:21, Michael Tokarev <mjt@tls.msk.ru> wrote:
> From: Philippe Mathieu-Daudé <f4bug@amsat.org>
>
> linux-user/syscall.c:5581:9: warning: Dereference of undefined pointer value
> if (*host_rt_dev_ptr != 0) {
> ^~~~~~~~~~~~~~~~
>
> Reported-by: Clang Static Analyzer
> Suggested-by: Laurent Vivier <lvivier@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>
> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
> ---
> linux-user/syscall.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 003943b736..71d45a9963 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -5573,6 +5573,7 @@ static abi_long do_ioctl_rt(const IOCTLEntry *ie, uint8_t *buf_temp,
> field_types, THUNK_HOST);
> }
> unlock_user(argptr, arg, 0);
> + assert(host_rt_dev_ptr);
>
> ret = get_errno(safe_ioctl(fd, ie->host_cmd, buf_temp));
> if (*host_rt_dev_ptr != 0) {
> --
This appears not to build with all versions of gcc; the ones in my
test set were fine but the gcc 4.6.3 that some of the travis
configs use complains:
linux-user/syscall.c: In function 'do_ioctl_rt':
linux-user/syscall.c:5577:37: error: 'host_rt_dev_ptr' may be used uninitialized
It's not obvious to me that the compiler is wrong, either,
though why it complains about the assert but not the if()
I have no idea.
In any case, I'm going to revert this commit to fix the
Travis builds; we can have another go at it later.
thanks
-- PMM
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2017-07-31 13:01 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-31 10:21 [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 01/25] tests: check-qom-proplist: fix leak Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 02/25] fix qemu-system-unicore32 crashing when calling without -kernel Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 03/25] MAINTAINERS: Improve the NetBSD regex pattern Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 04/25] tests: test-netfilter && pxe-test require slirp Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 05/25] build-sys: there is no qemu-ga.c Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 06/25] qemu-system-tricore: segfault when entering "x 0" on the monitor Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 07/25] tests: add missing dependency to build QTEST_QEMU_BINARY Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 08/25] loader: check get_image_size() return value Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 09/25] ivshmem: fix incorrect error handling in ivshmem_recv_msg() Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 10/25] qcow2: fix null pointer dereference Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 11/25] ui/vnc: fix leak of SocketAddress ** Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 12/25] net/eth: fix incorrect check of iov_to_buf() return value Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 13/25] m68k/translate: fix incorrect copy/paste Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 14/25] linux-user/sh4: fix incorrect memory write Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 15/25] syscall: fix dereference of undefined pointer Michael Tokarev
2017-07-31 13:01 ` Peter Maydell
2017-07-31 10:21 ` [Qemu-devel] [PULL 16/25] syscall: fix use of uninitialized values Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 17/25] syscall: check inotify() and eventfd() return value Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 18/25] thunk: assert nb_fields is valid Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 19/25] docs: fix broken paths to docs/interop dir Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 20/25] docs: fix broken paths to docs/interop/qcow2.txt Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 21/25] docs: fix broken paths to docs/devel/qapi-code-gen.txt Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 22/25] docs: fix broken paths to docs/devel/atomics.txt Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 23/25] docs: fix broken paths to docs/devel/tracing.txt Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 24/25] docs: fix broken paths to docs/config/ich9-ehci-uhci.cfg Michael Tokarev
2017-07-31 10:21 ` [Qemu-devel] [PULL 25/25] docs: fix broken paths to docs/specs/ivshmem-spec.txt Michael Tokarev
2017-07-31 12:01 ` [Qemu-devel] [PULL 00/25 for-2.10] Trivial patches for 2017-07-31 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.