From 29f47aee84ded4c6e59da561c2e9b6257590b31d Mon Sep 17 00:00:00 2001
From: Dan Crowell <dcrowell@us.ibm.com>
Date: Thu, 2 Feb 2012 13:32:17 -0600
Subject: RTC 35711 - Wrapper for VPO-mode attribute check

The same code was in a dozen places so I added a wrapper function.

Change-Id: I5b1d34e0f94b91289960c73670199ff22f4c6860
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/643
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/usr/intr/test/intrtest.H | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

(limited to 'src/usr/intr/test')

diff --git a/src/usr/intr/test/intrtest.H b/src/usr/intr/test/intrtest.H
index 9c0d4e412..712e97a6e 100644
--- a/src/usr/intr/test/intrtest.H
+++ b/src/usr/intr/test/intrtest.H
@@ -29,6 +29,7 @@
 #include <errl/errlmanager.H>
 #include <kernel/console.H>
 #include <targeting/targetservice.H>
+#include <targeting/util.H>
 
 
 class IntrTest: public CxxTest::TestSuite
@@ -41,13 +42,7 @@ class IntrTest: public CxxTest::TestSuite
         {
 
             // TODO Temporaritly DISABLE in VBU until P8 support is added
-            TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-            syspath.addLast(TARGETING::TYPE_SYS,0);
-            TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-            uint8_t vpo_mode = 0;
-            if( sys
-                && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-                && (vpo_mode == 1) )
+            if( TARGETING::is_vpo() )
             {
                 return;
             }
@@ -114,13 +109,7 @@ class IntrTest: public CxxTest::TestSuite
         void test_enableDisable( void )
         {
             // TODO Temporaritly DISABLE in VBU until P8 support is added
-            TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-            syspath.addLast(TARGETING::TYPE_SYS,0);
-            TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-            uint8_t vpo_mode = 0;
-            if( sys
-                && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-                && (vpo_mode == 1) )
+            if( TARGETING::is_vpo() )
             {
                 return;
             }
@@ -167,13 +156,7 @@ class IntrTest: public CxxTest::TestSuite
             // TODO need to investigate.
 #ifdef __NOT_NOW__
             // TODO Temporaritly DISABLE in VBU until P8 support is added
-            TARGETING::EntityPath syspath(TARGETING::EntityPath::PATH_PHYSICAL);
-            syspath.addLast(TARGETING::TYPE_SYS,0);
-            TARGETING::Target* sys = TARGETING::targetService().toTarget(syspath);
-            uint8_t vpo_mode = 0;
-            if( sys
-                && sys->tryGetAttr<TARGETING::ATTR_IS_SIMULATION>(vpo_mode)
-                && (vpo_mode == 1) )
+            if( TARGETING::is_vpo() )
             {
                 return;
             }
-- 
cgit v1.2.1