Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > 340e01248478ba8b78a6d4d1809b1eff > files > 86

kvm-83-270.el5_11.src.rpm

From 46f1b483f23124fd79831ec8ba03e7b53554195c Mon Sep 17 00:00:00 2001
From: Ulrich Obergfell <uobergfe@redhat.com>
Date: Tue, 18 Oct 2011 06:43:24 +0200
Subject: [PATCH 5/5] BZ725876: fix RTC polling mode

RH-Author: Ulrich Obergfell <uobergfe@redhat.com>
Message-id: <1318920204-3733-3-git-send-email-uobergfe@redhat.com>
Patchwork-id: 34342
O-Subject: [PATCH RHEL-5.8 qemu-kvm 2/2] BZ725876: fix RTC polling mode
Bugzilla: 725876
RH-Acked-by: Gleb Natapov <gleb@redhat.com>
RH-Acked-by: Ronen Hod <rhod@redhat.com>
RH-Acked-by: Amos Kong <akong@redhat.com>

Upstream: commit 98815437f731372d9456f6a2ad103f3b836a9646
Bugzilla: 725876

rtc_update_second2() should set the update-ended flag in
control register C independent of the interrupt request flag.

Signed-off-by: Ulrich Obergfell <uobergfe@redhat.com>
---
 qemu/hw/mc146818rtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Signed-off-by: Michal Novotny <mignov@gmail.com>
---
 qemu/hw/mc146818rtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/mc146818rtc.c b/qemu/hw/mc146818rtc.c
index ab412c6..bf99c05 100644
--- a/qemu/hw/mc146818rtc.c
+++ b/qemu/hw/mc146818rtc.c
@@ -421,8 +421,9 @@ static void rtc_update_second2(void *opaque)
     }
 
     /* update ended interrupt */
+    s->cmos_data[RTC_REG_C] |= REG_C_UF;
     if (s->cmos_data[RTC_REG_B] & REG_B_UIE) {
-        s->cmos_data[RTC_REG_C] |= 0x90;
+        s->cmos_data[RTC_REG_C] |= REG_C_IRQF;
         rtc_irq_raise(s->irq);
     }
 
-- 
1.7.4.4