[Xen-changelog] [xen-unstable] hvm: Reintroduce hpet_migrate_timers(), as it is not covered by vpt

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1181894899 -3600
# Node ID 80577631fb870285edf082fc140d6e822947a3cb
# Parent  80eb95dc0dd9e27278a5f1450277e5972dd7d23e
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@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hpet.c |    3 +++
 xen/arch/x86/hvm/hvm.c  |    1 +
 2 files changed, 4 insertions(+)

diff -r 80eb95dc0dd9 -r 80577631fb87 xen/arch/x86/hvm/hpet.c
--- a/xen/arch/x86/hvm/hpet.c   Thu Jun 14 18:01:42 2007 +0100
+++ b/xen/arch/x86/hvm/hpet.c   Fri Jun 15 09:08:19 2007 +0100
@@ -381,6 +381,9 @@ void hpet_migrate_timers(struct vcpu *v)
     struct HPETState *h = &v->domain->arch.hvm_domain.pl_time.vhpet;
     int i;
 
+    if ( v != h->vcpu )
+        return;
+
     for ( i = 0; i < HPET_TIMER_NUM; i++ )
         migrate_timer(&h->timers[i], v->processor);
 }
diff -r 80eb95dc0dd9 -r 80577631fb87 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Thu Jun 14 18:01:42 2007 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Fri Jun 15 09:08:19 2007 +0100
@@ -110,6 +110,7 @@ void hvm_migrate_timers(struct vcpu *v)
 void hvm_migrate_timers(struct vcpu *v)
 {
     rtc_migrate_timers(v);
+    hpet_migrate_timers(v);
     pt_migrate(v);
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog