# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1278584537 -3600
# Node ID bdd04b9dc81fa13d50c6e1535b5c026600241a74
# Parent b9d131eda02f682382ffc58a804421f700f27a9e
Assume that all old PV drivers on XCP are new enough to support rolling upgrade.
Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>
diff -r b9d131eda02f -r bdd04b9dc81f ocaml/xapi/xapi_pv_driver_version.ml
--- a/ocaml/xapi/xapi_pv_driver_version.ml Thu Jul 08 11:21:19 2010 +0100
+++ b/ocaml/xapi/xapi_pv_driver_version.ml Thu Jul 08 11:22:17 2010 +0100
@@ -110,14 +110,10 @@
| Windows (maj,min,mic,build) -> (compare_vsn_with_product_vsn
(maj,min,mic)>=0) && (compare_vsn_with_tools_iso (maj, min, mic, build) >= 0)
| _ -> false
-(** Returns true if the PV drivers are OK for migrate; in Miami we allow
migration
- as long as the major vs of the PV drivers are 4. This allows us to migrate
VMs
- with PV drivers from the previous release during rolling upgrade.
-*)
-let is_ok_for_migrate = function
- | Linux(major, _, _, _) when major >= 4 -> true
- | Windows(major, _, _, _) when major >= 4 -> true (* bumped in CA-6891 *)
- | _ -> false
+(* Very old PV drivers (Miama-era) needed to be upgraded before
suspend/migrate.
+ We assume that all these guests have now been upgraded (or will be as
+ part of a version-by-version rolling upgrade). *)
+let is_ok_for_migrate x = x <> Unknown
let of_drivers_version drivers_version =
ocaml/xapi/xapi_pv_driver_version.ml | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
xen-api.hg.patch
Description: Text Data
_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api
|
Home