Preserve the swtpm startup deadline

Author: sjmiller609

lib/hypervisor/qemu/swtpm.go

@@ -67,6 +67,9 @@ func startSWTPM(config *hypervisor.TPMConfig, instanceDir string) (*startedProce
 	cmd.Stderr = logFile
 	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 
+	if !time.Now().Before(deadline) {
+		return nil, fmt.Errorf("timeout before starting swtpm")
+	}
 	proc, err := startManagedProcess(cmd, config.SocketPath)
 	if err != nil {
 		return nil, fmt.Errorf("start swtpm: %w", err)
@@ -122,6 +125,9 @@ func waitForSWTPMExit(record swtpmProcessRecord, recordPath string, deadline tim
 			return fmt.Errorf("inspect previous swtpm process %d: %w", record.pid, err)
 		}
 		if !alive || identity != record.identity {
+			if !time.Now().Before(deadline) {
+				return fmt.Errorf("timeout waiting for previous swtpm process %d", record.pid)
+			}
 			_ = os.Remove(recordPath)
 			return nil
 		}

lib/hypervisor/qemu/swtpm_test.go

@@ -0,0 +1,23 @@
+package qemu
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/kernel/hypeman/lib/hypervisor"
+	"github.com/stretchr/testify/require"
+)
+
+func TestWaitForPreviousSWTPMRejectsExpiredDeadline(t *testing.T) {
+	recordPath := filepath.Join(t.TempDir(), "swtpm.pid")
+	identity, alive, err := swtpmProcessIdentity(os.Getpid())
+	require.NoError(t, err)
+	require.True(t, alive)
+	require.NoError(t, os.WriteFile(recordPath, []byte(fmt.Sprintf("%d %s\n", os.Getpid(), identity)), 0600))
+
+	err = waitForPreviousSWTPM(&hypervisor.TPMConfig{}, recordPath, time.Now().Add(-time.Second))
+	require.ErrorContains(t, err, "timeout waiting for previous swtpm process")
+}