From patchwork Mon Jan 23 09:18:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 137317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 15D83B6EF2 for ; Mon, 23 Jan 2012 20:18:43 +1100 (EST) Received: from localhost ([::1]:58736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpG2u-0002Ig-Q2 for incoming@patchwork.ozlabs.org; Mon, 23 Jan 2012 04:18:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:34800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpG2j-0002Hq-MM for qemu-devel@nongnu.org; Mon, 23 Jan 2012 04:18:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RpG2c-00029Z-Pu for qemu-devel@nongnu.org; Mon, 23 Jan 2012 04:18:25 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:57099) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RpG2c-00029B-3X for qemu-devel@nongnu.org; Mon, 23 Jan 2012 04:18:18 -0500 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp1-g21.free.fr (Postfix) with ESMTP id 388B99403DA; Mon, 23 Jan 2012 10:18:11 +0100 (CET) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Mon, 23 Jan 2012 10:18:49 +0100 Message-Id: <1327310329-15294-1-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.7.3 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.27.42.1 Cc: Anthony Liguori , =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH] rtc: initialize irq even if caller doesn't use rtc_init() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org rtc instanciated with -device has now a working irq line Signed-off-by: Hervé Poussineau --- hw/mc146818rtc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 657fa10..3067022 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -672,6 +672,7 @@ static int rtc_initfn(ISADevice *dev) memory_region_init_io(&s->io, &cmos_ops, s, "rtc", 2); isa_register_ioport(dev, &s->io, base); + isa_init_irq(dev, &s->irq, RTC_ISA_IRQ); qdev_set_legacy_instance_id(&dev->qdev, base, 2); qemu_register_reset(rtc_reset, s); @@ -692,9 +693,8 @@ ISADevice *rtc_init(ISABus *bus, int base_year, qemu_irq intercept_irq) qdev_prop_set_int32(&dev->qdev, "base_year", base_year); qdev_init_nofail(&dev->qdev); if (intercept_irq) { + /* Use provided IRQ instead of default one */ s->irq = intercept_irq; - } else { - isa_init_irq(dev, &s->irq, RTC_ISA_IRQ); } return dev; }