diff options
| author | Peter Maydell | 2016-06-20 17:19:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-20 17:19:18 +0200 |
| commit | 7fa124b273acd22a808e742ead78c065ccd9b4c4 (patch) | |
| tree | 60fc0c2deebaa7cef45b35f123986eed40f3ba3f /qga/commands-posix.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | log: Fix qemu_set_log_filename() error handling (diff) | |
| download | qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.tar.gz qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.tar.xz qemu-7fa124b273acd22a808e742ead78c065ccd9b4c4.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into staging
Error reporting patches for 2016-06-20
# gpg: Signature made Mon 20 Jun 2016 15:56:15 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-2016-06-20:
log: Fix qemu_set_log_filename() error handling
log: Fix qemu_set_dfilter_ranges() error reporting
log: Plug memory leak on multiple -dfilter
coccinelle: Remove unnecessary variables for function return value
error: Remove unnecessary local_err variables
error: Remove NULL checks on error_propagate() calls
vl: Error messages need to go to stderr, fix some
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/commands-posix.c')
| -rw-r--r-- | qga/commands-posix.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index eaef7be42e..ea37c097cf 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -127,7 +127,6 @@ int64_t qmp_guest_get_time(Error **errp) { int ret; qemu_timeval tq; - int64_t time_ns; ret = qemu_gettimeofday(&tq); if (ret < 0) { @@ -135,8 +134,7 @@ int64_t qmp_guest_get_time(Error **errp) return -1; } - time_ns = tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; - return time_ns; + return tq.tv_sec * 1000000000LL + tq.tv_usec * 1000; } void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) |