Skip to content

Commit

Permalink
Remove xenlight backend
Browse files Browse the repository at this point in the history
It's not being maintained in any meaningful way.

Signed-off-by: Jon Ludlam <jonathan.ludlam@citrix.com>
  • Loading branch information
jonludlam committed Aug 23, 2018
1 parent 357f631 commit 203292e
Show file tree
Hide file tree
Showing 24 changed files with 1 addition and 5,159 deletions.
6 changes: 0 additions & 6 deletions Makefile
Expand Up @@ -26,10 +26,6 @@ doc:

install:
jbuilder install --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-xenopsd
ifeq ($(ENABLE_XENLIGHT),--enable-xenlight)
install -D _build/install/default/bin/xenopsd-xenlight $(DESTDIR)/$(SBINDIR)/xenopsd-xenlight
install -D _build/install/default/man/man1/xenopsd-xenlight.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-xenlight.1
endif
install -D _build/install/default/bin/xenopsd-simulator $(DESTDIR)/$(SBINDIR)/xenopsd-simulator
install -D _build/install/default/man/man1/xenopsd-simulator.1 $(DESTDIR)/$(MANDIR)/man1/xenopsd-simulator.1
install -D _build/install/default/bin/xenopsd-xc $(DESTDIR)/$(SBINDIR)/xenopsd-xc
Expand All @@ -52,11 +48,9 @@ endif

uninstall:
jbuilder uninstall --prefix=$(OPAM_PREFIX) --libdir=$(OPAM_LIBDIR) xapi-xenopsd
rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-xenlight
rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-xc
rm -f $(DESTDIR)/$(OPTDIR)/fence.bin
rm -f $(DESTDIR)/$(SBINDIR)/xenopsd-simulator
rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-xenlight.1
rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-xc.1
rm -f $(DESTDIR)/$(MANDIR)/man1/xenopsd-simulator.1
rm -f $(DESTDIR)/$(LIBEXECDIR)/set-domain-uuid
Expand Down
16 changes: 1 addition & 15 deletions configure.ml
@@ -1,5 +1,4 @@
let config_mk = "config.mk"
let config_ml = "config.ml"

(* Configure script *)
open Cmdliner
Expand Down Expand Up @@ -81,9 +80,6 @@ let find_ml_val verbose name libs =
Printf.printf "Looking for %s: %s\n" name (if found then "ok" else "missing");
found

let find_seriallist () =
find_ml_val false "(Obj.magic 1 : Xenlight.Domain_build_info.type_hvm).Xenlight.Domain_build_info.serial_list" ["xenlight"]

let expand start finish input output =
let command = Printf.sprintf "cat %s | sed -r 's=%s=%s=g' > %s" input start finish output in
if Sys.command command <> 0
Expand Down Expand Up @@ -120,8 +116,6 @@ let yesno_of_bool = function

let configure bindir sbindir libexecdir qemu_wrapper_dir scriptsdir etcdir mandir optdir coverage =
let xenctrl = find_ocamlfind false "xenctrl" in
let xenlight = find_ocamlfind false "xenlight" in
let xen45 = find_seriallist () in
let xentoollog = find_xentoollog false in
let p = Printf.sprintf in
List.iter print_endline
Expand All @@ -135,7 +129,6 @@ let configure bindir sbindir libexecdir qemu_wrapper_dir scriptsdir etcdir mandi
; p "\tmandir=%s" mandir
; p "\toptdir=%s" optdir
; p "\txenctrl=%b" xenctrl
; p "\txenlight=%b" xenlight
; p "\txentoollog=%b" xentoollog
; p "\tcoverage=%b" coverage
; p "" (* new line *)
Expand All @@ -154,21 +147,14 @@ let configure bindir sbindir libexecdir qemu_wrapper_dir scriptsdir etcdir mandi
Printf.sprintf "MANDIR=%s" mandir;
Printf.sprintf "OPTDIR=%s" optdir;
Printf.sprintf "ENABLE_XEN=--%s-xen" (if xenctrl then "enable" else "disable");
Printf.sprintf "ENABLE_XENLIGHT=--%s-xenlight" (if xenlight then "enable" else "disable");
Printf.sprintf "ENABLE_XENTOOLLOG=--%s-xentoollog" (if xentoollog then "enable" else "disable");
Printf.sprintf "BISECT_ENABLE=%s" (yesno_of_bool coverage);
"export BISECT_ENABLE"
] in
output_file config_mk lines;
(* Expand @LIBEXEC@ in udev rules *)
expand "@LIBEXEC@" libexecdir "scripts/vif.in" "scripts/vif";
expand "@LIBEXEC@" libexecdir "scripts/xen-backend.rules.in" "scripts/xen-backend.rules";
let configmllines =
[ "(* Warning - this file is autogenerated by the configure script *)";
"(* Do not edit *)";
Printf.sprintf "#define xen45 %d" (if xen45 then 1 else 0) (* cppo is a bit broken *)
] in
output_file config_ml configmllines
expand "@LIBEXEC@" libexecdir "scripts/xen-backend.rules.in" "scripts/xen-backend.rules"

let configure_t = Term.(pure configure $ bindir $ sbindir $ libexecdir $ qemu_wrapper_dir $ scriptsdir $ etcdir $ mandir $ optdir $ coverage)

Expand Down
5 changes: 0 additions & 5 deletions xl/README.md

This file was deleted.

100 changes: 0 additions & 100 deletions xl/cancel_utils.ml

This file was deleted.

70 changes: 0 additions & 70 deletions xl/cancel_utils_test.ml

This file was deleted.

0 comments on commit 203292e

Please sign in to comment.