From mboxrd@z Thu Jan  1 00:00:00 1970
From: Beth Kon <eak@us.ibm.com>
Subject: Re: [PATCH 4/4] Userspace changes for KVM HPET (v3)
Date: Tue, 12 May 2009 10:25:17 -0400
Message-ID: <4A0986CD.20601@us.ibm.com>
References: <1242062986-29383-1-git-send-email-eak@us.ibm.com>  <1242062986-29383-4-git-send-email-eak@us.ibm.com> <4A093B49.7010609@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: kvm@vger.kernel.org
To: Avi Kivity <avi@redhat.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from e34.co.us.ibm.com ([32.97.110.152]:46885 "EHLO
	e34.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752352AbZELOYo (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 12 May 2009 10:24:44 -0400
Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227])
	by e34.co.us.ibm.com (8.13.1/8.13.1) with ESMTP id n4CEM6Mu005041
	for <kvm@vger.kernel.org>; Tue, 12 May 2009 08:22:06 -0600
Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170])
	by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n4CEOZUb097568
	for <kvm@vger.kernel.org>; Tue, 12 May 2009 08:24:38 -0600
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 n4CEOVHe031343
	for <kvm@vger.kernel.org>; Tue, 12 May 2009 08:24:32 -0600
In-Reply-To: <4A093B49.7010609@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Avi Kivity wrote:
> Beth Kon wrote:
>> Signed-off-by: Beth Kon <eak@us.ibm.com>
>>
>>
>> diff --git a/hw/hpet.c b/hw/hpet.c
>> index c7945ec..100abf5 100644
>> --- a/hw/hpet.c
>> +++ b/hw/hpet.c
>> @@ -30,6 +30,7 @@
>>  #include "console.h"
>>  #include "qemu-timer.h"
>>  #include "hpet_emul.h"
>> +#include "qemu-kvm.h"
>>  
>>  //#define HPET_DEBUG
>>  #ifdef HPET_DEBUG
>> @@ -48,6 +49,28 @@ uint32_t hpet_in_legacy_mode(void)
>>          return 0;
>>  }
>>  
>> +static void hpet_legacy_enable(void)
>> +{
>> +    if (qemu_kvm_pit_in_kernel()) {
>> +        kvm_kpit_disable();
>> +        dprintf("qemu: hpet disabled kernel pit\n");
>> +    } else {
>> +        hpet_pit_disable();
>> +        dprintf("qemu: hpet disabled userspace pit\n");
>> +    }
>> +}
>> +
>> +static void hpet_legacy_disable(void)
>> +{
>> +    if (qemu_kvm_pit_in_kernel()) {
>> +        kvm_kpit_enable();
>> +        dprintf("qemu: hpet enabled kernel pit\n");
>> +    } else {
>> +        hpet_pit_enable();
>> +        dprintf("qemu: hpet enabled userspace pit\n");
>> +    }
>> +}
>>   
> I think it's better to move these into hpet_pit_enable() and 
> hpet_pit_enable().  This avoids changing the calls below, and puts pit 
> stuff in i8254.c instead of hpet.c.
>
> Might also need to be called from hpet_load(); probably a problem in 
> upstream as well.
>
My assumption about hpet_load was that the correct pit state would be 
established via pit_load (since all saves/loads are done together).  But 
when I wrote this, I was thinking only about the userspace pit (for 
qemu). I'm not sure how the "load" concept applies to kernel state.  Do 
I need to explicitly re-enable or disable the kernel pit during load?