core: Don’t mark TPM device as special

TPM device has its own special handling and thus is not a special
device with general properties.

backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java

@@ -297,7 +297,6 @@ public static boolean isSpecialDevice(String device, VmDeviceGeneralType type, b
         switch(type) {
         case MDEV:
         case SOUND:
-        case TPM:
             return true;
         case CONSOLE:
             return VmDeviceType.CONSOLE.getName().equals(device);

backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java

@@ -518,7 +518,7 @@ private VmDevice readOtherHardwareItem(XmlNode node) {
                     .forValue(String.valueOf(selectSingleNode(node, VMD_TYPE, _xmlNS).innerText));
             String device = selectSingleNode(node, VMD_DEVICE, _xmlNS).innerText;
             // special devices are treated as managed devices but still have the OTHER OVF ResourceType
-            managed = VmDeviceCommonUtils.isSpecialDevice(device, type, true);
+            managed = VmDeviceCommonUtils.isSpecialDevice(device, type, true) || type == VmDeviceGeneralType.TPM;
         }
 
         return managed ? readManagedVmDevice(node, readDeviceId(node))

backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java

@@ -481,10 +481,6 @@ private void writeOtherDevices() {
                     // mdev_type predefined property is written instead
                     continue;
                 }
-                if (device.getType() == VmDeviceGeneralType.TPM) {
-                    // TPM device has its own write method
-                    continue;
-                }
                 devices.add(device);
             }
         }