Merge pull request xapi-project#11 from djs55/forupstream/xenswitch

Optionally use the message switch

Author: djs55

lib/config.ml

@@ -13,54 +13,39 @@
  *)
 
 let network_conf = ref "/etc/xcp/network.conf"
-let vif_script = ref "/usr/lib/xcp/scripts/vif"
-let qemu_vif_script = ref "/usr/lib/xcp/scripts/qemu-vif-script"
-let vbd_script = ref "/etc/xen/scripts/block"
-let pci_flr_script = ref "/usr/lib/xcp/lib/pci-flr"
-let vncterm = ref "/usr/lib/xcp/lib/vncterm"
-let xenguest = ref "/usr/lib/xcp/lib/xenguest"
 let qemu_dm_wrapper = ref "/usr/lib/xcp/lib/qemu-dm-wrapper"
 let qemu_system_i386 = ref "/usr/lib/xen/bin/qemu-system-i386"
-let tune2fs = ref "/sbin/tune2fs"
-let mkfs = ref "/sbin/mkfs"
-let mount = ref "/bin/mount"
-let umount = ref "/bin/umount"
-let ionice = ref "/usr/bin/ionice"
 let chgrp = ref "/bin/chgrp"
-let setup_vif_rules = ref "/usr/lib/xcp/lib/setup-vif-rules"
 let hvmloader = ref "/usr/lib/xen-4.1/boot/hvmloader"
-let pygrub = ref "/usr/lib/xen-4.1/bin/pygrub"
-let eliloader = ref "/usr/bin/eliloader"
 
 open Unix
 
-let essentials = [
-	X_OK, "vbd-script", vbd_script, "path to the vbd backend script";
-	R_OK, "network-conf", network_conf, "path to the network backend switch";
-	X_OK, "vif-script", vif_script, "path to the vif backend script";
-	X_OK, "qemu-vif-script", qemu_vif_script, "path to the qemu vif script";
-	X_OK, "vncterm", vncterm, "path to the vncterm binary";
-	X_OK, "xenguest", xenguest, "path to the xenguest binary";
+let hvm_guests = [
+	R_OK, "hvmloader", hvmloader, "path to the hvmloader binary for HVM guests";
 	X_OK, "qemu-dm-wrapper", qemu_dm_wrapper, "path to the qemu-dm-wrapper script";
 	X_OK, "qemu-system-i386", qemu_system_i386, "path to the qemu-system-i386 binary";
-	X_OK, "tune2fs", tune2fs, "path to the tune2fs binary";
-	X_OK, "mkfs", mkfs, "path to the mkfs binary";
-	X_OK, "mount", mount, "path to the mount binary";
-	X_OK, "umount", umount, "path to the umount binary";
-	X_OK, "ionice", ionice, "path to the ionice binary";
+]
+
+(* libvirt xc *)
+let network_configuration = [
+	R_OK, "network-conf", network_conf, "path to the network backend switch";
+]
+
+let essentials = [
 	X_OK, "chgrp", chgrp, "path to the chgrp binary";
-	X_OK, "setup-vif-rules", setup_vif_rules, "path to the setup-vif-rules script";
-	R_OK, "hvmloader", hvmloader, "path to the hvmloader binary for HVM guests";
-	X_OK, "pygrub", pygrub, "path to the pygrub bootloader binary";
-	X_OK, "eliloader", eliloader, "path to the eliloader bootloader binary";
 ]
 
 let nonessentials = [
-	X_OK, "pci-flr-script", pci_flr_script, "path to the PCI function-level reset script";
 ]
 
-(* Sometimes we tell other services to execute programs (e.g. udev calling the vif script)
-   and they will have a different working directory *)
-let canonicalise x = Filename.(if is_relative x then concat (Unix.getcwd ()) x else x)
-
-let config_spec = List.map (fun (_, a, b, c) -> a, Arg.String (fun x -> b := canonicalise x), c) (essentials @ nonessentials)
+let make_resources ~essentials ~nonessentials =
+	let open Xcp_service in
+	List.map (fun (perm, name, path, description) -> {
+		essential = true;
+		name; description; path;
+		perms = [ perm ]
+	}) essentials @ (List.map (fun (perm, name, path, description) -> {
+		essential = false;
+		name; description; path;
+		perms = [ perm ]
+	}) nonessentials)

lib/config.mli

@@ -1241,7 +1241,7 @@ and perform ?subtask (op: operation) (t: Xenops_task.t) : unit =
 			let state = B.VM.get_state vm in
 			info "VM %s has memory_limit = %Ld" id state.Vm.memory_limit;
 
-			Cohttp_posix_io.Unbuffered_IO.open_uri memory_url
+			Open_uri.with_open_uri memory_url
 				(fun mfd ->
 					let open Xenops_migrate in
 					let module Request = Cohttp.Request.Make(Cohttp_posix_io.Unbuffered_IO) in