qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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: Peter Maydell <peter.maydell@linaro.org>

+9 -8
+9 -8
util/qemu-error.c
··· 201 201 GTimeVal tv; 202 202 gchar *timestr; 203 203 204 + if (enable_timestamp_msg && !cur_mon) { 205 + g_get_current_time(&tv); 206 + timestr = g_time_val_to_iso8601(&tv); 207 + error_printf("%s ", timestr); 208 + g_free(timestr); 209 + } 210 + 211 + print_loc(); 212 + 204 213 switch (type) { 205 214 case REPORT_TYPE_ERROR: 206 215 break; ··· 212 221 break; 213 222 } 214 223 215 - if (enable_timestamp_msg && !cur_mon) { 216 - g_get_current_time(&tv); 217 - timestr = g_time_val_to_iso8601(&tv); 218 - error_printf("%s ", timestr); 219 - g_free(timestr); 220 - } 221 - 222 - print_loc(); 223 224 error_vprintf(fmt, ap); 224 225 error_printf("\n"); 225 226 }