diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 12:56:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 12:56:58 +0000 |
| commit | 692a5519ab1510ff48bdde9701017b9425643058 (patch) | |
| tree | d408009c661e9750322911a50a8e2961812b7b99 /net/dump.c | |
| parent | cc06ca4c97e7bd101fba965c5de74d9c242964f6 (diff) | |
| parent | fe02fc5209d497d011b2b4b09395e2503d9dedc6 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-01-11' into staging
trivial patches for 2016-01-11
# gpg: Signature made Mon 11 Jan 2016 08:39:32 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2016-01-11:
hw/s390x: Remove superfluous return statements
hw/core/qdev: Remove superfluous return statement
hw/acpi: Remove superfluous return statement
hw/ide: Remove superfluous return statements
osdep.h: Include glib-compat.h in osdep.h rather than qemu-common.h
scripts/checkpatch.pl: Don't allow special cases of unspaced operators
PCI Bonito: QOMify and cleanup
SH PCI Host: convert to realize()
gt64120: convert to realize()
Add missing syscall nrs. according to more recent Linux kernels
hw/misc/edu: Convert to realize()
configure: fix trace backend check
xen/Makefile.objs: simplify
crypto: Fix typo in example
MAINTAINERS: Add the correct device_tree.h file
iscsi: fix readcapacity error message
net: convert qemu_log to error_report, fix message
linux-user: enable sigaltstack for all architectures
unicore32: convert get_sp_from_cpustate from macro to inline
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/dump.c')
| -rw-r--r-- | net/dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dump.c b/net/dump.c index 347b5ca334..88d9582334 100644 --- a/net/dump.c +++ b/net/dump.c @@ -84,7 +84,7 @@ static ssize_t dump_receive_iov(DumpState *s, const struct iovec *iov, int cnt) cnt = iov_copy(&dumpiov[1], cnt, iov, cnt, 0, caplen); if (writev(s->fd, dumpiov, cnt + 1) != sizeof(hdr) + caplen) { - qemu_log("-net dump write error - stop dump\n"); + error_report("network dump write error - stopping dump"); close(s->fd); s->fd = -1; } |