diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-02-18 17:25:24 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2010-03-16 16:58:32 +0100 |
| commit | 1ecda02b24a13f501e747b8442934829d82698ae (patch) | |
| tree | 8989913831ca3e48220b57f9104978015e39c5cb /net/tap-linux.c | |
| parent | 6fdb03d58c614e0097d80ed130c19dcc393f7421 (diff) | |
error: Replace qemu_error() by error_report()
error_report() terminates the message with a newline. Strip it it
from its arguments.
This fixes a few error messages lacking a newline:
net_handle_fd_param()'s "No file descriptor named %s found", and
tap_open()'s "vnet_hdr=1 requested, but no kernel support for
IFF_VNET_HDR available" (all three versions).
There's one place that passes arguments without newlines
intentionally: load_vmstate(). Fix it up.
Diffstat (limited to 'net/tap-linux.c')
| -rw-r--r-- | net/tap-linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/tap-linux.c b/net/tap-linux.c index c5748e631b..03b83012f8 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -58,8 +58,8 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required } if (vnet_hdr_required && !*vnet_hdr) { - qemu_error("vnet_hdr=1 requested, but no kernel " - "support for IFF_VNET_HDR available"); + error_report("vnet_hdr=1 requested, but no kernel " + "support for IFF_VNET_HDR available"); close(fd); return -1; } @@ -97,7 +97,7 @@ int tap_set_sndbuf(int fd, QemuOpts *opts) } if (ioctl(fd, TUNSETSNDBUF, &sndbuf) == -1 && qemu_opt_get(opts, "sndbuf")) { - qemu_error("TUNSETSNDBUF ioctl failed: %s\n", strerror(errno)); + error_report("TUNSETSNDBUF ioctl failed: %s", strerror(errno)); return -1; } return 0; @@ -108,7 +108,7 @@ int tap_probe_vnet_hdr(int fd) struct ifreq ifr; if (ioctl(fd, TUNGETIFF, &ifr) != 0) { - qemu_error("TUNGETIFF ioctl() failed: %s\n", strerror(errno)); + error_report("TUNGETIFF ioctl() failed: %s", strerror(errno)); return 0; } |