[Xen-devel] [OSSTEST PATCH 1/2] mfi-common: break out xenbranch_supports_livepatch

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

No functional change.

Verified with standalone-generate-dump-flight-runvars.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 mfi-common | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/mfi-common b/mfi-common
index 30f2692d..b86febda 100644
--- a/mfi-common
+++ b/mfi-common
@@ -72,8 +72,8 @@ branch_wants_xtf_tests () {
   esac
 }
 
-branch_wants_livepatch () {
-  case "$branch" in
+xenbranch_supports_livepatch () {
+  case "$xenbranch" in
     xen-3.*)    return 1;;
     xen-4.0-testing)   return 1;;
     xen-4.1-testing)   return 1;;
@@ -83,6 +83,13 @@ branch_wants_livepatch () {
     xen-4.5-testing)   return 1;;
     xen-4.6-testing)   return 1;;
     xen-4.7-testing)   return 1;;
+    *)      return 0;;
+  esac
+}
+
+branch_wants_livepatch () {
+  if ! xenbranch_supports_livepatch; then return 1; fi
+  case "$branch" in
     xen-*)      return 0;;
     osstest*)   return 0;;
     *)          return 1;;
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel