Merge pull request #1011 from johnelse/ca-96893

CA-96893: Remove xenopsd VmExtra metadata from filesystem after suspend and migrate.

Author: Jon Ludlam

ocaml/xapi/xapi_xenops.ml

@@ -829,7 +829,8 @@ let update_vm ~__context id =
 										error "Suspended VM has no domain-specific metadata"
 									| Some x ->
 										Db.VM.set_last_booted_record ~__context ~self ~value:x;
-										debug "VM %s last_booted_record set to %s" (Ref.string_of self) x
+										debug "VM %s last_booted_record set to %s" (Ref.string_of self) x;
+								Xenopsd_metadata.delete ~__context id
 							end;
 							if power_state = `Halted
 							then !trigger_xenapi_reregister ();

ocaml/xenops/xenops_server_xen.ml

@@ -791,7 +791,8 @@ module VM = struct
 			(fun xc xs ->
 				safe_rm xs (Printf.sprintf "/vm/%s" vm.Vm.id);
 				safe_rm xs (Printf.sprintf "/vss/%s" vm.Vm.id);
-			)
+			);
+		DB.remove vm.Vm.id
 
 	let log_exn_continue msg f x = try f x with e -> debug "Safely ignoring exception: %s while %s" (Printexc.to_string e) msg