Merge branch 'master' of git://github.com/xapi-project/xenopsd

Conflicts:
	_tags
	setup.ml

_oasis

@@ -32,7 +32,7 @@ Library xenopsd
   Path:               lib
   Findlibname:        xenopsd
   Modules:            Cancellable_subprocess, Bootloader, Ionice, Mac, Xenops_migrate, Xenops_hooks, Task_server, Xenops_task, Updates, Xenops_utils, Xenops_server, Xenopsd, Xenops_server_plugin, Xenops_server_skeleton, Scheduler, Path, Storage, Interface
-  BuildDepends:       syslog, threads, threads.posix, uuidm, xmlm, cohttp, uri, rpclib, rpclib.syntax, forkexec, fd-send-recv, xcp, xcp.xen, xcp.storage, rpclib.syntax, sexplib, xcp
+  BuildDepends:       threads, threads.posix, uuidm, xmlm, cohttp, uri, rpclib, rpclib.syntax, forkexec, fd-send-recv, xcp, xcp.xen, xcp.storage, rpclib.syntax, sexplib, xcp
 
 Executable xenguest
   CompiledObject:     best

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: b0fbc77077fef1ce0dd61a6a02190cb1)
+# DO NOT EDIT (digest: dfdf972b8242196ab444abfc9d4c4d1d)
 # Ignore VCS directories, you can use the same kind of rule outside 
 # OASIS_START/STOP if you want to exclude directories that contains 
 # useless stuff for the build process
