From 1ecda02b24a13f501e747b8442934829d82698ae Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 Feb 2010 17:25:24 +0100 Subject: 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. --- qemu-config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qemu-config.c') diff --git a/qemu-config.c b/qemu-config.c index 2c9a7a5f2..8e06770a1 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -313,7 +313,7 @@ static QemuOptsList *find_list(const char *group) break; } if (lists[i] == NULL) { - qemu_error("there is no option group \"%s\"\n", group); + error_report("there is no option group \"%s\"", group); } return lists[i]; } @@ -327,7 +327,7 @@ int qemu_set_option(const char *str) rc = sscanf(str, "%63[^.].%63[^.].%63[^=]%n", group, id, arg, &offset); if (rc < 3 || str[offset] != '=') { - qemu_error("can't parse: \"%s\"\n", str); + error_report("can't parse: \"%s\"", str); return -1; } @@ -338,8 +338,8 @@ int qemu_set_option(const char *str) opts = qemu_opts_find(list, id); if (!opts) { - qemu_error("there is no %s \"%s\" defined\n", - list->name, id); + error_report("there is no %s \"%s\" defined", + list->name, id); return -1; } @@ -357,7 +357,7 @@ int qemu_global_option(const char *str) rc = sscanf(str, "%63[^.].%63[^=]%n", driver, property, &offset); if (rc < 2 || str[offset] != '=') { - qemu_error("can't parse: \"%s\"\n", str); + error_report("can't parse: \"%s\"", str); return -1; } -- cgit v1.2.3