qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 09/10] mc146818rtc: register the clock reset notifier on the right clock
Date: Thu, 10 Jul 2014 18:04:12 +0200	[thread overview]
Message-ID: <1405008253-9816-10-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1405008253-9816-1-git-send-email-pbonzini@redhat.com>

Commit 884f17c (aio / timers: Convert rtc_clock to be a QEMUClockType,
2013-08-21) erroneously changed an occurrence of rtc_clock to
QEMU_CLOCK_REALTIME, which broke the RTC reset notifier in
mc146818rtc.  Fix this.

I redid the patch myself since the original reporter did not sign
off on his.

Cc: qemu-stable@nongnu.org
Reported-by: Lb peace <peaceustc@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/timer/mc146818rtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 9d817ca..233fc70 100644
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -895,7 +895,7 @@ static void rtc_realizefn(DeviceState *dev, Error **errp)
     check_update_timer(s);
 
     s->clock_reset_notifier.notify = rtc_notify_clock_reset;
-    qemu_clock_register_reset_notifier(QEMU_CLOCK_REALTIME,
+    qemu_clock_register_reset_notifier(rtc_clock,
                                        &s->clock_reset_notifier);
 
     s->suspend_notifier.notify = rtc_notify_suspend;
-- 
1.8.3.1

  parent reply	other threads:[~2014-07-10 16:04 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-10 16:04 [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1 Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 01/10] mips/kvm: Init EBase to correct KSEG0 Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 02/10] mips/kvm: Disable FPU on reset with KVM Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 03/10] mips_malta: Remove incorrect KVM T&E references Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 04/10] mips_malta: Catch kernels linked at wrong address Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 05/10] watchdog: fix deadlock with -watchdog-action pause Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 06/10] Enforce stack protector usage Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 07/10] target-i386: Add "kvmclock-stable-bit" feature bit name Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclobbered Paolo Bonzini
2014-07-10 16:04 ` Paolo Bonzini [this message]
2014-07-10 16:04 ` [Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib Paolo Bonzini
2014-07-11 11:13 ` [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1 Peter Maydell
2014-07-11 11:14   ` Paolo Bonzini
2014-07-11 11:18     ` Peter Maydell
  -- strict thread matches above, loose matches on Subject: below --
2014-07-09 15:59 [Qemu-devel] [PULL for-2.1 " Paolo Bonzini
2014-07-09 15:59 ` [Qemu-devel] [PULL 09/10] mc146818rtc: register the clock reset notifier on the right clock Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405008253-9816-10-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).