@@ -20,7 +20,6 @@
 <lib/*.ml{,i}>: pkg_xcp
 <lib/*.ml{,i}>: pkg_xcp.storage
 <lib/*.ml{,i}>: pkg_sexplib
-<lib/*.ml{,i}>: pkg_syslog
 <lib/*.ml{,i}>: pkg_threads
 <lib/*.ml{,i}>: pkg_threads.posix
 <lib/*.ml{,i}>: pkg_uuidm
@@ -51,7 +50,6 @@
 <xc/xenops_xc_main.{native,byte}>: pkg_xcp.memory
 <xc/xenops_xc_main.{native,byte}>: pkg_sexplib
 <xc/xenops_xc_main.{native,byte}>: pkg_xcp-inventory
-<xc/xenops_xc_main.{native,byte}>: pkg_syslog
 <xc/xenops_xc_main.{native,byte}>: pkg_threads
 <xc/xenops_xc_main.{native,byte}>: pkg_threads.posix
 <xc/xenops_xc_main.{native,byte}>: pkg_uuidm
@@ -74,7 +72,6 @@
 <xc/*.ml{,i}>: pkg_xcp.memory
 <xc/*.ml{,i}>: pkg_sexplib
 <xc/*.ml{,i}>: pkg_xcp-inventory
-<xc/*.ml{,i}>: pkg_syslog
 <xc/*.ml{,i}>: pkg_threads
 <xc/*.ml{,i}>: pkg_threads.posix
 <xc/*.ml{,i}>: pkg_uuidm
@@ -97,7 +94,6 @@
 "xc/fsync_stubs.c": pkg_xcp.memory
 "xc/fsync_stubs.c": pkg_sexplib
 "xc/fsync_stubs.c": pkg_xcp-inventory
-"xc/fsync_stubs.c": pkg_syslog
 "xc/fsync_stubs.c": pkg_threads
 "xc/fsync_stubs.c": pkg_threads.posix
 "xc/fsync_stubs.c": pkg_uuidm
@@ -120,7 +116,6 @@
 "xc/xenctrlext_stubs.c": pkg_xcp.memory
 "xc/xenctrlext_stubs.c": pkg_sexplib
 "xc/xenctrlext_stubs.c": pkg_xcp-inventory
-"xc/xenctrlext_stubs.c": pkg_syslog
 "xc/xenctrlext_stubs.c": pkg_threads
 "xc/xenctrlext_stubs.c": pkg_threads.posix
 "xc/xenctrlext_stubs.c": pkg_uuidm
@@ -138,7 +133,6 @@
 <simulator/xenops_simulator_main.{native,byte}>: pkg_xcp
 <simulator/xenops_simulator_main.{native,byte}>: pkg_xcp.storage
 <simulator/xenops_simulator_main.{native,byte}>: pkg_sexplib
-<simulator/xenops_simulator_main.{native,byte}>: pkg_syslog
 <simulator/xenops_simulator_main.{native,byte}>: pkg_threads
 <simulator/xenops_simulator_main.{native,byte}>: pkg_threads.posix
 <simulator/xenops_simulator_main.{native,byte}>: pkg_uuidm
@@ -154,7 +148,6 @@
 <simulator/*.ml{,i}>: pkg_xcp
 <simulator/*.ml{,i}>: pkg_xcp.storage
 <simulator/*.ml{,i}>: pkg_sexplib
-<simulator/*.ml{,i}>: pkg_syslog
 <simulator/*.ml{,i}>: pkg_threads
 <simulator/*.ml{,i}>: pkg_threads.posix
 <simulator/*.ml{,i}>: pkg_uuidm
@@ -173,7 +166,6 @@
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_xcp.storage
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_sexplib
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_libvirt
-<libvirt/xenops_libvirt_main.{native,byte}>: pkg_syslog
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_threads
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_threads.posix
 <libvirt/xenops_libvirt_main.{native,byte}>: pkg_uuidm
@@ -190,7 +182,6 @@
 <libvirt/*.ml{,i}>: pkg_xcp.storage
 <libvirt/*.ml{,i}>: pkg_sexplib
 <libvirt/*.ml{,i}>: pkg_libvirt
-<libvirt/*.ml{,i}>: pkg_syslog
 <libvirt/*.ml{,i}>: pkg_threads
 <libvirt/*.ml{,i}>: pkg_threads.posix
 <libvirt/*.ml{,i}>: pkg_uuidm
@@ -223,7 +214,6 @@
 <xl/xenops_xl_main.{native,byte}>: pkg_xcp.memory
 <xl/xenops_xl_main.{native,byte}>: pkg_sexplib
 <xl/xenops_xl_main.{native,byte}>: pkg_xcp-inventory
-<xl/xenops_xl_main.{native,byte}>: pkg_syslog
 <xl/xenops_xl_main.{native,byte}>: pkg_threads
 <xl/xenops_xl_main.{native,byte}>: pkg_threads.posix
 <xl/xenops_xl_main.{native,byte}>: pkg_uuidm
@@ -248,7 +238,6 @@
 <xl/*.ml{,i}>: pkg_xcp.memory
 <xl/*.ml{,i}>: pkg_sexplib
 <xl/*.ml{,i}>: pkg_xcp-inventory
-<xl/*.ml{,i}>: pkg_syslog
 <xl/*.ml{,i}>: pkg_threads
 <xl/*.ml{,i}>: pkg_threads.posix
 <xl/*.ml{,i}>: pkg_uuidm
@@ -273,7 +262,6 @@
 "xl/fsync_stubs.c": pkg_xcp.memory
 "xl/fsync_stubs.c": pkg_sexplib
 "xl/fsync_stubs.c": pkg_xcp-inventory
-"xl/fsync_stubs.c": pkg_syslog
 "xl/fsync_stubs.c": pkg_threads
 "xl/fsync_stubs.c": pkg_threads.posix
 "xl/fsync_stubs.c": pkg_uuidm
@@ -298,7 +286,6 @@
 "xl/poll_stubs.c": pkg_xcp.memory
 "xl/poll_stubs.c": pkg_sexplib
 "xl/poll_stubs.c": pkg_xcp-inventory
-"xl/poll_stubs.c": pkg_syslog
 "xl/poll_stubs.c": pkg_threads
 "xl/poll_stubs.c": pkg_threads.posix
 "xl/poll_stubs.c": pkg_uuidm

lib/META

@@ -1,9 +1,9 @@
 # OASIS_START
-# DO NOT EDIT (digest: fe20234855dd68aa5129735f8475dde3)
+# DO NOT EDIT (digest: 05497db94fb93ddb7a6ea84dc7232c63)
 version = "0.9.24"
 description = "XenServer domain managers"
 requires =
-"syslog threads threads.posix uuidm xmlm cohttp uri rpclib rpclib.syntax forkexec fd-send-recv xcp xcp.xen xcp.storage rpclib.syntax sexplib xcp"
+"threads threads.posix uuidm xmlm cohttp uri rpclib rpclib.syntax forkexec fd-send-recv xcp xcp.xen xcp.storage rpclib.syntax sexplib xcp"
 archive(byte) = "xenopsd.cma"
 archive(byte, plugin) = "xenopsd.cma"
 archive(native) = "xenopsd.cmxa"

lib/xenops_utils.ml

@@ -16,54 +16,6 @@ open Xenops_interface
 
 let ( |> ) a b = b a
 
-module type BRAND = sig val name: string end
-
-module Debug = struct
-	type level =
-	| Debug
-	| Warn
-	| Info
-	| Error
-
-	let disabled_modules = ref []
-	let disable m =
-		disabled_modules := m :: !disabled_modules
-
-	let stderr key level x =
-		output_string stderr (Printf.sprintf "[%s|%s] %s" key (match level with
-		| Debug -> "debug"
-		| Warn -> "warn"
-		| Info -> "info"
-		| Error -> "error") x);
-		output_string stderr "\n";
-		flush stderr
-
-	let syslog ?(facility=`LOG_LOCAL5) name () =
-		let t = Syslog.openlog ~facility name in
-		fun key level x ->
-			Syslog.syslog t (match level with
-			| Debug -> `LOG_DEBUG
-			| Warn -> `LOG_WARNING
-			| Info -> `LOG_INFO
-			| Error -> `LOG_ERR
-			) (Printf.sprintf "[%s] %s" key x)
-
-	let output = ref stderr
-
-	let write key level x =
-		if not(List.mem key !disabled_modules)
-		then !output key level x
-
-	let with_thread_associated _ f x = f x (* XXX *)
-
-	module Make = functor(Brand: BRAND) -> struct
-		let debug fmt = Printf.ksprintf (write Brand.name Debug) fmt
-		let error fmt = Printf.ksprintf (write Brand.name Error) fmt
-		let info fmt = Printf.ksprintf (write Brand.name Info) fmt
-		let warn fmt = Printf.ksprintf (write Brand.name Warn) fmt
-	end
-end
-
 module D = Debug.Make(struct let name = "xenops_utils" end)
 open D
 

lib/xenopsd.ml

@@ -88,8 +88,6 @@ let handle_received_fd this_connection =
 
 
 let main ?(specific_options=[]) ?(specific_essential_paths=[]) ?(specific_nonessential_paths=[]) backend =
-	Debug.output := Debug.syslog (Filename.basename Sys.argv.(0)) ();
-
 	debug "xenopsd version %d.%d starting" major_version minor_version;
 
 	let options = options @ specific_options in

scripts/common.py

@@ -139,16 +139,9 @@ def __init__(self, vm_uuid, devid):
             f.close()
     def get_mode(self):
         x = MODE_BRIDGE
-        if "network-backend" in self.json["extra_private_keys"]:
-            b = self.json["extra_private_keys"]["network-backend"]
-            if b == "openvswitch" or b == "vswitch":
-                x = MODE_OPENVSWITCH
-            elif b == "bridge":
-                x = MODE_BRIDGE
-            else:
-                send_to_syslog("VIF %s/%s: unknown network-backend %s, assuming bridge" % (self.vm_uuid, self.devid))
-        else:
-            send_to_syslog("VIF %s/%d: no network-backend provided, assuming bridge" % (self.vm_uuid, self.devid))
+        if(os.path.exists("/sys/module/openvswitch")):
+            x = MODE_OPENVSWITCH
+        send_to_syslog("common.py: Detected network backend as: '%s'" % x)
         return x
     def get_bridge(self):
         network = self.json["backend"]

scripts/vif-real

@@ -260,7 +260,10 @@ PRIVATE=/xapi/${DOMID}/private/vif/${DEVID}
 HOTPLUG_STATUS="${XENBUS_PATH}/hotplug-status"
 HOTPLUG_ERROR="${XENBUS_PATH}/hotplug-error"
 
-NETWORK_MODE=$(xenstore-read "${PRIVATE}/network-backend" 2>/dev/null)
+NETWORK_MODE=bridge 
+if [ -e /sys/module/openvswitch ]; then
+    NETWORK_MODE=openvswitch
+fi
 XENOPSD_BACKEND=$(xenstore-read "${PRIVATE}/xenopsd-backend" 2>/dev/null)
 
 case $NETWORK_MODE in

setup.ml

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 0c0dc7c2c46ab0cbd76b060d5418d534) *)
+(* DO NOT EDIT (digest: b7aafd71e284fbed152f641a158856d9) *)
 (*
    Regenerated by OASIS v0.3.0
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -5697,7 +5697,6 @@ let setup_t =
                       bs_compiled_object = Best;
                       bs_build_depends =
                         [
-                           FindlibPackage ("syslog", None);
                            FindlibPackage ("threads", None);
                            FindlibPackage ("threads.posix", None);
                            FindlibPackage ("uuidm", None);
@@ -5955,15 +5954,14 @@ let setup_t =
           };
      oasis_fn = Some "_oasis";
      oasis_version = "0.3.0";
-     oasis_digest =
-       Some "\172\168N\183\025\0016\197\012\017\228\160\233\181<v";
+     oasis_digest = Some "\028\170\146m\247\158\005-F\187\252;xH\249\240";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false;
      };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 5968 "setup.ml"
+# 5966 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;

xc/xenops_server_xen.ml

@@ -177,8 +177,9 @@ let di_of_uuid ~xc ~xs domain_selection uuid =
 			  try 
 			    xs.Xs.read (Printf.sprintf "/vm/%s/domains/%d/create-time" uuid' x.domid) |> Int64.of_string 
 			  with e ->
-			    warn "Caught exception trying to find creation time of domid %d (uuid %s)" x.domid uuid';
-			    0L
+                            warn "Caught exception trying to find creation time of domid %d (uuid %s)" x.domid uuid';
+                            warn "Defaulting to 'now'";
+                            Oclock.gettime Oclock.monotonic
 			in
 			compare (create_time a) (create_time b)
 		) possible in
@@ -1925,7 +1926,6 @@ module VIF = struct
 				let id = _device_id Device_common.Vif, id_of vif in
 
 				let setup_vif_rules = [ "setup-vif-rules", !Xc_path.setup_vif_rules ] in
-				let network_backend = [ "network-backend", get_network_backend () ] in
 				let xenopsd_backend = [ "xenopsd-backend", "classic" ] in
 				let locking_mode = xenstore_of_locking_mode vif.locking_mode in
 
@@ -1944,7 +1944,7 @@ module VIF = struct
 								~mac:vif.mac ~carrier:(vif.carrier && (vif.locking_mode <> Xenops_interface.Vif.Disabled))
 								~mtu:vif.mtu ~rate:vif.rate ~backend_domid
 								~other_config:vif.other_config
-								~extra_private_keys:(id :: vif.extra_private_keys @ locking_mode @ setup_vif_rules @ network_backend @ xenopsd_backend)
+								~extra_private_keys:(id :: vif.extra_private_keys @ locking_mode @ setup_vif_rules @ xenopsd_backend)
 								frontend_domid in
 						let (_: Device_common.device) = create task frontend_domid in