diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-09-17 11:35:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-17 11:35:34 +0300 |
| commit | 51a040d6efb2e81dc669e99aa04c1dd48335727a (patch) | |
| tree | cec34d70aa08e8816e225ed7af372fc699297ca9 /scripts | |
| parent | 6a17fe5cb33921b66a24cc7440d2b968730e26a6 (diff) | |
| parent | 4571978c8542a1f996af8a4913c787eecfb0b15d (diff) | |
| download | vyos-build-51a040d6efb2e81dc669e99aa04c1dd48335727a.tar.gz vyos-build-51a040d6efb2e81dc669e99aa04c1dd48335727a.zip | |
Merge pull request #1306 from c-po/arm64-tpm-smoketest
T9014: use tpm-tis-device for arm64 QEMU smoketests
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/check-qemu-install | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install index 58c45f39..cbb2c964 100755 --- a/scripts/check-qemu-install +++ b/scripts/check-qemu-install @@ -322,9 +322,13 @@ def get_qemu_cmd(name, enable_uefi, disk_img, raid=None, iso_img=None, tpm=False f' -device scsi-hd,bus=scsi1.0,drive=drive-hd2,id=hd2,bootindex=2' if tpm: + # The ISA "tpm-tis" device only exists on x86 machines - the arm64 + # "virt" machine exposes the TPM via MMIO and a device-tree node, + # which QEMU models as "tpm-tis-device" instead. + tpm_device = 'tpm-tis-device' if architecture == 'arm64' else 'tpm-tis' cmd += f' -chardev socket,id=chrtpm,path={tpm_sock}' \ ' -tpmdev emulator,id=tpm0,chardev=chrtpm' \ - ' -device tpm-tis,tpmdev=tpm0' + f' -device {tpm_device},tpmdev=tpm0' return cmd |