[Xen-changelog] [xen-4.0-testing] xen: allow HVM save/restore from different changesets

["Xen patchbot-4.0-testing" <patchbot-4.0-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278675854 -3600
# Node ID a083d4c70bcacfb513d6b0da07a8c9008d49943a
# Parent  a68f837a9dd884075505e252fcfa6eec88e1cade
xen: allow HVM save/restore from different changesets

Allow HVM save/restore from different changesets of Xen.  The HVM save
records are supposed to be backwards compatible; XenServer
live-migrates between versions of Xen during upgrades.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
xen-unstable changeset:   21758:8afa0bb43c45
xen-unstable date:        Fri Jul 09 12:22:00 2010 +0100
---
 xen/common/hvm/save.c |   17 -----------------
 1 files changed, 17 deletions(-)

diff -r a68f837a9dd8 -r a083d4c70bca xen/common/hvm/save.c
--- a/xen/common/hvm/save.c     Fri Jul 09 12:43:52 2010 +0100
+++ b/xen/common/hvm/save.c     Fri Jul 09 12:44:14 2010 +0100
@@ -184,8 +184,6 @@ int hvm_save(struct domain *d, hvm_domai
 
 int hvm_load(struct domain *d, hvm_domain_context_t *h)
 {
-    char *c;
-    uint64_t cset;
     struct hvm_save_header hdr;
     struct hvm_save_descriptor *desc;
     hvm_load_handler handler;
@@ -200,21 +198,6 @@ int hvm_load(struct domain *d, hvm_domai
 
     if ( arch_hvm_load(d, &hdr) )
         return -1;
-
-    c = strrchr(xen_changeset(), ':');
-    if ( hdr.changeset == -1ULL )
-        gdprintk(XENLOG_WARNING, 
-                 "HVM restore: Xen changeset was not saved.\n");
-    else if ( c == NULL )
-        gdprintk(XENLOG_WARNING, 
-                 "HVM restore: Xen changeset is not available.\n");
-    else
-    {
-        cset = simple_strtoll(c, NULL, 16);
-        if ( hdr.changeset != cset )
-        gdprintk(XENLOG_WARNING, "HVM restore: saved Xen changeset (%#"PRIx64
-                 ") does not match host (%#"PRIx64").\n", hdr.changeset, cset);
-    }
 
     /* Down all the vcpus: we only re-enable the ones that had state saved. */
     for_each_vcpu(d, v) 

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