Commit 1d1424ba authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-07-24' into staging 



Error reporting patches for 2017-07-24

# gpg: Signature made Mon 24 Jul 2017 13:17:49 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-error-2017-07-24:
  error: Revert unwanted change of warning messages

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents cf44d31d 70f17a15

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");

}