From 1e1df21a94f486330bd4797fc589b1f6a5287e18 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 12 May 2023 01:02:09 +0200 Subject: [PATCH] Remove stale Xen support Fixes #4859 --- repos/base/run/log.run | 1 - repos/ports/run/lighttpd.run | 1 - tool/run/log/xen | 38 ------------------------------------ tool/run/power_off/xen | 3 --- tool/run/power_on/xen | 36 ---------------------------------- tool/run/xen.inc | 31 ----------------------------- 6 files changed, 110 deletions(-) delete mode 100644 tool/run/log/xen delete mode 100644 tool/run/power_off/xen delete mode 100644 tool/run/power_on/xen delete mode 100644 tool/run/xen.inc diff --git a/repos/base/run/log.run b/repos/base/run/log.run index 340c8fea9a..6b1f874cb5 100644 --- a/repos/base/run/log.run +++ b/repos/base/run/log.run @@ -23,7 +23,6 @@ install_config { build_boot_image [build_artifacts] append qemu_args "-nographic " -append xen_args { sdl="0" } run_genode_until "Test done.*\n" 20 diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run index b0325b8620..89462fab82 100644 --- a/repos/ports/run/lighttpd.run +++ b/repos/ports/run/lighttpd.run @@ -225,6 +225,5 @@ build_boot_image { } append qemu_args " -nographic " append_qemu_nic_args "hostfwd=tcp::5555-:80,hostfwd=tcp::5556-:443" -append xen_args { sdl=0\; vif=\["model=e1000,mac=02:00:00:00:01:01,bridge=xenbr0"\] } run_genode_until forever diff --git a/tool/run/log/xen b/tool/run/log/xen deleted file mode 100644 index cd926bbbba..0000000000 --- a/tool/run/log/xen +++ /dev/null @@ -1,38 +0,0 @@ -## -# Capture the output of a scenario executed via Xen -# - -source [genode_dir]/tool/run/log.inc -source [genode_dir]/tool/run/xen.inc - - -proc run_log { wait_for_re timeout_value } { - global xen_spawn_id - global output_spawn_id - - set output_spawn_id $xen_spawn_id - - set kernel_msg [run_boot_string] - - if {$wait_for_re == "forever"} { - set timeout -1 - } else { - set timeout $timeout_value - } - - expect { - -i $output_spawn_id $kernel_msg { } - eof { - puts stderr "Aborting, received EOF" - return false - } - timeout { - puts stderr "Boot process timed out" - close - return false - } - } - - wait_for_output $wait_for_re $timeout_value $xen_spawn_id - return true -} diff --git a/tool/run/power_off/xen b/tool/run/power_off/xen deleted file mode 100644 index 24e5dba839..0000000000 --- a/tool/run/power_off/xen +++ /dev/null @@ -1,3 +0,0 @@ -proc run_power_off { } { - catch { exec sudo xl destroy "genode-hvm" } -} diff --git a/tool/run/power_on/xen b/tool/run/power_on/xen deleted file mode 100644 index 5a9d0c7b4b..0000000000 --- a/tool/run/power_on/xen +++ /dev/null @@ -1,36 +0,0 @@ -## -# Reset the target machine or rather run the scenario as Xen DomU -# - -source [genode_dir]/tool/run/xen.inc - - -## -# Execute scenario using xl -# -proc run_power_on { } { - global xen_args - global xen_spawn_id - - # - # Back out on platforms w/o Xen support - # - if {![is_xen_available]} { return 0 } - - set xen_base_args { \ - builder="hvm"\; \ - name="genode-hvm"\; \ - cpus="1"\; \ - memory="512"\; \ - serial="pty"\; \ - sdl="1"\; \ - vnc="0"\; \ - disk=\["file:[run_dir].iso,hdc:cdrom,r"\]\; \ - boot="d"\; \ - } - - eval spawn sudo xl create -c /dev/null $xen_base_args $xen_args - set xen_spawn_id $spawn_id - - return true -} diff --git a/tool/run/xen.inc b/tool/run/xen.inc deleted file mode 100644 index f2f8b0a43b..0000000000 --- a/tool/run/xen.inc +++ /dev/null @@ -1,31 +0,0 @@ -set xen_spawn_id "" -set xen_args [get_cmd_arg --xen-args ""] - - -# -# Enable run scripts to extend 'xen_arg' via 'append' without bothering -# about the required whitespace in front of the custom arguments. -# -append xen_args " " - - -proc xen_args { } { - global xen_args - return $xen_args -} - - -## -# Check whether Xen support is available -# -# XXX should by removed in favor of [have_include "exec/xen"] -# -proc is_xen_available { } { - if {[have_spec linux]} { return false } - - if {![have_spec x86]} { - puts stderr "skipping execution because platform is not supported by Xen" - return false - } - return true -}