# HG changeset patch # User David Scott <[email protected]> # Date 1282568582 -3600 # Node ID 81dbe94e62c30c70b15360a1c10418e2f6760e30 # Parent 0cf8a11ad69a7e2012384bf6b8e63b5f3fac8dc3 [Tapctl.of_device x] now will throw an exception if [x] is not a device; or if [x] is a device owned by another driver.
Signed-off-by: David Scott <[email protected]> diff -r 0cf8a11ad69a -r 81dbe94e62c3 tapctl/tapctl.ml --- a/tapctl/tapctl.ml Mon Aug 23 14:02:39 2010 +0100 +++ b/tapctl/tapctl.ml Mon Aug 23 14:03:02 2010 +0100 @@ -332,8 +332,24 @@ | [(tapdev,state,Some _ )] -> true | _ -> false +(* We need to be able to check that a given device's major number corresponds to the right driver *) +let read_proc_devices () : (int * string) list = + let parse_line x = match List.filter (fun x -> x <> "") (String.split ' ' x) with + | [x; y] -> (try Some (int_of_string x, y) with _ -> None) + | _ -> None in + List.concat (List.map Opt.to_list ( Unixext.file_lines_fold (fun acc x -> parse_line x :: acc) [] "/proc/devices") ) + +let driver_of_major major = List.assoc major (read_proc_devices ()) + +exception Not_blktap +exception Not_a_device + let of_device ctx path = - let minor = (Unix.stat path).Unix.st_rdev mod 256 in + let stat = Unix.stat path in + if stat.Unix.st_kind <> Unix.S_BLK then raise Not_a_device; + let major = stat.Unix.st_rdev / 256 in + let minor = stat.Unix.st_rdev mod 256 in + if driver_of_major major <> "tapdev" then raise Not_blktap; match List.filter (fun (tapdev, _, _) -> tapdev.minor = minor) (list ctx) with | [ t ] -> t | _ -> raise Not_found diff -r 0cf8a11ad69a -r 81dbe94e62c3 tapctl/tapctl.mli --- a/tapctl/tapctl.mli Mon Aug 23 14:02:39 2010 +0100 +++ b/tapctl/tapctl.mli Mon Aug 23 14:03:02 2010 +0100 @@ -33,5 +33,11 @@ val is_paused : context -> tapdev -> bool val is_active : context -> tapdev -> bool +(** Thrown by [of_device x] when [x] is a device not owned by blktap *) +exception Not_blktap + +(** Thrown by [of_device x] when [x] is not a device *) +exception Not_a_device + (** Given a path to a device, return the corresponding tap information *) val of_device : context -> string -> t tapctl/tapctl.ml | 18 +++++++++++++++++- tapctl/tapctl.mli | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletions(-)
# HG changeset patch # User David Scott <[email protected]> # Date 1282568582 -3600 # Node ID 81dbe94e62c30c70b15360a1c10418e2f6760e30 # Parent 0cf8a11ad69a7e2012384bf6b8e63b5f3fac8dc3 [Tapctl.of_device x] now will throw an exception if [x] is not a device; or if [x] is a device owned by another driver. Signed-off-by: David Scott <[email protected]> diff -r 0cf8a11ad69a -r 81dbe94e62c3 tapctl/tapctl.ml --- a/tapctl/tapctl.ml Mon Aug 23 14:02:39 2010 +0100 +++ b/tapctl/tapctl.ml Mon Aug 23 14:03:02 2010 +0100 @@ -332,8 +332,24 @@ | [(tapdev,state,Some _ )] -> true | _ -> false +(* We need to be able to check that a given device's major number corresponds to the right driver *) +let read_proc_devices () : (int * string) list = + let parse_line x = match List.filter (fun x -> x <> "") (String.split ' ' x) with + | [x; y] -> (try Some (int_of_string x, y) with _ -> None) + | _ -> None in + List.concat (List.map Opt.to_list ( Unixext.file_lines_fold (fun acc x -> parse_line x :: acc) [] "/proc/devices") ) + +let driver_of_major major = List.assoc major (read_proc_devices ()) + +exception Not_blktap +exception Not_a_device + let of_device ctx path = - let minor = (Unix.stat path).Unix.st_rdev mod 256 in + let stat = Unix.stat path in + if stat.Unix.st_kind <> Unix.S_BLK then raise Not_a_device; + let major = stat.Unix.st_rdev / 256 in + let minor = stat.Unix.st_rdev mod 256 in + if driver_of_major major <> "tapdev" then raise Not_blktap; match List.filter (fun (tapdev, _, _) -> tapdev.minor = minor) (list ctx) with | [ t ] -> t | _ -> raise Not_found diff -r 0cf8a11ad69a -r 81dbe94e62c3 tapctl/tapctl.mli --- a/tapctl/tapctl.mli Mon Aug 23 14:02:39 2010 +0100 +++ b/tapctl/tapctl.mli Mon Aug 23 14:03:02 2010 +0100 @@ -33,5 +33,11 @@ val is_paused : context -> tapdev -> bool val is_active : context -> tapdev -> bool +(** Thrown by [of_device x] when [x] is a device not owned by blktap *) +exception Not_blktap + +(** Thrown by [of_device x] when [x] is not a device *) +exception Not_a_device + (** Given a path to a device, return the corresponding tap information *) val of_device : context -> string -> t
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
