From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LRY90-0002pq-0i for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:33:18 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LRY8z-0002pa-5A for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:33:17 -0500 Received: from [199.232.76.173] (port=35322 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LRY8z-0002pV-0B for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:33:17 -0500 Received: from e33.co.us.ibm.com ([32.97.110.151]:55657) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LRY8y-0007t0-JL for qemu-devel@nongnu.org; Mon, 26 Jan 2009 15:33:16 -0500 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e33.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n0QKWEU7001780 for ; Mon, 26 Jan 2009 13:32:14 -0700 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id n0QKXEYK225988 for ; Mon, 26 Jan 2009 13:33:14 -0700 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n0QKXE17030165 for ; Mon, 26 Jan 2009 13:33:14 -0700 Received: from squirrel.codemonkey.ws (sig-9-65-32-74.mts.ibm.com [9.65.32.74]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n0QKXDlZ030147 for ; Mon, 26 Jan 2009 13:33:14 -0700 Message-ID: <497E1DFD.4070607@us.ibm.com> Date: Mon, 26 Jan 2009 14:33:01 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Check if the i8254 timer is active before deactivating it References: <1232988117-8935-1-git-send-email-agraf@suse.de> In-Reply-To: <1232988117-8935-1-git-send-email-agraf@suse.de> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Alexander Graf wrote: > 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. > So the HPET works with Mac OS X with this patch? That's good to know since there was a fair bit of change from your original patch. > Signed-off-by: Alexander Graf > Applied. Thanks. Regards, Anthony Liguori > --- > hw/i8254.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/hw/i8254.c b/hw/i8254.c > index a4a1efe..44e4531 100644 > --- a/hw/i8254.c > +++ b/hw/i8254.c > @@ -467,7 +467,8 @@ static void pit_reset(void *opaque) > 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 >