Added constant for s390-ccw-virtio and made related updates.

Author: niyamsw

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -18,6 +18,7 @@
 
 import static com.cloud.host.Host.HOST_INSTANCE_CONVERSION;
 import static com.cloud.host.Host.HOST_VOLUME_ENCRYPTION;
+import static org.apache.cloudstack.utils.linux.KVMHostInfo.isHostS390x;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -244,11 +245,16 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     private static final String LEGACY = "legacy";
     private static final String SECURE = "secure";
 
+    /**
+     * Machine type for s390x architecture
+     */
+    private static final String S390X_VIRTIO_DEVICE = "s390-ccw-virtio";
+
     /**
      * Machine type.
      */
-    private static final String PC = ("s390x".equals(System.getProperty("os.arch"))) ? "s390-ccw-virtio" : "pc";
-    private static final String VIRT = ("s390x".equals(System.getProperty("os.arch"))) ? "s390-ccw-virtio" : "virt";
+    private static final String PC = isHostS390x() ? S390X_VIRTIO_DEVICE : "pc";
+    private static final String VIRT = isHostS390x() ? S390X_VIRTIO_DEVICE : "virt";
 
     /**
      * Possible devices to add to VM.
@@ -2762,7 +2768,7 @@ protected FeaturesDef createFeaturesDef(Map<String, String> customParams, boolea
         FeaturesDef features = new FeaturesDef();
         features.addFeatures(PAE);
         features.addFeatures(APIC);
-        if (!isGuestS390x()) {
+        if (!isHostS390x()) {
             features.addFeatures(ACPI);
         }
         if (isUefiEnabled && isSecureBoot) {

plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/KVMHostInfo.java

@@ -111,6 +111,10 @@ public String getCpuArch() {
         return cpuArch;
     }
 
+    public static boolean isHostS390x() {
+       return "s390x".equals(System.getProperty("os.arch"));
+    }
+
     protected static long getCpuSpeed(final String cpabilities, final NodeInfo nodeInfo) {
         long speed = 0L;
         speed = getCpuSpeedFromCommandLscpu();
@@ -137,7 +141,7 @@ private static long getCpuSpeedFromCommandLscpu() {
         try {
             LOGGER.info("Fetching CPU speed from command \"lscpu\".");
             String command = "lscpu | grep -i 'Model name' | head -n 1 | egrep -o '[[:digit:]].[[:digit:]]+GHz' | sed 's/GHz//g'";
-            if("s390x".equals(System.getProperty("os.arch"))) {
+            if(isHostS390x()) {
                 command = "lscpu | grep 'CPU dynamic MHz' | cut -d ':' -f 2 | tr -d ' ' | awk '{printf \"%.1f\\n\", $1 / 1000}'";
             }
             String result = Script.runSimpleBashScript(command);