[Xen-API] [PATCH 1 of 4] Remove the brctl utility. It is unused

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r eef517421463 -r a177a071a241 OMakefile
--- a/OMakefile Tue Dec 15 12:30:48 2009 +0000
+++ b/OMakefile Tue Dec 15 12:30:48 2009 +0000
@@ -117,7 +117,6 @@
        ocaml/xsrpc/xsrpc \
        ocaml/xsrpc/xsrpcd-util \
        ocaml/guest/agent \
-       ocaml/netdev/brctl \
        ocaml/p2v/p2v \
        ocaml/p2v/closeandexec_static \
        ocaml/license/v6testd \
diff -r eef517421463 -r a177a071a241 ocaml/netdev/OMakefile
--- a/ocaml/netdev/OMakefile    Tue Dec 15 12:30:48 2009 +0000
+++ b/ocaml/netdev/OMakefile    Tue Dec 15 12:30:48 2009 +0000
@@ -3,14 +3,3 @@
 OCamlDocLibrary(netdev, netdev)
 
 OCAML_LIBS += netdev
-
-OCamlProgram(brctl, brctl)
-
-.PHONY: clean
-clean:
-       rm -f $(CLEAN_OBJS) brctl
-
-#.PHONY: install
-#install:
-#      mkdir -p $(DIST)/staging/opt/xensource/bin
-#      cp brctl $(DIST)/staging/opt/xensource/bin
diff -r eef517421463 -r a177a071a241 ocaml/netdev/brctl.ml
--- a/ocaml/netdev/brctl.ml     Tue Dec 15 12:30:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-(*
- * Copyright (C) 2006-2009 Citrix Systems Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; version 2.1 only. with the special
- * exception on linking described in file LICENSE.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *)
-
-(* Quick mini-implementation of brctl to check our bridge lib is working *)
-
-open Netdev
-open Printf
-
-let usage_and_quit () = 
-      List.iter (fun x -> output_string stderr x; output_string stderr "\n") 
-       [
-         "commands:";
-         "\taddbr <bridge>            add bridge";
-         "\tdebr  <bridge>            delete bridge";
-         "\taddif <bridge> <device>   add interface to bridge";
-         "\tdelif <bridge> <device>   delete interface from bridge";
-         "\tshow                      show a list of bridges"
-       ];
-      exit 1
-
-let _ = 
-  if Array.length Sys.argv < 2 then usage_and_quit ();
-
-  match Sys.argv.(1) with
-  | "show" ->
-      let all = Bridge.list () in
-      let print = printf "%-15s %-23s %-15s %-16s\n" in
-      print "bridge_name" "bridge id" "STP enabled" "interfaces";
-      List.iter 
-       (fun bridge ->
-          let id = Bridge.get_id bridge in
-          let stp = if Bridge.get_stp_state bridge then "yes" else "no" in
-          let ifs = Bridge.intf_list bridge in
-          let first_if = if ifs = [] then "" else List.hd ifs in
-          print bridge id stp first_if;
-          if ifs <> [] then List.iter (print "" "" "") (List.tl ifs)
-       ) all
-  | "addbr" ->
-      if Array.length Sys.argv <> 3 then usage_and_quit ();
-      let bridge = Sys.argv.(2) in
-      Bridge.add bridge
-  | "delbr" ->
-      if Array.length Sys.argv <> 3 then usage_and_quit ();
-      let bridge = Sys.argv.(2) in
-      Bridge.del bridge
-  | "addif" ->
-      if Array.length Sys.argv <> 4 then usage_and_quit ();
-      let bridge = Sys.argv.(2) in
-      let iface = Sys.argv.(3) in
-      Bridge.intf_add bridge iface
-  | "delif" ->
-      if Array.length Sys.argv <> 4 then usage_and_quit ();
-      let bridge = Sys.argv.(2) in
-      let iface = Sys.argv.(3) in
-      Bridge.intf_del bridge iface
-  | _ -> 
-      eprintf "Unknown command";
-      exit 1
-             

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