From nobody Tue Feb 10 19:14:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1612978497; cv=none; d=zohomail.com; s=zohoarc; b=JtI8Gn4dLDsekTFdQGC1ZQbByIe3OcyCbm26iKwCgg5T32Rfb9gHKXVL7USFGRMrrGF9Xr3GgJJUcKmxhMnIr3jVQBLhk9b6kCQfhAm2jhDZdeEPWf/cvDLBOMnBiZ6gyC9ITBJqtt2rvVVZyY782DxatWdjF0M3e32CNo9fXLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612978497; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZhoI2oeYanarJNKN1g/ie2TVUYU2TZZFTLfuvCl7FEM=; b=Muz/x/K9EeHbJ3TZrRte8nZRClyBCmTQpRqfFIrOCgdnhZPBcU3camyY1/h8I4ANAhQp4TpSqLfnuHkYHFXIBd0sCWQBoRmKkK+u0rEQSx/z7Kyn39Op4/p/gEOpLyMV+bR/CRiq+M5DN1ltCircXB9SZl2y77i3WEhbzmFjlwM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612978497406264.43873555404946; Wed, 10 Feb 2021 09:34:57 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-454-HwU3MCByPRGmyDxCwn26bg-1; Wed, 10 Feb 2021 12:34:51 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96373804036; Wed, 10 Feb 2021 17:34:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 21B9060C0F; Wed, 10 Feb 2021 17:34:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DBB8718095C9; Wed, 10 Feb 2021 17:34:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11AHYggb020909 for ; Wed, 10 Feb 2021 12:34:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id 426892166B30; Wed, 10 Feb 2021 17:34:42 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3BC982166B2E for ; Wed, 10 Feb 2021 17:34:39 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE5091019C81 for ; Wed, 10 Feb 2021 17:34:39 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [62.140.7.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-333-stSGykD9M4uuyo7SOFULUg-1; Wed, 10 Feb 2021 12:34:37 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2053.outbound.protection.outlook.com [104.47.14.53]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-16-w9554xHWPsud-xFylCeO0A-1; Wed, 10 Feb 2021 18:34:35 +0100 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM9PR04MB7683.eurprd04.prod.outlook.com (2603:10a6:20b:2d7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26; Wed, 10 Feb 2021 17:34:34 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099%5]) with mapi id 15.20.3846.025; Wed, 10 Feb 2021 17:34:34 +0000 Received: from linux-tbji.devlab.prv.suse.com (75.169.41.71) by AM4PR0501CA0045.eurprd05.prod.outlook.com (2603:10a6:200:68::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Wed, 10 Feb 2021 17:34:33 +0000 X-MC-Unique: HwU3MCByPRGmyDxCwn26bg-1 X-MC-Unique: stSGykD9M4uuyo7SOFULUg-1 X-MC-Unique: w9554xHWPsud-xFylCeO0A-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 1/2] qemu: Fix swtpm device with aarch64 Date: Wed, 10 Feb 2021 10:34:09 -0700 Message-ID: <20210210173410.21671-2-jfehlig@suse.com> In-Reply-To: <20210210173410.21671-1-jfehlig@suse.com> References: <20210210173410.21671-1-jfehlig@suse.com> X-Originating-IP: [75.169.41.71] X-ClientProxiedBy: AM4PR0501CA0045.eurprd05.prod.outlook.com (2603:10a6:200:68::13) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 77a3afbe-badb-4af0-8d90-08d8cdea215c X-MS-TrafficTypeDiagnostic: AM9PR04MB7683: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:153 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: wJZeW/gEfrbsOOC47e4kXSPDVS1NasSI0YdU1EwTKLP63sjEAkdaOToCrGp+GMLO3ZK0WVIGBwxwn7TUFdPJrGHvJY8qsqksoD8w+FWBUmnZGSkgiHdI26R37RYOm6ncbF13ThB34i2+fQqkgQzxltnZ3AHu/01I//NPujir2ZI84ZXgLrn/7FSgHwh25QGQD3hugP8LjrFevxAlE98L6Q6Ony1rBVp8NpCD9IGxw8BAfmU9bWrugKWkK5ipsRghs5WJjNKbtHaarokofQkVVWnJSXgi5CYwW/Nsf+GauTdx1werWE7/Ck9wNDN0bX/wAGjdwdcuLSz0TwWYZl1G3LMy10hYtFkQ6vnVj7lHSYGBg1XC8aqKb0iYXX8p+1ipkBo5KRWOWzZOeKfV43xFXZ86RjYs5jR5gC81I83zq5JKboee7XVVK2dSfYqaIr0PONSX0tzd7ykqHHhEdgbeWw5KQASpckNY7vOhC+H55O5ZC450rRFUqUqVjClR6QxargX8ijOH5MF5ZgPQ2VnZVlGJWMjU9yisykRzrchhVFf27zZMPTFvklSdQF2IvgAQVig1KzsVUqJ7aaqFINSiln0zECx3LF1d90p7mcGLmo8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(346002)(376002)(366004)(39850400004)(396003)(6666004)(107886003)(4326008)(8676002)(2906002)(66556008)(66476007)(83380400001)(956004)(1076003)(2616005)(7696005)(52116002)(478600001)(5660300002)(26005)(86362001)(8936002)(6486002)(6916009)(66946007)(316002)(966005)(186003)(16526019)(36756003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?TkJxMWKDykEuk7qB+mSiXmcEZQJA0FW6Gr+1w5cSKwwyowgxyCUI2YuEa28p?= =?us-ascii?Q?xliJ8D365TIKXWHzJDgOHOHXvP6cyCYlLilTa3k9VUd4e+rnrSi0yUBmv6bW?= =?us-ascii?Q?AwxChN9YdMxeeIA//r5H+eQ4Ow8wv7GJ4snOGFxURr/FRUSl357zYlJ69BYj?= =?us-ascii?Q?Or/ppirW3qdcJ0ZSKA9KAmeWgKyUGZXl84QxMJTwKrbanxgLTwt9suQE6Qu+?= =?us-ascii?Q?mKJFcmN85f1Njqci66r2/IBVpxZNCGvEhBipXGmx9/5FcdBm01vnlH/gP7GJ?= =?us-ascii?Q?nfr5nPSn9Z9xZQgDfh7C8i1OwH4DqnfhklhljDJLGac0s4wh2xOq/TJTCcNs?= =?us-ascii?Q?W5mHGx9zhVmDHMIzW+kIUzrYSrWvvKxXDdvyba6enaP76Rw06GwdDZN/iw9L?= =?us-ascii?Q?G1IESBJVUMri+ueKKX+IW6m9zJzS0TH5zbhQpsE/pR0G7RK7qo6WbCUXpDDh?= =?us-ascii?Q?M+1jn/yMkJkh0O2mw0qmaUeYkZ5/kFqxiLDew+lCjVgXp988CQXY2dymmeDX?= =?us-ascii?Q?SPiDU1fIHoGgLc26fZb6U8uy2cXp2sbav7OYLR89V/AM1j1ZsfzavRXPZNwv?= =?us-ascii?Q?uQgjvt0Xaw+1NkwXx2Cu2Ww/amBngcvosVoG2Yae7RK0fgOt+V1DXr+FZA3d?= =?us-ascii?Q?AV6+B9EHEqydvn4o+BvE6IHgfo6SM8yR06nv1YFKH1fJu6k0gz9mEFaWsqka?= =?us-ascii?Q?A+W5TexzZzhp2yBnxtZ+nro2SDj32SX6luAJdZv/VrthTCALyAq65CO/Xoqr?= =?us-ascii?Q?PY6P7edbqyJbOD+RhWL0RahNIcOvQLps8748big0urrCOcvsf7QC0+Z87lDB?= =?us-ascii?Q?yZUMmnxoPcAnbVbAL156qOuibrX/8taCHD9Zf0MOl/cy9OS+ay13n8i/VG0C?= =?us-ascii?Q?VZusj1VscWoblQwN05VK7Ec5u5/i8W8dxlOOaPusRgf+0+g3ZMeZJ6c/KLdt?= =?us-ascii?Q?OuUQTcQaEKsa12eN8DGpRC/lhMS4qLpRpvz1RpowgnV05BnQNFhIyQGhNiBk?= =?us-ascii?Q?PMjaMUrf2Nfyo5WdAnFz8VOSkCloRFE4fhWY/w679whbyGXHimHnhDF/Y409?= =?us-ascii?Q?aHcGNVvhdMKkfQH3JcrtX4zPpuTy3SwvUhVtNENy6Q4IDFa8RTcJ6iNRsk3S?= =?us-ascii?Q?SaddtZ3kVfd+EyUeurapoQevnkcdpwq4nBnNa7U45yzLoO2J8bSK3J/n+61T?= =?us-ascii?Q?g7kLr9nVWRw71S859fir7aM4TlKxh3V2gS0UEuc+mDQFHRxfEJ2d0lsobYXE?= =?us-ascii?Q?VUqTA+fHe7QMIDhOzpWQV/HzJIWBZ+wdpKExjhVnF3xwDh01dcLVKy7PDDEi?= =?us-ascii?Q?UYi+l0wQ8SxQybxMUoWPMGI9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 77a3afbe-badb-4af0-8d90-08d8cdea215c X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2021 17:34:34.5141 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: UfGvTytj87X6G7JCiXUHlyuSO3G7eIkyllhkjnf1IpSswdJExTaCMyM930vCciRbn0N2z150Jx2+AKUZEveOFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7683 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 11AHYggb020909 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Starting a VM with swtpm device fails with qemu-system-aarch64. E.g. with TPM device config QEMU reports the following error error: internal error: process exited while connecting to monitor: 2021-02-07T05:15:35.378927Z qemu-system-aarch64: -device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0: 'tpm-tis' is not a valid device model = name Indeed the TPM device name is 'tpm-tis-device' [1][2] for aarch64, versus the shorter 'tpm-tis' for x86. The devices are the same from a functional POV, i.e. they both emulate a TPM device conforming to the TIS specification. Account for the unfortunate name difference when building the TPM device option in qemuBuildTPMDevStr(). Also include a test case for 'tpm-tis-device'. [1] https://qemu.readthedocs.io/en/latest/specs/tpm.html [2] https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447= afaa7 Signed-off-by: Jim Fehlig --- src/qemu/qemu_command.c | 3 ++ .../aarch64-tpm.aarch64-latest.args | 37 +++++++++++++++++++ tests/qemuxml2argvdata/aarch64-tpm.xml | 15 ++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 56 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f0333d4f1a..96b956d7ae 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9203,6 +9203,9 @@ qemuBuildTPMDevStr(const virDomainDef *def, g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; const char *model =3D virDomainTPMModelTypeToString(tpm->model); =20 + if (tpm->model =3D=3D VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch =3D=3D = VIR_ARCH_AARCH64) + model =3D "tpm-tis-device"; + virBufferAsprintf(&buf, "%s,tpmdev=3Dtpm-%s,id=3D%s", model, tpm->info.alias, tpm->info.alias); =20 diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests= /qemuxml2argvdata/aarch64-tpm.aarch64-latest.args new file mode 100644 index 0000000000..94a083d816 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args @@ -0,0 +1,37 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-aarch64test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-aarch64test/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-aarch64test/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-aarch64 \ +-name guest=3Daarch64test,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-aarch64test/master-key.aes \ +-machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,\ +memory-backend=3Dmach-virt.ram \ +-cpu cortex-a15 \ +-m 1024 \ +-object memory-backend-ram,id=3Dmach-virt.ram,size=3D1073741824 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ +-chardev socket,id=3Dchrtpm,path=3D/dev/test \ +-device tpm-tis-device,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-tpm.xml b/tests/qemuxml2argvdat= a/aarch64-tpm.xml new file mode 100644 index 0000000000..d338a20f17 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-tpm.xml @@ -0,0 +1,15 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1 + + hvm + + + /usr/bin/qemu-system-aarch64 + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index faa71a7a16..d09db77d8c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2478,6 +2478,7 @@ mymain(void) DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc"); DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-pstate"); DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64"); =20 DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE); DO_TEST_PARSE_ERROR("pci-bus-invalid", NONE); --=20 2.29.2 From nobody Tue Feb 10 19:14:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1612978503; cv=none; d=zohomail.com; s=zohoarc; b=LrKc/GF7VA1g7HEXenvl7uSlMY+3Yi/fy+hHfURVX+Cmo7arEDi/3mXIWLevOnFR4StGwMqRuhNdSDGUIujgBSG+oluMvwXWpoQT3Y1tozndbAevrzbNEVFnRKbTwFQXVzoni1lz5ALaHuQCP3wsZ6Wg6CiAz0p0qIb+m6mRkdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612978503; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VOABddTlD1dy/Vdasa4A1bs5kAqjsCUXA4pdr4K/s+c=; b=JI9YgUKsrQxhHpvEEufxPiBkuaAzjogEq7q2sXg5wR88qc/Ch4QqnxF4bSu9YOVgeM5HtGJtuteakbfmllEmqdnmL61/lVgzm1XAEEuv9scJ5fCPhl92kJmoHvqOJdO/tTogyEHowKFxE0uoPnnAszymh1MnIQjXADHTiGrI4gM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612978502545803.9864851401575; Wed, 10 Feb 2021 09:35:02 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-286-TyeDJqZZPsWh4fGk6p2eQA-1; Wed, 10 Feb 2021 12:34:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EF12195D565; Wed, 10 Feb 2021 17:34:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64DA110016F6; Wed, 10 Feb 2021 17:34:53 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 224D557DFD; Wed, 10 Feb 2021 17:34:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 11AHYiCC020919 for ; Wed, 10 Feb 2021 12:34:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 34FEBE38C5; Wed, 10 Feb 2021 17:34:44 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 29EA1E77A3 for ; Wed, 10 Feb 2021 17:34:41 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E94C185A793 for ; Wed, 10 Feb 2021 17:34:41 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [62.140.7.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-QiW021WAMgKyGw0GfkJzgA-1; Wed, 10 Feb 2021 12:34:39 -0500 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2055.outbound.protection.outlook.com [104.47.14.55]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-26-R1cgc7PqMkW8Pe7IZzITFQ-1; Wed, 10 Feb 2021 18:34:36 +0100 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) by AM9PR04MB7683.eurprd04.prod.outlook.com (2603:10a6:20b:2d7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26; Wed, 10 Feb 2021 17:34:36 +0000 Received: from AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099]) by AM8PR04MB7970.eurprd04.prod.outlook.com ([fe80::bdae:2ddc:55e0:9099%5]) with mapi id 15.20.3846.025; Wed, 10 Feb 2021 17:34:36 +0000 Received: from linux-tbji.devlab.prv.suse.com (75.169.41.71) by AM4PR0501CA0045.eurprd05.prod.outlook.com (2603:10a6:200:68::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Wed, 10 Feb 2021 17:34:34 +0000 X-MC-Unique: TyeDJqZZPsWh4fGk6p2eQA-1 X-MC-Unique: QiW021WAMgKyGw0GfkJzgA-1 X-MC-Unique: R1cgc7PqMkW8Pe7IZzITFQ-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 2/2] qemu: Validate TPM TIS device Date: Wed, 10 Feb 2021 10:34:10 -0700 Message-ID: <20210210173410.21671-3-jfehlig@suse.com> In-Reply-To: <20210210173410.21671-1-jfehlig@suse.com> References: <20210210173410.21671-1-jfehlig@suse.com> X-Originating-IP: [75.169.41.71] X-ClientProxiedBy: AM4PR0501CA0045.eurprd05.prod.outlook.com (2603:10a6:200:68::13) To AM8PR04MB7970.eurprd04.prod.outlook.com (2603:10a6:20b:24f::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 01798b26-6f4c-4aa6-d7da-08d8cdea2268 X-MS-TrafficTypeDiagnostic: AM9PR04MB7683: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2276 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: aZaNtTc8+mgFbKjRThDhRYO8XfHNPMYvmiTlHThH18mp+55UVOy2V/9D0e2hYEkqTyDPoRB/nufz6JT0p5HK6qJyOejorlZ99rHIocZBAmKZ7VDuIwmO4AGvNw+tTmPNme13+RLhpeHZpoCVjN+HnJ+MF9IkNkkEvDmCOW7Jyo11r4N3tpM6ir1E4m2JY45xMLN+c6uAgN9mI2VL2V+A4IOxYLq8z65EJFziWnZ8SOh9uYRdamAsmDaiOrIRLDVTHGqmAyM7bJUXOOozZp49YUB1QkeFdOvjqTEGq5z5Gw5eArCJXe+5C2rUO0v9S+6IXEb+IiBdySUOPNVqW6s+iRbK6VsYv9NizUL7biGbSC8vTOon1TQnUk72zSEmhWWr82WQMkaB2qR93g05ie4z7Wn0LowDHUiierYtn3ZMFhIUAqW6zBNZRFZZy9egfG/zWL2jY0cWf9IYlglQfiP9yRUUw1HpoIJ+U2sFBTmt6XvS12I1ByxqZ/8ILMwyaIdzC7ZgyEj4ITkBrkORE5GAnQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM8PR04MB7970.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(136003)(346002)(376002)(366004)(39850400004)(396003)(6666004)(107886003)(4326008)(8676002)(2906002)(66556008)(66476007)(83380400001)(956004)(1076003)(2616005)(7696005)(52116002)(478600001)(5660300002)(26005)(86362001)(8936002)(6486002)(6916009)(66946007)(316002)(186003)(16526019)(36756003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?p0ePm9T1Hc5Wk3g6rIktT8Z1Ev5YIMMJWoamfx6JxOtpjZsf8dtNSY5Ymoii?= =?us-ascii?Q?pw2DcloAvdBJLu1BECqaaMQed440USemY+nk4IdxgOYhC2liSmKKf5eUMmjk?= =?us-ascii?Q?F9/449QB7aZ+F6WsuMXpJEKY1Gcf/te4xvJS9F2B9EyW0tnyjw6WE1h3auvQ?= =?us-ascii?Q?+g6nPFUJ+cUYLdQaOwsvgcBSYu7Ya44czSOiIQ+OKqoowWIqsTrYSKsy83h5?= =?us-ascii?Q?M6TfMA33Lli+8yd9WQ+2CmLUwHQkJb6dG2QKIrHUpRQNTYG1brIjqiOE01ko?= =?us-ascii?Q?VcI2YFja286JKf5wsUv3kAC+zS/PmQCOHlImyLkd4pG5S1UhE+1fK6uDnRhz?= =?us-ascii?Q?q4TRjoDuW8ZU89V7gpygvI87Pi1Tx5K+0oQWnbd5Oo3X1yYHf+/mCHVTg9s0?= =?us-ascii?Q?dtS6SGL9Ggvym++BXs46zeKjNNM2cOK4PIcVqXs2ku/csyDrWbC11iRmeK1m?= =?us-ascii?Q?OGpoX8qT6J4pdniVWSbmWSEoORku9QMSxlFJvwPT1l/TN9NPlxF/zzBow8nU?= =?us-ascii?Q?FGTRkh/16fu55BowA1i2T3TIA780UrkdeItitk37mDTHKzIbDMQ3TGHQqLMk?= =?us-ascii?Q?pLxFChpBYBMoyqrO5KhTfpEoRp1DNl9UY2xkuUQcgsXfL2YBRqhHjG+NxYFB?= =?us-ascii?Q?Pwg/0xxfOyAlS9syD2UMURLqtAPoUWWZ6krzzwxCrutVqQT29ZUYaPDhSYVi?= =?us-ascii?Q?tPN7GfB4Nl6e9qGDX4SxFnIWaH7R/SwyD5Fmkp4sJI132v42sBCaHldHedwm?= =?us-ascii?Q?+Y3kwi2Ak2grStMlggnQQHWQm8qpe2mv40c2e3fuS1IN69/Ne6qHjO/MNZ0p?= =?us-ascii?Q?JD5O8TY263/uIDZ9jhY5dKtuFU+H2+Vcv2Qk9DNU7Bhaj0nb7vHv1UMOxRJI?= =?us-ascii?Q?Ixbs9NtDTF4UA/BDiy2cC2aWeNLcDyQByZkFhsG/8jvC1zIIi1Bq9oNhlJWv?= =?us-ascii?Q?1iU+0HeWQ2tM6APhgoOZnJruye/SV+Q2zvJwSikxA4NKz+Ai7kOA7fZzDbtl?= =?us-ascii?Q?8mOq/M6ji5Aea+/a47dfIMtFeXxDUxc8TdW9yJc0/XuVKT0WyoyzW+zNgnn+?= =?us-ascii?Q?RsCVz7hxfBs3DA2La2nJzOqg4WbtbzaFAd8prhWkLc/fL1o05LjP+V+gY5rM?= =?us-ascii?Q?pJMaGmrUOlQvpQIrQmxvkxvE1tth2/d8y1iWrCqTPYZR0Z4JxW5VwTS9ASgq?= =?us-ascii?Q?icFWV6hou6Fu5qIApQ7SoeQhTaEQZt3Q4YYoyQQsDoEl5L+zaXWZFkhraaEk?= =?us-ascii?Q?fiaWftbsVFQo9qjOF3NYmzLOJtaqGgbHFrnlbca89ahaDQ7xqqgp+nJlEOIc?= =?us-ascii?Q?fyceAD8krFm+T9gD764Y7UsY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01798b26-6f4c-4aa6-d7da-08d8cdea2268 X-MS-Exchange-CrossTenant-AuthSource: AM8PR04MB7970.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2021 17:34:36.0743 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: f0YQxp1xq88N7yfFVfaghgeMlRCTMXGjHPLxlopo79qdyfzX9qKzoLV3H7Oelz8XtoRs2lhZ56Bxi3i1c/a2FQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7683 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 11AHYiCC020919 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" TPM devices with model=3D'tpm-tis' are only valid with x86 and aarch64 virt machines. Add a check to qemuValidateDomainDeviceDefTPM() to ensure VIR_DOMAIN_TPM_MODEL_TIS is only used with these architectures. Signed-off-by: Jim Fehlig --- The conditional is a bit distasteful, but so far I haven't come up with anything better. I aslo worry about future architectures gaining support for emulated TPM TIS devices. src/qemu/qemu_validate.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index a70737327e..d6ff5e5eef 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4299,6 +4299,13 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm, =20 switch (tpm->model) { case VIR_DOMAIN_TPM_MODEL_TIS: + if (!ARCH_IS_X86(def->os.arch) && (def->os.arch !=3D VIR_ARCH_AARC= H64)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("TPM model %s is only available for " + "x86 and aarch64 guests"), + virDomainTPMModelTypeToString(tpm->model)); + return -1; + } flag =3D QEMU_CAPS_DEVICE_TPM_TIS; break; case VIR_DOMAIN_TPM_MODEL_CRB: --=20 2.29.2