* [OSSTEST PATCH v4 1/9] overlay: update overlay/etc/grub.d/20_linux_xen
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:10 ` Ian Campbell
2014-12-10 22:21 ` [OSSTEST PATCH v4 2/9] ts-xen-build-prep: install checkpolicy Wei Liu
` (8 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
This file was originally created to work around Debian bug #633127
("/etc/grub/20_linux does not recognise some old Xen kernels").
According to Debian bug tracker [0], #633127 bug is fixed in Wheezy. As
we're now using Wheezy in OSSTest we can safely remove the old overlay
file if there's no further bugs discovered.
However we have another bug #690538 ("grub-common: Please make submenu
creation optional or at least allow users to disable it easily") that
would break OSSTest. We're now using Wheezy in production. There's no
way to disable submenu in Wheezy. And submenu breaks OSSTest's grub menu
parser.
So update this overlay file to Wheezy's version and take care of Debian
bug #690538 by removing the lines to generate submenu.
Also work around GRUB bug #43420 ("20_linux_xen doesn't support Xen XSM
policy file") by applying a small patch proposed in [2].
Add a note to reference #633127 and #690538 above grub2 setup function.
0: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633127
1: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690538
2: https://savannah.gnu.org/bugs/?43420
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
---
Osstest/Debian.pm | 5 ++
overlay/etc/grub.d/20_linux_xen | 117 +++++++++++++++++++++++++++++++--------
2 files changed, 98 insertions(+), 24 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index c8db601..c446e8b 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -274,6 +274,11 @@ sub setupboot_grub1 ($$$) {
return $bl;
}
+# Note on running OSSTest on Squeeze with old Xen kernel: check out
+# Debian bug #633127 "/etc/grub/20_linux does not recognise some old
+# Xen kernels"
+# Currently setupboot_grub2 relies on Grub menu not having submenu.
+# Check Debian bug #690538.
sub setupboot_grub2 ($$$) {
my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
my $bl= { };
diff --git a/overlay/etc/grub.d/20_linux_xen b/overlay/etc/grub.d/20_linux_xen
index 99854d2..001b76d 100755
--- a/overlay/etc/grub.d/20_linux_xen
+++ b/overlay/etc/grub.d/20_linux_xen
@@ -1,7 +1,7 @@
#! /bin/sh
-# Copied from the identically named file in grub-common 1.98+20100804-14
-# i386. This version fixes #633127 (and has the patch I proposed there).
+# Copied from the identical named file in grub-common 1.99-27+deb7u2.
+# This version fixed Debian bug #690538 and GRUB bug #43420.
set -e
@@ -21,14 +21,14 @@ set -e
# You should have received a copy of the GNU General Public License
# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
-prefix=/usr
-exec_prefix=${prefix}
-bindir=${exec_prefix}/bin
-libdir=${exec_prefix}/lib
-. ${libdir}/grub/grub-mkconfig_lib
+prefix="/usr"
+exec_prefix="${prefix}"
+datarootdir="${prefix}/share"
+
+. "${datarootdir}/grub/grub-mkconfig_lib"
export TEXTDOMAIN=grub
-export TEXTDOMAINDIR=${prefix}/share/locale
+export TEXTDOMAINDIR="${datarootdir}/locale"
CLASS="--class gnu-linux --class gnu --class os --class xen"
@@ -36,7 +36,7 @@ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but
@@ -44,6 +44,11 @@ fi
case ${GRUB_DEVICE} in
/dev/loop/*|/dev/loop[0-9])
GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+ # We can't cope with devices loop-mounted from files here.
+ case ${GRUB_DEVICE} in
+ /dev/*) ;;
+ *) exit 0 ;;
+ esac
;;
esac
@@ -55,6 +60,23 @@ else
LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
fi
+# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT.
+if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}"
+fi
+if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then
+ GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}"
+fi
+
+if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ] \
+ || [ "x`stat -f --printf=%T /`" = xbtrfs ]; then
+ rootsubvol="`make_system_path_relative_to_its_root /`"
+ rootsubvol="${rootsubvol#/}"
+ if [ "x${rootsubvol}" != x ]; then
+ GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
+ fi
+fi
+
linux_entry ()
{
os="$1"
@@ -63,22 +85,43 @@ linux_entry ()
recovery="$4"
args="$5"
xen_args="$6"
- if ${recovery} ; then
- title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
+ xsm="$7"
+ # If user wants to enable XSM support, make sure there's
+ # corresponding policy file.
+ if ${xsm} ; then
+ xenpolicy=`echo xenpolicy-$xen_version`
+ if test ! -e "${xen_dirname}/${xenpolicy}" ; then
+ return
+ fi
+ xen_args=`echo $xen_args flask_enabled=1 flask_enforcing=1`
+ if ${recovery} ; then
+ title="$(gettext_quoted "%s, with Xen %s (XSM enabled) and Linux %s (recovery mode)")"
+ else
+ title="$(gettext_quoted "%s, with Xen %s (XSM enabled) and Linux %s")"
+ fi
else
- title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
+ xenpolicy=""
+ if ${recovery} ; then
+ title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
+ else
+ title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
+ fi
+ fi
+ printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
+ if ! ${recovery} ; then
+ save_default_entry | sed -e "s/^/\t/"
fi
- printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
- save_default_entry | sed -e "s/^/\t/"
if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
fi
printf '%s\n' "${prepare_boot_cache}"
- message="$(gettext_printf "Loading Linux %s ..." ${version})"
+ xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
+ lmessage="$(gettext_printf "Loading Linux %s ..." ${version})"
cat << EOF
- echo '$message'
+ echo '$xmessage'
multiboot ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args}
+ echo '$lmessage'
module ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args}
EOF
if test -n "${initrd}" ; then
@@ -88,17 +131,37 @@ EOF
module ${rel_dirname}/${initrd}
EOF
fi
+ if test -n "${xenpolicy}" ; then
+ message="$(gettext_printf "Loading XSM policy ...")"
+ cat << EOF
+ echo '$message'
+ module ${rel_dirname}/${xenpolicy}
+EOF
+ fi
cat << EOF
}
EOF
}
-linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
+ if grub_file_is_not_garbage "$i"; then
basename=$(basename $i)
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
- if grub_file_is_not_garbage "$i" && grep -qx 'CONFIG_XEN_\(DOM0\|PRIVILEGED_GUEST\)=y' /boot/config-${version} 2> /dev/null ; then echo -n "$i " ; fi
- done`
-xen_list=`for i in /boot/xen*; do
+ dirname=$(dirname $i)
+ config=
+ for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
+ if test -e "${j}" ; then
+ config="${j}"
+ break
+ fi
+ done
+ if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null); then echo -n "$i " ; fi
+ fi
+ done`
+if [ "x${linux_list}" = "x" ] ; then
+ exit 0
+fi
+xen_list=`for i in /boot/xen[-.]*; do
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
done`
prepare_boot_cache=
@@ -123,7 +186,9 @@ while [ "x${xen_list}" != "x" ] ; do
initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" \
"initrd-${version}" "initrd.img-${alt_version}" \
- "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+ "initrd-${alt_version}.img" "initrd-${alt_version}" \
+ "initramfs-genkernel-${version}" \
+ "initramfs-genkernel-${alt_version}" ; do
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
@@ -137,10 +202,14 @@ while [ "x${xen_list}" != "x" ] ; do
fi
linux_entry "${OS}" "${version}" "${xen_version}" false \
- "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
- if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" false
+ linux_entry "${OS}" "${version}" "${xen_version}" false \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" true
+ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+ linux_entry "${OS}" "${version}" "${xen_version}" true \
+ "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" false
linux_entry "${OS}" "${version}" "${xen_version}" true \
- "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}"
+ "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" true
fi
list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 1/9] overlay: update overlay/etc/grub.d/20_linux_xen
2014-12-10 22:21 ` [OSSTEST PATCH v4 1/9] overlay: update overlay/etc/grub.d/20_linux_xen Wei Liu
@ 2015-02-02 13:10 ` Ian Campbell
0 siblings, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 13:10 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> This file was originally created to work around Debian bug #633127
> ("/etc/grub/20_linux does not recognise some old Xen kernels").
>
> According to Debian bug tracker [0], #633127 bug is fixed in Wheezy. As
> we're now using Wheezy in OSSTest we can safely remove the old overlay
> file if there's no further bugs discovered.
>
> However we have another bug #690538 ("grub-common: Please make submenu
> creation optional or at least allow users to disable it easily") that
> would break OSSTest. We're now using Wheezy in production. There's no
> way to disable submenu in Wheezy. And submenu breaks OSSTest's grub menu
> parser.
>
> So update this overlay file to Wheezy's version and take care of Debian
> bug #690538 by removing the lines to generate submenu.
>
> Also work around GRUB bug #43420 ("20_linux_xen doesn't support Xen XSM
> policy file") by applying a small patch proposed in [2].
>
> Add a note to reference #633127 and #690538 above grub2 setup function.
>
> 0: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=633127
> 1: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690538
> 2: https://savannah.gnu.org/bugs/?43420
>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [OSSTEST PATCH v4 2/9] ts-xen-build-prep: install checkpolicy
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 1/9] overlay: update overlay/etc/grub.d/20_linux_xen Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested Wei Liu
` (7 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
This is used to complie Flask policy.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
ts-xen-build-prep | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ts-xen-build-prep b/ts-xen-build-prep
index a7d0d03..4b016ae 100755
--- a/ts-xen-build-prep
+++ b/ts-xen-build-prep
@@ -178,7 +178,7 @@ sub prep () {
autoconf automake libtool xsltproc
libxml2-utils libxml2-dev libnl-dev
libdevmapper-dev w3c-dtd-xhtml libxml-xpath-perl
- ccache));
+ ccache checkpolicy));
target_cmd_root($ho, "chmod -R a+r /usr/share/git-core/templates");
# workaround for Debian #595728
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 1/9] overlay: update overlay/etc/grub.d/20_linux_xen Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 2/9] ts-xen-build-prep: install checkpolicy Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:14 ` Ian Campbell
2014-12-10 22:21 ` [OSSTEST PATCH v4 4/9] mfi-common: create build-$arch-xsm job Wei Liu
` (6 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Changes in v4:
1. Use "true" instead of "y"
---
ts-xen-build | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/ts-xen-build b/ts-xen-build
index 661f186..9ee4522 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -27,6 +27,8 @@ tsreadconfig();
selectbuildhost(\@ARGV);
# remaining arguments are passed as targets to "make"
builddirsprops();
+
+my $enable_xsm = $r{enable_xsm} =~ m/true/ ? 1 : 0;
sub checkout () {
prepbuilddirs();
@@ -34,6 +36,7 @@ sub checkout () {
build_clone($ho, 'xen', $builddir, 'xen');
my $debug_build = $r{xen_build_debug} || 'y';
+ my $build_xsm = $enable_xsm ? 'y' : 'n';
# Do not set this unless you know what you are doing. This arm
# option makes the build specific to a particular type of
@@ -47,6 +50,7 @@ sub checkout () {
cd $builddir/xen
>.config
echo >>.config debug=$debug_build
+ echo >>.config XSM_ENABLE=$build_xsm
echo >>.config GIT_HTTP=y
echo >>.config LIBLEAFDIR_x86_64=lib
echo >>.config QEMU_REMOTE='$r{tree_qemu}'
@@ -114,6 +118,14 @@ END
buildcmd_stamped_logged(9000, 'build', '',<<END,'');
$make_prefix make $makeflags @ARGV
END
+
+ if ($enable_xsm) {
+ my $xen_version = target_cmd_output_root($ho, <<END, 30);
+ cd $builddir/xen
+ $make_prefix make xenversion
+END
+ store_runvar("flaskpolicy", "xenpolicy-" . $xen_version);
+ }
}
sub collectversions () {
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested
2014-12-10 22:21 ` [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested Wei Liu
@ 2015-02-02 13:14 ` Ian Campbell
2015-02-02 14:30 ` Wei Liu
0 siblings, 1 reply; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 13:14 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Inconsistent whitespace in the final hunk, but:
Acked-by: Ian Campbell <ian.campbell@citrix.com>
This will override the default XSM_ENABLE always, even if no runvar is
present, I guess we think that is correct?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested
2015-02-02 13:14 ` Ian Campbell
@ 2015-02-02 14:30 ` Wei Liu
2015-02-02 14:51 ` Ian Campbell
0 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2015-02-02 14:30 UTC (permalink / raw)
To: Ian Campbell; +Cc: ian.jackson, Wei Liu, xen-devel
On Mon, Feb 02, 2015 at 01:14:34PM +0000, Ian Campbell wrote:
> On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>
> Inconsistent whitespace in the final hunk, but:
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> This will override the default XSM_ENABLE always, even if no runvar is
> present, I guess we think that is correct?
>
I'm not sure what's correct. I originally treated it as the same as
debug=. But now since there is doubt about what is the correct behaviour
I will make it only set XSM_ENABLE when runvar is set in next version.
Wei.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested
2015-02-02 14:30 ` Wei Liu
@ 2015-02-02 14:51 ` Ian Campbell
0 siblings, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 14:51 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Mon, 2015-02-02 at 14:30 +0000, Wei Liu wrote:
> On Mon, Feb 02, 2015 at 01:14:34PM +0000, Ian Campbell wrote:
> > On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> >
> > Inconsistent whitespace in the final hunk, but:
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> >
> > This will override the default XSM_ENABLE always, even if no runvar is
> > present, I guess we think that is correct?
> >
>
> I'm not sure what's correct. I originally treated it as the same as
> debug=. But now since there is doubt about what is the correct behaviour
> I will make it only set XSM_ENABLE when runvar is set in next version.
That's probably going to have the least potential to be problematic in
the future.
Ian.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [OSSTEST PATCH v4 4/9] mfi-common: create build-$arch-xsm job
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (2 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 3/9] ts-xen-build: build with XSM support if requested Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:16 ` Ian Campbell
2014-12-10 22:21 ` [OSSTEST PATCH v4 5/9] Debian.pm: pass in XSM configuration to bootloader setup routines Wei Liu
` (5 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Changes in v4:
1. Use "true" and "false" instead of "y" and "n".
2. Rename xenbranch_wants_xsm_tests to xenbranch_xsm_variants.
---
mfi-common | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/mfi-common b/mfi-common
index 5c4f5d5..161847c 100644
--- a/mfi-common
+++ b/mfi-common
@@ -41,6 +41,19 @@ branch_wants_rumpkernel_tests () {
esac
}
+xenbranch_xsm_variants () {
+ # Test XSM from 4.5 onwards
+ case "$xenbranch" in
+ xen-3.*-testing) echo "false";;
+ xen-4.0-testing) echo "false";;
+ xen-4.1-testing) echo "false";;
+ xen-4.2-testing) echo "false";;
+ xen-4.3-testing) echo "false";;
+ xen-4.4-testing) echo "false";;
+ *) echo "false true";
+ esac
+}
+
create_build_jobs () {
local arch
@@ -139,8 +152,15 @@ create_build_jobs () {
build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build
- ./cs-job-create $flight build-$arch build \
+ for enable_xsm in $(xenbranch_xsm_variants) ; do
+ if [ x$enable_xsm = xtrue ] ; then
+ xsm_suffix="-xsm"
+ else
+ xsm_suffix=""
+ fi
+ ./cs-job-create $flight build-$arch$xsm_suffix build \
arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf\
+ enable_xsm=$enable_xsm \
tree_qemu=$TREE_QEMU \
tree_qemuu=$TREE_QEMU_UPSTREAM \
tree_xen=$TREE_XEN \
@@ -152,6 +172,7 @@ create_build_jobs () {
revision_qemu=$REVISION_QEMU \
revision_qemuu=$REVISION_QEMU_UPSTREAM \
revision_seabios=$REVISION_SEABIOS
+ done
if [ $build_extraxend = "true" ] ; then
./cs-job-create $flight build-$arch-xend build \
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [OSSTEST PATCH v4 5/9] Debian.pm: pass in XSM configuration to bootloader setup routines
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (3 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 4/9] mfi-common: create build-$arch-xsm job Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 6/9] Debian.pm: load flask policy in uboot Wei Liu
` (4 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Change to Uboot will come in another patch. GRUB 1 is ignored, as
currently OSSTest only has Wheezy which has GRUB 2.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Changes in v4:
1. Modify callsite of debian_boot_setup to avoid regression.
---
Osstest/Debian.pm | 32 +++++++++++++++++++++-----------
ts-xen-install | 2 +-
2 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index c446e8b..22b40ff 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -45,9 +45,9 @@ BEGIN {
#---------- manipulation of Debian bootloader setup ----------
-sub debian_boot_setup ($$$$;$) {
+sub debian_boot_setup ($$$$$;$) {
# $xenhopt==undef => is actually a guest, do not set up a hypervisor
- my ($ho, $want_kernver, $xenhopt, $distpath, $hooks) = @_;
+ my ($ho, $want_kernver, $want_xsm, $xenhopt, $distpath, $hooks) = @_;
target_kernkind_check($ho);
target_kernkind_console_inittab($ho,$ho,"/");
@@ -72,11 +72,11 @@ sub debian_boot_setup ($$$$;$) {
my $bootloader;
if ( $ho->{Flags}{'need-uboot-bootscr'} ) {
- $bootloader= setupboot_uboot($ho, $want_kernver, $xenhopt, $kopt);
+ $bootloader= setupboot_uboot($ho, $want_kernver, $want_xsm, $xenhopt, $kopt);
} elsif ($ho->{Suite} =~ m/lenny/) {
- $bootloader= setupboot_grub1($ho, $want_kernver, $xenhopt, $kopt);
+ $bootloader= setupboot_grub1($ho, $want_kernver, $want_xsm, $xenhopt, $kopt);
} else {
- $bootloader= setupboot_grub2($ho, $want_kernver, $xenhopt, $kopt);
+ $bootloader= setupboot_grub2($ho, $want_kernver, $want_xsm, $xenhopt, $kopt);
}
$bootloader->{UpdateConfig}($ho);
@@ -112,8 +112,8 @@ sub bl_getmenu_open ($$$) {
return $f;
}
-sub setupboot_uboot ($$$) {
- my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
+sub setupboot_uboot ($$$$) {
+ my ($ho,$want_kernver,$want_xsm,$xenhopt,$xenkopt) = @_;
my $bl= { };
$bl->{UpdateConfig}= sub {
@@ -194,13 +194,17 @@ END
return $bl;
}
-sub setupboot_grub1 ($$$) {
- my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
+sub setupboot_grub1 ($$$$) {
+ my ($ho,$want_kernver,$want_xsm,$xenhopt,$xenkopt) = @_;
my $bl= { };
my $rmenu= "/boot/grub/menu.lst";
my $lmenu= "$stash/$ho->{Name}--menu.lst.out";
+ if ($want_xsm) {
+ die "Enabling XSM with GRUB is not supported";
+ }
+
target_editfile_root($ho, $rmenu, sub {
while (<::EI>) {
if (m/^## ## Start Default/ ..
@@ -279,8 +283,8 @@ sub setupboot_grub1 ($$$) {
# Xen kernels"
# Currently setupboot_grub2 relies on Grub menu not having submenu.
# Check Debian bug #690538.
-sub setupboot_grub2 ($$$) {
- my ($ho,$want_kernver,$xenhopt,$xenkopt) = @_;
+sub setupboot_grub2 ($$$$) {
+ my ($ho,$want_kernver,$want_xsm,$xenhopt,$xenkopt) = @_;
my $bl= { };
my $rmenu= '/boot/grub/grub.cfg';
@@ -307,6 +311,9 @@ sub setupboot_grub2 ($$$) {
$entry->{KernVer} ne $want_kernver) {
logm("(skipping entry at $entry->{StartLine};".
" kernel $entry->{KernVer}, not $want_kernver)");
+ } elsif ($want_xsm && !defined $entry->{Xenpolicy}) {
+ logm("(skipping entry at $entry->{StartLine};".
+ " XSM policy file not present)");
} else {
# yes!
last;
@@ -339,6 +346,9 @@ sub setupboot_grub2 ($$$) {
if (m/^\s*module\s*\/(initrd\S+)/) {
$entry->{Initrd}= $1;
}
+ if (m/^\s*module\s*\/(xenpolicy\S+)/) {
+ $entry->{Xenpolicy}= $1;
+ }
}
die 'grub 2 bootloader entry not found' unless $entry;
diff --git a/ts-xen-install b/ts-xen-install
index 4d34d1f..910181e 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -171,7 +171,7 @@ sub setupboot () {
}
my $want_kernver = get_runvar('kernel_ver',$r{'kernbuildjob'});
- debian_boot_setup($ho, $want_kernver, $xenhopt, \%distpath, \@hooks);
+ debian_boot_setup($ho, $want_kernver, 0, $xenhopt, \%distpath, \@hooks);
logm("ready to boot Xen");
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [OSSTEST PATCH v4 6/9] Debian.pm: load flask policy in uboot
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (4 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 5/9] Debian.pm: pass in XSM configuration to bootloader setup routines Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2014-12-10 22:21 ` [OSSTEST PATCH v4 7/9] ts-xen-install: install Xen with XSM support if requested Wei Liu
` (3 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
Osstest/Debian.pm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 22b40ff..08f0ad1 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -123,6 +123,22 @@ sub setupboot_uboot ($$$$) {
my $kern = "vmlinuz-$want_kernver";
my $initrd = "initrd.img-$want_kernver";
+ my $flask_commands = "";
+ if ($want_xsm) {
+ my $flaskpolicy = $r{flaskpolicy};
+ $flask_commands = <<END;
+
+setenv flask_policy_addr_r 0x1200000
+flaskpolicy=`readlink /boot/$flaskpolicy`
+ext2load scsi 0 \\\${flask_policy_addr_r} \$flaskpolicy
+fdt mknod /chosen module\@2
+fdt set /chosen/module\@2 compatible "xen,xsm-policy"
+fdt set /chosen/module\@2 reg <\\\${flask_policy_addr_r} \\\${filesize}>
+echo Loaded $flaskpolicy to \\\${flask_policy_addr_r} (\\\${filesize})
+
+END
+ }
+
my $root= target_guest_lv_name($ho,"root");
logm("Xen options: $xenhopt");
@@ -176,6 +192,8 @@ fdt set /chosen/module\@1 compatible "xen,linux-initrd" "xen,multiboot-module"
fdt set /chosen/module\@1 reg <\\\${ramdisk_addr_r} \\\${filesize}>
echo Loaded $initrd to \\\${ramdisk_addr_r} (\\\${filesize})
+${flask_commands}
+
fdt print /chosen
echo Booting \\\${xen_addr_r} - \\\${fdt_addr}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [OSSTEST PATCH v4 7/9] ts-xen-install: install Xen with XSM support if requested
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (5 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 6/9] Debian.pm: load flask policy in uboot Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:17 ` Ian Campbell
2014-12-10 22:21 ` [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests Wei Liu
` (2 subsequent siblings)
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Changes in v4:
1. Use "true" instead of "y"
---
ts-xen-install | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ts-xen-install b/ts-xen-install
index 910181e..08b5fe1 100755
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -46,6 +46,8 @@ if (@ARGV and $ARGV[0] eq '--check') {
our $ho;
+my $enable_xsm = $r{enable_xsm} =~ m/true/ ? 1 : 0;
+
my %distpath;
sub packages () {
@@ -171,7 +173,7 @@ sub setupboot () {
}
my $want_kernver = get_runvar('kernel_ver',$r{'kernbuildjob'});
- debian_boot_setup($ho, $want_kernver, 0, $xenhopt, \%distpath, \@hooks);
+ debian_boot_setup($ho, $want_kernver, $enable_xsm, $xenhopt, \%distpath, \@hooks);
logm("ready to boot Xen");
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (6 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 7/9] ts-xen-install: install Xen with XSM support if requested Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:18 ` Ian Campbell
2014-12-10 22:21 ` [OSSTEST PATCH v4 9/9] mfi-common, make-flight: create XSM test jobs Wei Liu
2015-02-02 13:22 ` [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Ian Campbell
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
make-flight | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git a/make-flight b/make-flight
index 9963a46..35904be 100755
--- a/make-flight
+++ b/make-flight
@@ -281,17 +281,24 @@ do_passthrough_tests () {
done
}
-test_matrix_do_one () {
-
- # Basic PV Linux test with xl
+do_pv_debian_test_one () {
+ toolstack=$1
- job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
+ job_create_test test-$xenarch$kern-$dom0arch-$toolstack test-debian $toolstack \
$xenarch $dom0arch \
$debian_runvars all_hostflags=$most_hostflags
+}
- job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
- $xenarch $dom0arch \
- $debian_runvars all_hostflags=$most_hostflags
+do_pv_debian_tests () {
+ for toolstack in xl libvirt; do
+ do_pv_debian_test_one $toolstack
+ done
+}
+
+test_matrix_do_one () {
+
+ # Basic PV Linux test with xl
+ do_pv_debian_tests
# No further arm tests at the moment
if [ $dom0arch = armhf ]; then
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests
2014-12-10 22:21 ` [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests Wei Liu
@ 2015-02-02 13:18 ` Ian Campbell
2015-02-02 13:23 ` Ian Campbell
2015-02-02 16:14 ` Wei Liu
0 siblings, 2 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 13:18 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> make-flight | 21 ++++++++++++++-------
> 1 file changed, 14 insertions(+), 7 deletions(-)
>
> diff --git a/make-flight b/make-flight
> index 9963a46..35904be 100755
> --- a/make-flight
> +++ b/make-flight
> @@ -281,17 +281,24 @@ do_passthrough_tests () {
> done
> }
>
> -test_matrix_do_one () {
> -
> - # Basic PV Linux test with xl
> +do_pv_debian_test_one () {
> + toolstack=$1
>
> - job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
> + job_create_test test-$xenarch$kern-$dom0arch-$toolstack test-debian $toolstack \
> $xenarch $dom0arch \
> $debian_runvars all_hostflags=$most_hostflags
> +}
>
> - job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
> - $xenarch $dom0arch \
> - $debian_runvars all_hostflags=$most_hostflags
> +do_pv_debian_tests () {
> + for toolstack in xl libvirt; do
> + do_pv_debian_test_one $toolstack
> + done
> +}
> +
> +test_matrix_do_one () {
> +
> + # Basic PV Linux test with xl
This comment isn't true, since libvirt is included too.
Did you confirm no changes to runvars after this change? If so then
please say so in the commit log, then:
Acked-by: Ian Campbell <ian.campbell@citrix.com>
> + do_pv_debian_tests
>
> # No further arm tests at the moment
> if [ $dom0arch = armhf ]; then
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests
2015-02-02 13:18 ` Ian Campbell
@ 2015-02-02 13:23 ` Ian Campbell
2015-02-02 16:14 ` Wei Liu
1 sibling, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 13:23 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Mon, 2015-02-02 at 13:18 +0000, Ian Campbell wrote:
> On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > make-flight | 21 ++++++++++++++-------
> > 1 file changed, 14 insertions(+), 7 deletions(-)
> >
> > diff --git a/make-flight b/make-flight
> > index 9963a46..35904be 100755
> > --- a/make-flight
> > +++ b/make-flight
> > @@ -281,17 +281,24 @@ do_passthrough_tests () {
> > done
> > }
> >
> > -test_matrix_do_one () {
> > -
> > - # Basic PV Linux test with xl
> > +do_pv_debian_test_one () {
> > + toolstack=$1
> >
> > - job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
> > + job_create_test test-$xenarch$kern-$dom0arch-$toolstack test-debian $toolstack \
> > $xenarch $dom0arch \
> > $debian_runvars all_hostflags=$most_hostflags
> > +}
> >
> > - job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
> > - $xenarch $dom0arch \
> > - $debian_runvars all_hostflags=$most_hostflags
> > +do_pv_debian_tests () {
> > + for toolstack in xl libvirt; do
> > + do_pv_debian_test_one $toolstack
> > + done
> > +}
> > +
> > +test_matrix_do_one () {
> > +
> > + # Basic PV Linux test with xl
>
> This comment isn't true, since libvirt is included too.
>
> Did you confirm no changes to runvars after this change? If so then
> please say so in the commit log,
I just saw the diff in 0/9 which didn't imply any changes due to this
patch. Still useful to explicitly state that in the commit log though I
guess.
> then:
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> > + do_pv_debian_tests
> >
> > # No further arm tests at the moment
> > if [ $dom0arch = armhf ]; then
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests
2015-02-02 13:18 ` Ian Campbell
2015-02-02 13:23 ` Ian Campbell
@ 2015-02-02 16:14 ` Wei Liu
1 sibling, 0 replies; 21+ messages in thread
From: Wei Liu @ 2015-02-02 16:14 UTC (permalink / raw)
To: Ian Campbell; +Cc: ian.jackson, Wei Liu, xen-devel
On Mon, Feb 02, 2015 at 01:18:48PM +0000, Ian Campbell wrote:
> On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > make-flight | 21 ++++++++++++++-------
> > 1 file changed, 14 insertions(+), 7 deletions(-)
> >
> > diff --git a/make-flight b/make-flight
> > index 9963a46..35904be 100755
> > --- a/make-flight
> > +++ b/make-flight
> > @@ -281,17 +281,24 @@ do_passthrough_tests () {
> > done
> > }
> >
> > -test_matrix_do_one () {
> > -
> > - # Basic PV Linux test with xl
> > +do_pv_debian_test_one () {
> > + toolstack=$1
> >
> > - job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \
> > + job_create_test test-$xenarch$kern-$dom0arch-$toolstack test-debian $toolstack \
> > $xenarch $dom0arch \
> > $debian_runvars all_hostflags=$most_hostflags
> > +}
> >
> > - job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \
> > - $xenarch $dom0arch \
> > - $debian_runvars all_hostflags=$most_hostflags
> > +do_pv_debian_tests () {
> > + for toolstack in xl libvirt; do
> > + do_pv_debian_test_one $toolstack
> > + done
> > +}
> > +
> > +test_matrix_do_one () {
> > +
> > + # Basic PV Linux test with xl
>
> This comment isn't true, since libvirt is included too.
>
> Did you confirm no changes to runvars after this change? If so then
> please say so in the commit log, then:
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
In light of your change to the same site to add arm platform support I
will just drop this patch.
Wei.
> > + do_pv_debian_tests
> >
> > # No further arm tests at the moment
> > if [ $dom0arch = armhf ]; then
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* [OSSTEST PATCH v4 9/9] mfi-common, make-flight: create XSM test jobs
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (7 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 8/9] make-flight: factor out do_pv_debian_tests Wei Liu
@ 2014-12-10 22:21 ` Wei Liu
2015-02-02 13:20 ` Ian Campbell
2015-02-02 13:22 ` [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Ian Campbell
9 siblings, 1 reply; 21+ messages in thread
From: Wei Liu @ 2014-12-10 22:21 UTC (permalink / raw)
To: xen-devel; +Cc: Wei Liu, ian.jackson, ian.campbell
Duplicate Debian PV and HVM test jobs for XSM testing.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
Changes in v4:
1. Parse runvar to determine xsm suffix
---
make-flight | 23 +++++++++++++++++++----
mfi-common | 12 ++++++++++--
2 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/make-flight b/make-flight
index 35904be..00bc0fc 100755
--- a/make-flight
+++ b/make-flight
@@ -200,27 +200,36 @@ do_hvm_win7_x64_tests () {
do_hvm_debian_test_one () {
testname=$1
bios=$2
+ xsm=$3
+
job_create_test test-$xenarch$kern-$dom0arch-xl$qemuu_suffix-$testname-amd64\
test-debianhvm xl $xenarch $dom0arch $qemuu_runvar \
+ enable_xsm=$xsm \
debianhvm_image=debian-7.2.0-amd64-CD-1.iso \
bios=$bios \
all_hostflags=$most_hostflags,hvm
}
do_hvm_debian_tests() {
+ test_xsm=$(xenbranch_xsm_variants)
+
if [ $xenarch != amd64 ]; then
return
fi
# QEMU upstream supports ovmf and seabios
if [ "x$qemuu_suffix" == "x-qemuu" ]; then
- do_hvm_debian_test_one ovmf ovmf
- do_hvm_debian_test_one debianhvm seabios
+ do_hvm_debian_test_one ovmf ovmf false
+ for xsm in $test_xsm ; do
+ do_hvm_debian_test_one debianhvm seabios $xsm
+ done
fi
# QEMU traditional supports rombios
if [ "x$qemuu_suffix" == "x-qemut" ]; then
- do_hvm_debian_test_one debianhvm rombios
+ for xsm in $test_xsm ; do
+ do_hvm_debian_test_one debianhvm rombios $xsm
+ done
fi
}
@@ -283,15 +292,21 @@ do_passthrough_tests () {
do_pv_debian_test_one () {
toolstack=$1
+ xsm=$2
job_create_test test-$xenarch$kern-$dom0arch-$toolstack test-debian $toolstack \
$xenarch $dom0arch \
+ enable_xsm=$xsm \
$debian_runvars all_hostflags=$most_hostflags
}
do_pv_debian_tests () {
+ test_xsm=$(xenbranch_xsm_variants)
+
for toolstack in xl libvirt; do
- do_pv_debian_test_one $toolstack
+ for xsm in $test_xsm ; do
+ do_pv_debian_test_one $toolstack $xsm
+ done
done
}
diff --git a/mfi-common b/mfi-common
index 161847c..3a97a90 100644
--- a/mfi-common
+++ b/mfi-common
@@ -268,8 +268,16 @@ job_create_test () {
local xenarch=$1; shift
local dom0arch=$1; shift
- xenbuildjob="${bfi}build-$xenarch"
- buildjob="${bfi}build-$dom0arch"
+ xsm_suffix=""
+ for rv in $@ ; do
+ case $rv in
+ enable_xsm=true) xsm_suffix="-xsm";;
+ esac
+ done
+
+ job="$job$xsm_suffix"
+ xenbuildjob="${bfi}build-$xenarch$xsm_suffix"
+ buildjob="${bfi}build-$dom0arch$xsm_suffix"
tsbuildjob=
case "$xenbranch:$toolstack" in
--
1.7.10.4
^ permalink raw reply related [flat|nested] 21+ messages in thread* Re: [OSSTEST PATCH v4 0/9] XSM test case for OSSTest
2014-12-10 22:21 [OSSTEST PATCH v4 0/9] XSM test case for OSSTest Wei Liu
` (8 preceding siblings ...)
2014-12-10 22:21 ` [OSSTEST PATCH v4 9/9] mfi-common, make-flight: create XSM test jobs Wei Liu
@ 2015-02-02 13:22 ` Ian Campbell
9 siblings, 0 replies; 21+ messages in thread
From: Ian Campbell @ 2015-02-02 13:22 UTC (permalink / raw)
To: Wei Liu; +Cc: ian.jackson, xen-devel
On Wed, 2014-12-10 at 22:21 +0000, Wei Liu wrote:
> Hi all
>
> This patch series attempts to duplicate some Debian test cases for XSM. This
> is version 4 of this series.
Apart from any rebasing issues relating to its age I think this series
looks good.
^ permalink raw reply [flat|nested] 21+ messages in thread