Fixes incorrect guest time after a host S3/resume by updating guest RTC.

diff --git a/master/rtc-update-clock-upon-resume-from-s3 b/master/rtc-update-clock-upon-resume-from-s3
new file mode 100644 (file)
index 0000000..ba31365
--- /dev/null
+++ b/master/rtc-update-clock-upon-resume-from-s3
@@ -0,0 +1,15 @@
+diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
+index e7a0d05..0a90f5f 100644
+--- a/xen/arch/x86/hvm/hvm.c
++++ b/xen/arch/x86/hvm/hvm.c
+@@ -2325,7 +2325,10 @@ static void hvm_s3_suspend(struct domain *d)
+ static void hvm_s3_resume(struct domain *d)
+ {
+     if ( test_and_clear_bool(d->arch.hvm_domain.is_s3_suspended) )
++    {
++        rtc_update_clock(d);
+         domain_unpause(d);
++    }
+ }
+ 
+ static int hvmop_set_isa_irq_level(

diff --git a/master/series b/master/series
index c455fb75c856b9e128518c9eb88d7bb4cefcef8b..9f15c039cbff1e0ea54c25eb05973960480b17c6 100644 (file)
--- a/master/series
+++ b/master/series
@@ -36,3 +36,4 @@ vga-edid
 tboot-xen-fixes-01082010.patch
 guest-os-controlled-brightness-support
 xenpm-use-pkgconfig
+rtc-update-clock-upon-resume-from-s3