[Xen-changelog] [xen-unstable] Merge with ia64 tree.

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxxxxxxxx>
# Date 1194545736 0
# Node ID 1dcb24e6c4e42ecdb7f1944a431e68c4509757eb
# Parent  568816a7cb0a0fc9e990af33083f6b56ac981981
# Parent  0f792d2c7ee3d2b1d6c07afdbe5dbfd881150e67
Merge with ia64 tree.
---
 xen/arch/x86/hvm/save.c |    2 ++
 1 files changed, 2 insertions(+)

diff -r 568816a7cb0a -r 1dcb24e6c4e4 xen/arch/x86/hvm/save.c
--- a/xen/arch/x86/hvm/save.c   Thu Nov 08 09:05:26 2007 -0700
+++ b/xen/arch/x86/hvm/save.c   Thu Nov 08 18:15:36 2007 +0000
@@ -59,8 +59,10 @@ int arch_hvm_load(struct domain *d, stru
         gdprintk(XENLOG_WARNING, "HVM restore: saved CPUID (%#"PRIx32") "
                "does not match host (%#"PRIx32").\n", hdr->cpuid, eax);
 
+#ifdef __x86_64__
     /* VGA state is not saved/restored, so we nobble the cache. */
     d->arch.hvm_domain.stdvga.cache = 0;
+#endif
 
     return 0;
 }

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