[Xen-API] [PATCH 4 of 9] CA-31528: Remove the Xal DevError event since it is unused

[David Scott <dave.scott@xxxxxxxxxxxxx>]

# HG changeset patch
# User David Scott <dave.scott@xxxxxxxxxxxxx>
# Date 1259595836 0
# Node ID af477faf447cacab57d6eeea7149e53c6e96a427
# Parent  be58692e3374e2a2de389fe2c6c80ec734224ed8
CA-31528: Remove the Xal DevError event since it is unused.

Signed-off-by: David Scott <dave.scott@xxxxxxxxxxxxx>

diff -r be58692e3374 -r af477faf447c ocaml/xenops/xal.ml
--- a/ocaml/xenops/xal.ml       Mon Nov 30 15:43:55 2009 +0000
+++ b/ocaml/xenops/xal.ml       Mon Nov 30 15:43:56 2009 +0000
@@ -28,7 +28,6 @@
 
 type dev_event =
        (* devices : backend / type / devid *)
-       | DevError of string * string * string
        | DevEject of string * string
        (* device thread start : type / devid / pid *)
        | DevThread of string * string * int
@@ -53,7 +52,6 @@
        | BackEject
        | BackShutdown
        | Frontend of xs_dev_state
-       | Error of string
        | Rtc of string * string (* uuid, data *)
        | IntMessage of string * string * int64 * string (* uuid, name, 
priority, body *)
        | HotplugBackend of string option
@@ -70,8 +68,6 @@
        let string_of_string_opt = function None -> "\"\"" | Some s -> s in
        let string_of_b b = if b then "B" else "F" in
        match ev with
-       | DevError (s, i, e) ->
-               sprintf "device error {%s,%s} \"%s\"" s i e
        | DevEject (s, i) ->
                sprintf "device eject {%s,%s}" s i
        | DevThread (s, i, pid) ->
@@ -446,9 +442,6 @@
        | "" :: "local" :: "domain" :: domid :: "device" :: ty :: devid :: [ 
"state" ] ->
                let xsds = read_state w in
                Some (int_of_string domid, Frontend xsds, ty, devid)
-       | "" :: "local" :: "domain" :: domid :: "error" :: "device" :: ty :: 
devid :: [ "error" ] ->
-               let error = try xs.Xs.read w with Xb.Noent -> "" in
-               Some (int_of_string domid, Error error, ty, devid)
        | "" :: "xapi" :: domid :: "hotplug" :: ty :: devid :: [ "hotplug" ] ->
                let extra = try Some (xs.Xs.read w) with _ -> None in
                Some (int_of_string domid, (HotplugBackend extra), ty, devid)
@@ -589,9 +582,6 @@
                | Frontend state ->
                        let oldstate = devstate.frontstate in
                        devstate.frontstate <- state;
-               | Error error ->
-                       devstate.error <- (Some error);
-                       ctx.callback_devices ctx domid (DevError (ty, devid, 
error))
                | BackShutdown ->
                        ctx.callback_devices ctx domid (DevShutdownDone (ty, 
devid))
                | HotplugBackend extra  ->
diff -r be58692e3374 -r af477faf447c ocaml/xenops/xal.mli
--- a/ocaml/xenops/xal.mli      Mon Nov 30 15:43:55 2009 +0000
+++ b/ocaml/xenops/xal.mli      Mon Nov 30 15:43:56 2009 +0000
@@ -37,7 +37,6 @@
 exception Timeout
 
 type dev_event =
-       | DevError of string * string * string
        | DevEject of string * string
        | DevThread of string * string * int
        | DevShutdownDone of string * string
2 files changed, 11 deletions(-)
ocaml/xenops/xal.ml  |   10 ----------
ocaml/xenops/xal.mli |    1 -

Attachment: xen-api.hg-9.patch
Description: Text Data

_______________________________________________
xen-api mailing list
xen-api@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/mailman/listinfo/xen-api