Skip to contentSkip to conversation

integrate ocaml xenstored with xen-unstable.hg

PATCH In review Alex Zeffertt 1 participant 2 messages Apr 17, 2009 – Jun 10, 2009

lore
Share & tools
lore
#0 lore raw

cover integrate ocaml xenstored with xen-unstable.hg

Hi Vincent,

Please consider applying this patchqueue to xen-ocaml-tools.hg. The purpose of these patches is to integrate xen-ocaml-tools.hg with xen-unstable.hg.

In more detail: I have a xen-unstable.hg patchqueue which gives the user the option of selecting xen-ocaml-tools.hg as the source for xenstored in preference to tools/xenstore. This is similar to the mechanism we already employ with qemu where the user may select between the in tree code and a remote repo.

However, for the xen-unstable.hg patchqueue to work I first need these changes in xen-ocaml-tools.hg. The main change I have made is to add stubdom support.

Regards,

Alex

#1 lore raw

Hi,

I'd like to append an 8th patch to this patchqueue.

The attached patch causes all syslog to be redirected to the console when
the ocaml version of xenstore is running in a mini-OS stubdomain. The console messages can be viewed using xenconsole_dump, or with "/etc/init.d/xenstored console" which just calls xenconsole_dump with the appropriate parameters.

Without this patch all syslog messages are just lost when the ocaml version of xenstore is running in a stubdomain.

Regards,

Alex

Quoted 15 lines · Alex Zeffertt

Hi Vincent,

Please consider applying this patchqueue to xen-ocaml-tools.hg. The purpose of these patches is to integrate xen-ocaml-tools.hg with xen-unstable.hg.

In more detail: I have a xen-unstable.hg patchqueue which gives the user the option of selecting xen-ocaml-tools.hg as the source for xenstored in preference to tools/xenstore. This is similar to the mechanism we already employ with qemu where the user may select between the in tree code and a remote repo.

However, for the xen-unstable.hg patchqueue to work I first need these changes in xen-ocaml-tools.hg. The main change I have made is to add stubdom support.

Regards,

Quoted 8 lines

Alex

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Support syslog when running in a stub domain (messages are routed to console). Without this patch all messages are simply lost when xenstored is compiled into a mini-OS stubdomain.

Signed-off-by <[email protected]>
libs/log/log.ml +2 -1
diff -r f7972857413a libs/log/log.ml
@@ -71,6 +71,7 @@
 
 (** open a syslog logger *)
 let opensyslog k level =
+	Syslog.init "xenstored" [] Syslog.Daemon ; 
 	make (Syslog k) level
 
 (** open a stderr logger *)
@@ -236,7 +237,7 @@
 		| Info  -> Syslog.Info
 		| Warn  -> Syslog.Warning
 		| Error -> Syslog.Err in
-		Syslog.log Syslog.Daemon sys_prio ((construct_string false) ^ "\n")
+		Syslog.log sys_prio ((construct_string false) ^ "\n")
 	| Stream s -> (
 	      match !(s.channel) with
 		| Some c -> write_to_stream c
libs/log/syslog.ml +2 -2
diff -r f7972857413a libs/log/syslog.ml
@@ -21,6 +21,6 @@
 	      | Local4 | Local5 | Local6 | Local7
 	      | Lpr | Mail | News | Syslog | User | Uucp
 
-(* external init : string -> options list -> facility -> unit = "stub_openlog" *)
-external log : facility -> level -> string -> unit = "stub_syslog"
+external init : string -> options list -> facility -> unit = "stub_openlog"
+external log : level -> string -> unit = "stub_syslog"
 external close : unit -> unit = "stub_closelog"
libs/log/syslog.mli +2 -1
diff -r f7972857413a libs/log/syslog.mli
@@ -37,5 +37,6 @@
   | Syslog
   | User
   | Uucp
-external log : facility -> level -> string -> unit = "stub_syslog"
+external init : string -> options list -> facility -> unit = "stub_openlog"
+external log : level -> string -> unit = "stub_syslog"
 external close : unit -> unit = "stub_closelog"
libs/log/syslog_stubs.c +49 -28

113 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel