Commit 70f17a15 authored Jul 19, 2017 by Markus Armbruster

error: Revert unwanted change of warning messages



Commit 97f40301 changed warning messages from

    timestamp-if-enabled progname ":" location "warning: " message

to

    "warning: " timestamp-if-enabled progname ":" location message

This regressed qemu-iotests 051.  Put "warning: " right back where it
was, along with "info: ".

Reported-by: Kevin Wolf <kwolf@redhat.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1500449614-16811-1-git-send-email-armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>

parent df95f1a2

util/qemu-error.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -201,6 +201,15 @@ static void vreport(report_type type, const char *fmt, va_list ap)
		GTimeVal tv;
		gchar *timestr;

		if (enable_timestamp_msg && !cur_mon) {
		g_get_current_time(&tv);
		timestr = g_time_val_to_iso8601(&tv);
		error_printf("%s ", timestr);
		g_free(timestr);
		}

		print_loc();

		switch (type) {
		case REPORT_TYPE_ERROR:
		break;
		@@ -212,14 +221,6 @@ static void vreport(report_type type, const char *fmt, va_list ap)
		break;
		}

		if (enable_timestamp_msg && !cur_mon) {
		g_get_current_time(&tv);
		timestr = g_time_val_to_iso8601(&tv);
		error_printf("%s ", timestr);
		g_free(timestr);
		}

		print_loc();
		error_vprintf(fmt, ap);
		error_printf("\n");
		}