diff options
| author | Markus Armbruster <armbru@redhat.com> | 2013-02-08 21:22:16 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-11 08:13:19 -0600 |
| commit | 312fd5f29097890179793d8bbb59ab18afbe0ad4 (patch) | |
| tree | 06b08cae96d4ce9d2c1e01fe1cef2a7f7ebc0b12 /target-i386/cpu.c | |
| parent | 1a9522cc6ea04968e1169f0195952d0029d5dbb9 (diff) | |
error: Strip trailing '\n' from error string arguments (again)
Commit 6daf194d and be62a2eb got rid of a bunch, but they keep coming
back. Tracked down with this Coccinelle semantic patch:
@r@
expression err, eno, cls, fmt;
position p;
@@
(
error_report(fmt, ...)@p
|
error_set(err, cls, fmt, ...)@p
|
error_set_errno(err, eno, cls, fmt, ...)@p
|
error_setg(err, fmt, ...)@p
|
error_setg_errno(err, eno, fmt, ...)@p
)
@script:python@
fmt << r.fmt;
p << r.p;
@@
if "\\n" in str(fmt):
print "%s:%s:%s:%s" % (p[0].file, p[0].line, p[0].column, fmt)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-id: 1360354939-10994-4-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/cpu.c')
| -rw-r--r-- | target-i386/cpu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 5c108e17ab..aab35c74d9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1333,7 +1333,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) numvalue = strtoul(val, &err, 0); if (!*val || *err) { - error_setg(errp, "bad numerical value %s\n", val); + error_setg(errp, "bad numerical value %s", val); goto out; } if (numvalue < 0x80000000) { @@ -1355,7 +1355,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) tsc_freq = strtosz_suffix_unit(val, &err, STRTOSZ_DEFSUFFIX_B, 1000); if (tsc_freq < 0 || *err) { - error_setg(errp, "bad numerical value %s\n", val); + error_setg(errp, "bad numerical value %s", val); goto out; } snprintf(num, sizeof(num), "%" PRId64, tsc_freq); @@ -1364,12 +1364,12 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) char *err; numvalue = strtoul(val, &err, 0); if (!*val || *err) { - error_setg(errp, "bad numerical value %s\n", val); + error_setg(errp, "bad numerical value %s", val); goto out; } hyperv_set_spinlock_retries(numvalue); } else { - error_setg(errp, "unrecognized feature %s\n", featurestr); + error_setg(errp, "unrecognized feature %s", featurestr); goto out; } } else if (!strcmp(featurestr, "check")) { @@ -1382,7 +1382,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) hyperv_enable_vapic_recommended(true); } else { error_setg(errp, "feature string `%s' not in format (+feature|" - "-feature|feature=xyz)\n", featurestr); + "-feature|feature=xyz)", featurestr); goto out; } if (error_is_set(errp)) { |