Merge pull request #66 from djs55/arm/shadow-allocation-set

arm: shadow_allocation_set is not supported; log failure and continue
xapi-project · Jun 4, 2014 · c10bbd5 · c10bbd5
2 parents cbcb00f + 5da5648
commit c10bbd5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/xc/domain.ml b/xc/domain.ml
@@ -508,9 +508,14 @@ let build_pre ~xc ~xs ~vcpus ~xen_max_mib ~shadow_mib ~required_host_free_mib do
 			error "VM = %s; domid = %d; domain_set_mmap_limit %Ld KiB failed: %s"
 				(Uuid.to_string uuid) domid kib (Printexc.to_string e)
 	end;
-	debug "VM = %s; domid = %d; shadow_allocation_set %d MiB" (Uuid.to_string uuid) domid shadow_mib;
-	Xenctrl.shadow_allocation_set xc domid shadow_mib;
-
+	begin
+		try
+			debug "VM = %s; domid = %d; shadow_allocation_set %d MiB" (Uuid.to_string uuid) domid shadow_mib;
+			Xenctrl.shadow_allocation_set xc domid shadow_mib;
+		with e ->
+			error "VM = %s; domid = %d; shadow_allocation_set %d failed: %s"
+				(Uuid.to_string uuid) domid shadow_mib (Printexc.to_string e)
+	end;
 	create_channels ~xc uuid domid
 
 let resume_post ~xc ~xs domid =