OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Error reporting patches for 2017-01-19

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJYgNJlAAoJEDhwtADrkYZTtbIQAKC9mAaWDZ0OZF07LLLnf8cj
 5FCFP9yY25bmiZcfb5N6/78zVaOHDGLcqBy9yJVvhTXhocuDS903p0DjFdOugNWW
 dj7pVoO8xlOiNfpl2H+lXBriMzhZiimH/5LHJ9EYC0ZjOywbC7wUUkGXRPFzsjIJ
 yCRY2vKK5jZE3vFLhCf4IVp9Dwc6k0CEM0QXvlZr7LJNBt4t8Iy6BnWvz9D1ePse
 zzcbCKwRMnv2DMpoVqhGthU1XgDPUg+44CbcezRmsMfmD4WA4MT2d06XE1y8kXru
 cQ6Xj5W9xPHeFN1hZrAtcN4ZiV6UdpJC1Tmb6TumtrMmXO/0p8dtEi4Xk+fWpoLn
 iKhkuc1BvZOjaKKb6/flplfPOZ1/PbXVXr0DnharFyqMlm12Dvue4+WaZEhr2DJB
 DghOsJX0osi/kFUKE0N6o9lldQTLY2KyFR/pA+54I/X6H63R4Z5qJvSEWdI/Zuww
 2hzOOtNMsyBHtZIvl5CFIjdMqnuM4+2QkdYigyhq7WjwLxvAOKUVDPkxfDQo11Hv
 lKsuL+iNvsUsezs44duS042Bsuqx7YQAdIlq5vSkibc2LnJzKfqvNiU64uac/n8w
 0Uz7rMLjUY7m/8ATIhRw9WCI49hbTKkSeGCttdtLrghTdLiGsmdFngNxrPsHUXXm
 cx3xk/hJlsPF6QnLaxlu
 =uGc1
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2017-01-19' into staging

Error reporting patches for 2017-01-19

# gpg: Signature made Thu 19 Jan 2017 14:51:17 GMT
# 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-01-19:
  error: Report certain hints on stderr when no monitor
  error: error_setg_errno(): errno gets preserved

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2017-01-20 12:35:10 +00:00
commit 6ffefe7ff7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/qapi/error.h
View File

@ -170,6 +170,9 @@ void error_setg_internal(Error **errp,
* Just like error_setg(), with @os_error info added to the message.
* If @os_error is non-zero, ": " + strerror(os_error) is appended to
* the human-readable error message.
*
* The value of errno (which usually can get clobbered by almost any
* function call) will be preserved.
*/
#define error_setg_errno(errp, os_error, fmt, ...) \
error_setg_errno_internal((errp), __FILE__, __LINE__, __func__, \

2
monitor.c
View File

@ -3973,6 +3973,8 @@ void error_vprintf_unless_qmp(const char *fmt, va_list ap)
{
if (cur_mon && !monitor_cur_is_qmp()) {
monitor_vprintf(cur_mon, fmt, ap);
} else if (!cur_mon) {
vfprintf(stderr, fmt, ap);
}
}