--- a/ocaml/xenops/domain.ml
+++ b/ocaml/xenops/domain.ml
@@ -69,7 +69,7 @@
 
 let save_signature = "XenSavedDomain\n"
 let qemu_save_signature = "QemuDeviceModelRecord\n"
-let hvmloader = "/usr/lib/xen/boot/hvmloader"
+let hvmloader = "/usr/lib/xen-4.1/boot/hvmloader"
 let releaseDomain = "@releaseDomain"
 let introduceDomain = "@introduceDomain"
 
@@ -244,7 +244,7 @@
   let di = Xenctrl.domain_getinfo xc domid in
 
   if di.Xenctrl.hvm_guest then begin
-	if Xenctrl.hvm_check_pvdriver xc domid
+	if false 
 	then debug "HVM guest with PV drivers: not expecting any acknowledgement"
 	else Xenctrl.domain_shutdown xc domid (shutdown_to_xc_shutdown req)
   end else begin
@@ -421,13 +421,15 @@
 	let hpet = int_platform_flag "hpet" in
 	let vpt_align = int_platform_flag "vpt_align" in
 
-	let maybe_exn_ign name f opt =
+(*	let maybe_exn_ign name f opt =
           maybe (fun opt -> try f opt with exn -> warn "exception setting %s: %s" name (Printexc.to_string exn)) opt
-        in
+        in*)
 
-	maybe_exn_ign "timer mode" (fun mode -> Xenctrl.domain_set_timer_mode xc domid mode) timer_mode;
+(*	maybe_exn_ign "timer mode" (fun mode -> Xenctrl.domain_set_timer_mode xc domid mode) timer_mode;
         maybe_exn_ign "hpet" (fun hpet -> Xenctrl.domain_set_hpet xc domid hpet) hpet;
-        maybe_exn_ign "vpt align" (fun vpt_align -> Xenctrl.domain_set_vpt_align xc domid vpt_align) vpt_align;
+        maybe_exn_ign "vpt align" (fun vpt_align -> Xenctrl.domain_set_vpt_align xc domid vpt_align) vpt_align;*)
+
+	ignore(timer_mode,hpet,vpt_align);
 
 	Xenctrl.domain_max_vcpus xc domid vcpus;
 	Xenctrl.domain_set_memmap_limit xc domid (Memory.kib_of_mib xen_max_mib);
@@ -863,10 +865,9 @@
 	);
 	debug "Suspend for domid %d finished" domid
 
-let send_s3resume ~xc domid = Xenctrl.domain_send_s3resume xc domid
-
-let trigger_power ~xc domid = Xenctrl.domain_trigger_power xc domid
-let trigger_sleep ~xc domid = Xenctrl.domain_trigger_sleep xc domid
+let send_s3resume ~xc domid = failwith "Xenctrl.domain_send_s3resume xc domid"
+let trigger_power ~xc domid = failwith "Xenctrl.domain_trigger_power xc domid"
+let trigger_sleep ~xc domid = failwith "Xenctrl.domain_trigger_sleep xc domid"
 
 let vcpu_affinity_set ~xc domid vcpu cpumap =
 	(*
@@ -949,7 +950,7 @@
 
 let suppress_spurious_page_faults ~xc domid =
   debug "suppress spurious page faults for dom%d" domid;
-  Xenctrl.domain_suppress_spurious_page_faults xc domid
+  failwith "Xenctrl.domain_suppress_spurious_page_faults xc domid"
 
 type cpuid_reg = Eax | Ebx | Ecx | Edx
 type cpuid_rtype = Clear | Set | Default | Same | Keep
