mfi-common: Rename $suite_runvars as $hostos_runvars

Later in the series more runvars to control the host install will be
added.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mfi-common b/mfi-common
index a70557302cd8c5b201ba54496bdcda293d2b2117..152ad589afb37b792149544a7b7afaa52f478895 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -80,7 +80,7 @@ create_build_jobs () {
 
   local arch
   local pvops_kernel pvops_kconfig_overrides
-  local suite suite_runvars
+  local suite hostos_runvars
   local want_xend build_defxend build_extraxend
   local enable_ovmf
   local build_hostflags
@@ -124,9 +124,9 @@ create_build_jobs () {
     esac
 
     if [ $suite != $defsuite ] ; then
-        suite_runvars="host_suite=$suite"
+        hostos_runvars="host_suite=$suite"
     else
-        suite_runvars=
+        hostos_runvars=
     fi
 
     # In 4.4 onwards xend is off by default. If necessary we build a
@@ -193,7 +193,7 @@ create_build_jobs () {
         tree_ovmf=$TREE_OVMF                                                 \
         tree_minios=$TREE_MINIOS                                             \
                 $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars     \
-                $suite_runvars                                               \
+                $hostos_runvars                                              \
                 host_hostflags=$build_hostflags                              \
                 revision_xen=$REVISION_XEN                                   \
                 revision_qemu=$REVISION_QEMU                                 \
@@ -216,7 +216,7 @@ create_build_jobs () {
                     enable_xsm=false                                         \
             tree_xen=$TREE_XEN                                               \
                     $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \
-                    $suite_runvars                                           \
+                    $hostos_runvars                                          \
                     host_hostflags=$build_hostflags                          \
                     revision_xen=$REVISION_PREVXEN
     fi
@@ -228,7 +228,7 @@ create_build_jobs () {
         tree_qemuu=$TREE_QEMU_UPSTREAM                                       \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars     \
-                $suite_runvars                                               \
+                $hostos_runvars                                              \
                 host_hostflags=$build_hostflags                              \
                 revision_xen=$REVISION_XEN                                   \
                 revision_qemu=$REVISION_QEMU                                 \
@@ -238,7 +238,7 @@ create_build_jobs () {
     job_create_build build-$arch-pvops build-kern                            \
                 arch=$arch kconfighow=xen-enable-xen-config                  \
                 $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars   \
-                $suite_runvars                                               \
+                $hostos_runvars                                              \
                 host_hostflags=$build_hostflags                              \
                 $pvops_kernel $pvops_kconfig_overrides                       \
                 ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX}             \
@@ -251,7 +251,7 @@ create_build_jobs () {
                 arch=$arch                                                   \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_LIBVIRT_RUNVARS $arch_runvars \
-                $suite_runvars                                               \
+                $hostos_runvars                                              \
                 host_hostflags=$build_hostflags                              \
                 buildjob=${bfi}build-$arch                                   \
                 tree_libvirt=$TREE_LIBVIRT revision_libvirt=$REVISION_LIBVIRT\
@@ -266,7 +266,7 @@ create_build_jobs () {
                 arch=$arch                                                   \
         tree_xen=$TREE_XEN                                                   \
                 $RUNVARS $BUILD_RUNVARS $BUILD_RUMPUSERXEN_RUNVARS $arch_runvars \
-                $suite_runvars                                               \
+                $hostos_runvars                                              \
                 host_hostflags=$build_hostflags                              \
                 buildjob=${bfi}build-$arch                                   \
                 tree_rumpuserxen=$TREE_RUMPUSERXEN                     \
@@ -295,7 +295,7 @@ create_build_jobs () {
                 arch=$arch kconfighow=create-config-sh                  \
                 kimagefile=vmlinux                                      \
                 $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS        \
-                $arch_runvars $suite_runvars                            \
+                $arch_runvars $hostos_runvars                           \
                 host_hostflags=$build_hostflags                         \
         tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg           \
         revision_linux=$REVISION_LINUX_OLD
@@ -357,6 +357,7 @@ usual_debianhvm_image () {
 # Provides various convenience variables for the callback.
 #
 test_matrix_iterate () {
+  local hostos_runvars
 
   case "$xenbranch" in
   xen-3.*-testing)      pairtoolstack=xend ;;
@@ -411,9 +412,9 @@ test_matrix_iterate () {
     esac
 
     if [ $suite != $defsuite ] ; then
-        suite_runvars="host_suite=$suite"
+        hostos_runvars="host_suite=$suite"
     else
-        suite_runvars=
+        hostos_runvars=
     fi
 
     for kern in ''; do
@@ -454,7 +455,7 @@ test_matrix_iterate () {
                   arch=$dom0arch                                  \
                   kernbuildjob=${bfi}build-$dom0arch-$kernbuild   \
                   kernkind=$kernkind                              \
-                  $arch_runvars $suite_runvars
+                  $arch_runvars $hostos_runvars
                   "
 
         test_matrix_do_one