Refactor TPM handling logic

cockpit-project · Oct 23, 2024 · fb5bf9e · fb5bf9e
1 parent e378412
commit fb5bf9e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/components/vm/vmActions.jsx b/src/components/vm/vmActions.jsx
@@ -457,7 +457,7 @@ const VmActions = ({ vm, vms, onAddErrorNotification, isDetailsPage }) => {
         dropdownItems.push(<Divider key="separator-rename" />);
     }
 
-    if (!Object.keys(vm.tpm).length) {
+    if (!vm.tpm) {
         dropdownItems.push(
             <DropdownItem key={`${id}-add-tpm`}
                           id={`${id}-add-tpm`}

diff --git a/src/libvirt-xml-parse.js b/src/libvirt-xml-parse.js
@@ -270,7 +270,8 @@ export function parseDomainDumpxml(connectionName, domXml, objPath) {
     const watchdog = parseDumpxmlForWatchdog(devicesElem);
     const vsock = parseDumpxmlForVsock(devicesElem);
     const hasSpice = parseDumpxmlForSpice(devicesElem);
-    const { tpm, hasTPM } = parseDumpxmlForTPM(devicesElem);
+    const hasTPM = !!parseDumpxmlForTPM(devicesElem);
+    const tpm = parseDumpxmlForTPM(devicesElem);
 
     const hasInstallPhase = parseDumpxmlMachinesMetadataElement(metadataElem, 'has_install_phase') === 'true';
     const installSourceType = parseDumpxmlMachinesMetadataElement(metadataElem, 'install_source_type');
@@ -577,9 +578,9 @@ function parseDumpxmlForTPM(devicesElem) {
             version,
             devicePath,
         };
-        return { tpm, hasTPM: true };
+        return tpm;
     }
-    return { tpm: {}, hasTPM: false };
+    return null;
 }
 
 export function parseDumpxmlForFilesystems(devicesElem) {