direct-io.hg

changeset 15280:80577631fb87

hvm: Reintroduce hpet_migrate_timers(), as it is not covered by vpt
logic, but fix so that only VCPU0 migrates the timers.
Signed-off-by: Keir Fraser <keir@xensource.com>
author Keir Fraser <keir@xensource.com>
date Fri Jun 15 09:08:19 2007 +0100 (2007-06-15)
parents 80eb95dc0dd9
children 356588dda4bc
files xen/arch/x86/hvm/hpet.c xen/arch/x86/hvm/hvm.c
line diff
     1.1 --- a/xen/arch/x86/hvm/hpet.c	Thu Jun 14 18:01:42 2007 +0100
     1.2 +++ b/xen/arch/x86/hvm/hpet.c	Fri Jun 15 09:08:19 2007 +0100
     1.3 @@ -381,6 +381,9 @@ void hpet_migrate_timers(struct vcpu *v)
     1.4      struct HPETState *h = &v->domain->arch.hvm_domain.pl_time.vhpet;
     1.5      int i;
     1.6  
     1.7 +    if ( v != h->vcpu )
     1.8 +        return;
     1.9 +
    1.10      for ( i = 0; i < HPET_TIMER_NUM; i++ )
    1.11          migrate_timer(&h->timers[i], v->processor);
    1.12  }
     2.1 --- a/xen/arch/x86/hvm/hvm.c	Thu Jun 14 18:01:42 2007 +0100
     2.2 +++ b/xen/arch/x86/hvm/hvm.c	Fri Jun 15 09:08:19 2007 +0100
     2.3 @@ -110,6 +110,7 @@ u64 hvm_get_guest_time(struct vcpu *v)
     2.4  void hvm_migrate_timers(struct vcpu *v)
     2.5  {
     2.6      rtc_migrate_timers(v);
     2.7 +    hpet_migrate_timers(v);
     2.8      pt_migrate(v);
     2.9  }
    2.10