diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 15:31:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-19 15:31:02 +0000 |
| commit | b72566a4ffaddbc0c0c1f6f5ee91b42ab13ff429 (patch) | |
| tree | ad3ec63efcedfc5d2ddee3af80a09f9b1101f577 /qga | |
| parent | adf02c4419e9ac4b3d9a16efdb7e3089c19ae246 (diff) | |
| parent | b2322003b6389c7c98104c8626ffa342928ba83c (diff) | |
| download | qemu-b72566a4ffaddbc0c0c1f6f5ee91b42ab13ff429.zip qemu-b72566a4ffaddbc0c0c1f6f5ee91b42ab13ff429.tar.gz qemu-b72566a4ffaddbc0c0c1f6f5ee91b42ab13ff429.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
Trivial patches (2018-12-18)
# gpg: Signature made Tue 18 Dec 2018 14:28:41 GMT
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-patches-pull-request:
error: Remove NULL checks on error_propagate() calls
vl: Use error_fatal to simplify obvious fatal errors (again)
i386: hvf: drop debug printf in decode_sldtgroup
docs/devel/build-system: fix 'softmu' typo
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga')
| -rw-r--r-- | qga/commands-posix.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 1877976..2e719d9 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -1573,10 +1573,7 @@ static bool systemd_supports_mode(SuspendMode mode, Error **errp) return true; } - if (local_err) { - error_propagate(errp, local_err); - } - + error_propagate(errp, local_err); return false; } @@ -1782,7 +1779,7 @@ static void guest_suspend(SuspendMode mode, Error **errp) if (!mode_supported) { error_setg(errp, "the requested suspend mode is not supported by the guest"); - } else if (local_err) { + } else { error_propagate(errp, local_err); } } |