diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2010-07-09 12:22:00 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2010-07-09 12:22:00 +0100 |
| commit | c13cd8786df209d426fa48b2b9955ba12e80328c (patch) | |
| tree | 8f81839b849f3b70a6313823458654161a2f532d /xen/common/hvm | |
| parent | 3803ac66099d72eded0016b080c9ee74d2553416 (diff) | |
| download | xen-c13cd8786df209d426fa48b2b9955ba12e80328c.tar.gz xen-c13cd8786df209d426fa48b2b9955ba12e80328c.tar.bz2 xen-c13cd8786df209d426fa48b2b9955ba12e80328c.zip | |
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@citrix.com>
Diffstat (limited to 'xen/common/hvm')
| -rw-r--r-- | xen/common/hvm/save.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c index 66876e6a1c..2e877ce18d 100644 --- a/xen/common/hvm/save.c +++ b/xen/common/hvm/save.c @@ -184,8 +184,6 @@ int hvm_save(struct domain *d, hvm_domain_context_t *h) 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; @@ -201,21 +199,6 @@ int hvm_load(struct domain *d, hvm_domain_context_t *h) 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) if ( test_and_set_bit(_VPF_down, &v->pause_flags) ) |