diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-20 16:19:18 +0100 |
| commit | 7fa124b273acd22a808e742ead78c065ccd9b4c4 (patch) | |
| tree | 60fc0c2deebaa7cef45b35f123986eed40f3ba3f /hw/timer | |
| parent | fd2590bccc0bd63833813592a3e193686cf1c623 (diff) | |
| parent | daa76aa416b1e18ab1fac650ff53d966d8f21f68 (diff) | |
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 'hw/timer')
| -rw-r--r-- | hw/timer/mc146818rtc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c index a11b8b4b21..f4e333eb8f 100644 --- a/hw/timer/mc146818rtc.c +++ b/hw/timer/mc146818rtc.c @@ -105,12 +105,10 @@ static inline bool rtc_running(RTCState *s) static uint64_t get_guest_rtc_ns(RTCState *s) { - uint64_t guest_rtc; uint64_t guest_clock = qemu_clock_get_ns(rtc_clock); - guest_rtc = s->base_rtc * NANOSECONDS_PER_SECOND + + return s->base_rtc * NANOSECONDS_PER_SECOND + guest_clock - s->last_update + s->offset; - return guest_rtc; } #ifdef TARGET_I386 |