From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LRY84-00027g-LQ
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:32:20 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LRY83-000275-Ve
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:32:20 -0500
Received: from [199.232.76.173] (port=35305 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LRY83-000270-Ji
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:32:19 -0500
Received: from savannah.gnu.org ([199.232.41.3]:60976 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LRY83-0007n4-Ac
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:32:19 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LRY82-0003Gr-N2
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 20:32:18 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LRY82-0003Gn-GT
	for qemu-devel@nongnu.org; Mon, 26 Jan 2009 20:32:18 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LRY82-0003Gn-GT@cvs.savannah.gnu.org>
Date: Mon, 26 Jan 2009 20:32:18 +0000
Subject: [Qemu-devel] [6460] Check if the i8254 timer is active before
 deactivating it ( Alexander Graf)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6460
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6460
Author:   aliguori
Date:     2009-01-26 20:32:18 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
Check if the i8254 timer is active before deactivating it (Alexander Graf)

The HPET emulation can disable the i8254 when the HPET is
in legacy mode, thus emulating the i8254's behavior.

But if it does, the i8254 doesn't have to be running, so
let's check to see if the timer works and not disable it
if it's not.

This fixes a segmentation fault when running Mac OS X as
guest os.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/hw/i8254.c

Modified: trunk/hw/i8254.c
===================================================================
--- trunk/hw/i8254.c	2009-01-26 20:27:06 UTC (rev 6459)
+++ trunk/hw/i8254.c	2009-01-26 20:32:18 UTC (rev 6460)
@@ -467,7 +467,8 @@
 void hpet_pit_disable(void) {
     PITChannelState *s;
     s = &pit_state.channels[0];
-    qemu_del_timer(s->irq_timer);
+    if (s->irq_timer)
+        qemu_del_timer(s->irq_timer);
 }
 
 /* When HPET is reset or leaving legacy mode, it must reenable i8254