Enabling FSI to remote Centaurs (SW107421 is fixed)

Change-Id: I2eaef856d94a4d84db729e1f9d1e9b5b0f8d0845
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/496
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 58 insertions, 57 deletions

diff --git a/src/usr/targeting/xmltohb/simics_VENICE.system.xml b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
index c62f6745f..c21de0b10 100644
--- a/src/usr/targeting/xmltohb/simics_VENICE.system.xml
+++ b/src/usr/targeting/xmltohb/simics_VENICE.system.xml
@@ -851,7 +851,8 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>MFSI</default>
+        <default>NO_MASTER</default>
+        <!-- @fixme : should be MFSI but support for alt-master is under Story 3853 -->
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -3837,7 +3838,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -3921,7 +3922,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4005,7 +4006,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4089,7 +4090,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4173,7 +4174,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4257,7 +4258,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4341,7 +4342,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4425,7 +4426,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4509,7 +4510,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4593,7 +4594,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4677,7 +4678,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4761,7 +4762,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4845,7 +4846,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -4929,7 +4930,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5013,7 +5014,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5097,7 +5098,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5181,7 +5182,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5265,7 +5266,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5349,7 +5350,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5433,7 +5434,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5517,7 +5518,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5601,7 +5602,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5685,7 +5686,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5769,7 +5770,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5853,7 +5854,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -5937,7 +5938,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6021,7 +6022,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6105,7 +6106,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6189,7 +6190,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6273,7 +6274,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6357,7 +6358,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6441,7 +6442,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6525,7 +6526,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6609,7 +6610,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6693,7 +6694,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6777,7 +6778,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6861,7 +6862,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -6945,7 +6946,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7029,7 +7030,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7113,7 +7114,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7197,7 +7198,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7281,7 +7282,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7365,7 +7366,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7449,7 +7450,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7533,7 +7534,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7617,7 +7618,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7701,7 +7702,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7785,7 +7786,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7869,7 +7870,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -7953,7 +7954,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8037,7 +8038,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8121,7 +8122,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8205,7 +8206,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8289,7 +8290,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8373,7 +8374,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>
@@ -8457,7 +8458,7 @@
     </attribute>
     <attribute>
         <id>FSI_MASTER_TYPE</id>
-        <default>NO_MASTER</default><!-- @fixme Simics is busted (SW107421), should be CMFSI -->
+        <default>CMFSI</default>
     </attribute>
     <attribute>
         <id>FSI_MASTER_PORT</id>