diff options
| author | Peter Maydell | 2019-03-26 10:28:24 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-26 10:28:24 +0100 |
| commit | 199f8d94be106f20dfce23fa4e157fc8d55fd494 (patch) | |
| tree | 3447e0b2a1b449b5c79fa99db95fd71451b614f1 /util | |
| parent | Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-4.0-rc1' i... (diff) | |
| parent | qapi/qmp-dispatch: fix return value in do_qmp_dispatch (diff) | |
| download | qemu-199f8d94be106f20dfce23fa4e157fc8d55fd494.tar.gz qemu-199f8d94be106f20dfce23fa4e157fc8d55fd494.tar.xz qemu-199f8d94be106f20dfce23fa4e157fc8d55fd494.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-03-26' into staging
Miscellaneous patches for 2019-03-26
# gpg: Signature made Tue 26 Mar 2019 07:10:23 GMT
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-misc-2019-03-26:
qapi/qmp-dispatch: fix return value in do_qmp_dispatch
json: Fix off-by-one assert check in next_state()
xen-block: Replace qdict_put_obj() by qdict_put() where appropriate
util/error: Remove an unnecessary NULL check
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
| -rw-r--r-- | util/error.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/util/error.c b/util/error.c index b5ccbd8eac..934a78e1b1 100644 --- a/util/error.c +++ b/util/error.c @@ -103,10 +103,6 @@ void error_setg_errno_internal(Error **errp, va_list ap; int saved_errno = errno; - if (errp == NULL) { - return; - } - va_start(ap, fmt); error_setv(errp, src, line, func, ERROR_CLASS_GENERIC_ERROR, fmt, ap, os_errno != 0 ? strerror(os_errno) : NULL); |