CP-1803: when reverting from snapshots, do not overwrite vm protection policy

Signed-off-by: Marcus Granado <marcus.granado@eu.citrix.com>

diff --git a/ocaml/database/db_names.ml b/ocaml/database/db_names.ml
index 82b2b6fc617ddea888bac9f69e0799358f0197bb..7f5d0d26fdb20f7dca465d10b3ef2865aa0f1c43 100644 (file)
--- a/ocaml/database/db_names.ml
+++ b/ocaml/database/db_names.ml
@@ -43,3 +43,4 @@ let domid = "domid"
 let ha_always_run = "ha_always_run"
 let host = "host"
 let bios_strings = "bios_strings"
+let protection_policy = "protection_policy"

diff --git a/ocaml/xapi/xapi_vm_snapshot.ml b/ocaml/xapi/xapi_vm_snapshot.ml
index 120b7cfe5d11a708bd0383c4c94321e7355f8633..1bb04a5b122912f061bb361335efe5c271cca061 100644 (file)
--- a/ocaml/xapi/xapi_vm_snapshot.ml
+++ b/ocaml/xapi/xapi_vm_snapshot.ml
@@ -353,6 +353,7 @@ let do_not_copy = [
        Db_names.guest_metrics;
        Db_names.resident_on;
        Db_names.domid;
+       Db_names.protection_policy;
        Db_names.scheduled_to_be_resident_on ]
 
 let default_values = [