Menu
▾
▴
[Powerpc-utils-devel] [PATCH v2] PowerKVM is a distro, not a platform
|
From: Dinar v. <k0...@op...> - 2015-06-05 11:42:30
|
From: Dinar Valeev <dv...@su...>
Name OPAL platform correctly.. Bare metal systems are not
PowerKVM (which is IBM distro), but PowerNV.
Signed-off-by: Dinar Valeev <dv...@su...>
---
scripts/ofpathname | 2 +-
scripts/pseries_platform | 8 ++++----
scripts/rtas_dump | 2 +-
scripts/snap | 2 +-
scripts/update_flash | 2 +-
src/common/pseries_platform.c | 6 +++---
src/common/pseries_platform.h | 2 +-
src/drmgr/drmgr.c | 2 +-
src/drmgr/lsslot.c | 2 +-
src/rtas_event_decode.c | 2 +-
src/set_poweron_time.c | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/scripts/ofpathname b/scripts/ofpathname
index 97032bb..e64b31d 100755
--- a/scripts/ofpathname
+++ b/scripts/ofpathname
@@ -1471,7 +1471,7 @@ of2l_fc()
# Main
#
. $PSERIES_PLATFORM
-if [[ $platform = $PLATFORM_POWERKVM_HOST ]]; then
+if [[ $platform = $PLATFORM_POWERNV ]]; then
echo "$OFPATHNAME: is not supported on the $platform_name platform"
exit 1
fi
diff --git a/scripts/pseries_platform b/scripts/pseries_platform
index e693a5b..8bf388a 100644
--- a/scripts/pseries_platform
+++ b/scripts/pseries_platform
@@ -3,7 +3,7 @@
SOURCE_FILE="pseries_platform"
PLATFORM_FILE=/proc/cpuinfo
export PLATFORM_UNKNOWN=0
-export PLATFORM_POWERKVM_HOST=1
+export PLATFORM_POWERNV=1
export PLATFORM_POWERKVM_GUEST=2
export PLATFORM_PSERIES_LPAR=3
@@ -11,10 +11,10 @@ export platform_name="Unknown"
export platform=$PLATFORM_UNKNOWN
if grep -q "PowerNV" $PLATFORM_FILE; then
- platform_name="PowerKVM Host"
- platform=$PLATFORM_POWERKVM_HOST
+ platform_name="PowerNV Host"
+ platform=$PLATFORM_POWERNV
elif grep -q "IBM pSeries (emulated by qemu)" $PLATFORM_FILE; then
- platform_name="PowerKVM pSeries Guest"
+ platform_name="Power KVM pSeries Guest"
platform=$PLATFORM_POWERKVM_GUEST
elif grep -q "pSeries" $PLATFORM_FILE; then
platform_name="PowerVM pSeries LPAR"
diff --git a/scripts/rtas_dump b/scripts/rtas_dump
index a5a68f8..9907c31 100755
--- a/scripts/rtas_dump
+++ b/scripts/rtas_dump
@@ -73,7 +73,7 @@ eval '%ENV=('.$1.')' if `bash -c "
$perldumpenv"`
=~ /^\s*\{(.*)\}\s*$/mxs;
-if ($ENV{'platform'} == $ENV{'PLATFORM_UNKNOWN'} || $ENV{'platform'} == $ENV{'PLATFORM_POWERKVM_HOST'}) {
+if ($ENV{'platform'} == $ENV{'PLATFORM_UNKNOWN'} || $ENV{'platform'} == $ENV{'PLATFORM_POWERNV'}) {
print "rtas_dump: is not supported on the $ENV{'platform_name'} platform\n";
exit 1;
}
diff --git a/scripts/snap b/scripts/snap
index dc8abe1..f58b77e 100755
--- a/scripts/snap
+++ b/scripts/snap
@@ -341,7 +341,7 @@ if (<$input> =~ /Ubuntu/) {
exit 1;
}
-if ($ENV{'platform'} == $ENV{'PLATFORM_UNKNOWN'} || $ENV{'platform'} == $ENV{'PLATFORM_POWERKVM_HOST'}) {
+if ($ENV{'platform'} == $ENV{'PLATFORM_UNKNOWN'} || $ENV{'platform'} == $ENV{'PLATFORM_POWERNV_HOST'}) {
print "snap: is not supported on the $ENV{'platform_name'} platform\n";
exit 1;
}
diff --git a/scripts/update_flash b/scripts/update_flash
index a1f2bbb..aca2c8a 100755
--- a/scripts/update_flash
+++ b/scripts/update_flash
@@ -414,7 +414,7 @@ case "$platform" in
$PLATFORM_UNKNOWN | $PLATFORM_POWERKVM_GUEST)
echo "update_flash: is not supported on the $platform_name platform"
exit 1;;
- $PLATFORM_POWERKVM_HOST)
+ $PLATFORM_POWERNV)
if [ ! -r "$UPDATE_FLASH_NV" ]; then
error $E_PERM "Couldn't find $UPDATE_FLASH_NV file."
fi
diff --git a/src/common/pseries_platform.c b/src/common/pseries_platform.c
index 31dbedb..2353271 100644
--- a/src/common/pseries_platform.c
+++ b/src/common/pseries_platform.c
@@ -15,8 +15,8 @@
const char *power_platform_name[] = {
"Unknown",
- "PowerKVM Host",
- "PowerKVM pSeries Guest",
+ "PowerNV",
+ "Power KVM pSeries Guest",
"PowerVM pSeries LPAR",
/* Add new platforms name here */
};
@@ -35,7 +35,7 @@ get_platform(void)
while (fgets(line, LENGTH, fp)) {
if (strstr(line, "PowerNV")) {
- rc = PLATFORM_POWERKVM_HOST;
+ rc = PLATFORM_POWERNV;
break;
} else if (strstr(line, "IBM pSeries (emulated by qemu)")) {
rc = PLATFORM_POWERKVM_GUEST;
diff --git a/src/common/pseries_platform.h b/src/common/pseries_platform.h
index 1a3dff5..aef92f8 100644
--- a/src/common/pseries_platform.h
+++ b/src/common/pseries_platform.h
@@ -10,7 +10,7 @@
enum {
PLATFORM_UNKNOWN = 0,
- PLATFORM_POWERKVM_HOST,
+ PLATFORM_POWERNV,
PLATFORM_POWERKVM_GUEST,
PLATFORM_PSERIES_LPAR,
/* Add new platforms here */
diff --git a/src/drmgr/drmgr.c b/src/drmgr/drmgr.c
index b3e9a3c..394b0d7 100644
--- a/src/drmgr/drmgr.c
+++ b/src/drmgr/drmgr.c
@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
switch (get_platform()) {
case PLATFORM_UNKNOWN:
- case PLATFORM_POWERKVM_HOST:
+ case PLATFORM_POWERNV:
fprintf(stderr, "%s: is not supported on the %s platform\n",
argv[0], platform_name);
exit(1);
diff --git a/src/drmgr/lsslot.c b/src/drmgr/lsslot.c
index 22d1346..0118355 100644
--- a/src/drmgr/lsslot.c
+++ b/src/drmgr/lsslot.c
@@ -850,7 +850,7 @@ main(int argc, char *argv[])
switch (get_platform()) {
case PLATFORM_UNKNOWN:
- case PLATFORM_POWERKVM_HOST:
+ case PLATFORM_POWERNV:
fprintf(stderr, "%s: is not supported on the %s platform\n",
argv[0], platform_name);
exit(1);
diff --git a/src/rtas_event_decode.c b/src/rtas_event_decode.c
index afc34ee..ca96ec4 100644
--- a/src/rtas_event_decode.c
+++ b/src/rtas_event_decode.c
@@ -132,7 +132,7 @@ main(int argc , char *argv[])
switch (get_platform()) {
case PLATFORM_UNKNOWN:
- case PLATFORM_POWERKVM_HOST:
+ case PLATFORM_POWERNV:
fprintf(stderr, "%s: is not supported on the %s platform\n",
argv[0], platform_name);
exit(1);
diff --git a/src/set_poweron_time.c b/src/set_poweron_time.c
index 32bab76..3ad9ebc 100644
--- a/src/set_poweron_time.c
+++ b/src/set_poweron_time.c
@@ -221,7 +221,7 @@ int main(int argc, char **argv) {
switch (get_platform()) {
case PLATFORM_UNKNOWN:
- case PLATFORM_POWERKVM_HOST:
+ case PLATFORM_POWERNV:
fprintf(stderr, "%s: is not supported on the %s platform\n",
argv[0], platform_name);
return 1;
--
2.1.4
|
