From nobody Sun Feb 8 12:35:52 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1595597480; cv=none; d=zohomail.com; s=zohoarc; b=kbvyG77szS0hBrxFtki0Sz7B29DgPScBhw3UFf3iod4BjKfE+z3jlvzVESqBbNA2dtOHofs0nqCQjnQQSpYDYxssFa7+Wu0JCtaahgaO36XiMQcErul+r9clMxqgY2qwVm0iNz416ACU3TNFhrJHSRgYBljKXlwh+bBkKGxaVEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595597480; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=z1WyPJply7cWKO/2E3r9huT15SisOIWTZMXSV+qtg1I=; b=JEDJd1bcjfiP6Z12Vo9V5i/pN0glrJHzWLY7TcF1XE4e6iGjHKefxXq67esRZjgUeGTmot65H3MzV5hep9KIQfmaspqJpFthRn/JNuiIkeHuTSUVpJsjoQWcCywW6kbpy7fQGNzI3MFNB+usZ6btOPLLwPHT3IXwttZLgHCY7uI= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595597480390216.5898307660666; Fri, 24 Jul 2020 06:31:20 -0700 (PDT) Received: from localhost ([::1]:43874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyxnD-0006wn-3H for importer@patchew.org; Fri, 24 Jul 2020 09:31:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyxmG-0006O2-EW for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:30:20 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:53902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyxmE-0001t8-DG for qemu-devel@nongnu.org; Fri, 24 Jul 2020 09:30:20 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06OD3UD4008329 for ; Fri, 24 Jul 2020 09:30:15 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 32fux78nry-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 24 Jul 2020 09:30:15 -0400 Received: from m0098399.ppops.net (m0098399.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 06OD3qMN010898 for ; Fri, 24 Jul 2020 09:30:15 -0400 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0a-001b2d01.pphosted.com with ESMTP id 32fux78nr5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jul 2020 09:30:14 -0400 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 06ODP9Wo002067; Fri, 24 Jul 2020 13:30:13 GMT Received: from b01cxnp23033.gho.pok.ibm.com (b01cxnp23033.gho.pok.ibm.com [9.57.198.28]) by ppma02wdc.us.ibm.com with ESMTP id 32brq9vmqd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 24 Jul 2020 13:30:13 +0000 Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp23033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 06ODUDZ717432832 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 24 Jul 2020 13:30:13 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1200F112062; Fri, 24 Jul 2020 13:30:13 +0000 (GMT) Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDDF0112061; Fri, 24 Jul 2020 13:30:12 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP; Fri, 24 Jul 2020 13:30:12 +0000 (GMT) From: Stefan Berger To: qemu-devel@nongnu.org, philmd@redhat.com Subject: [PATCH] tpm_emulator: Report an error if chardev is missing Date: Fri, 24 Jul 2020 09:30:11 -0400 Message-Id: <20200724133011.2488055-1-stefanb@linux.vnet.ibm.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-24_04:2020-07-24, 2020-07-24 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 suspectscore=0 phishscore=0 mlxscore=0 priorityscore=1501 lowpriorityscore=0 clxscore=1015 spamscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2006250000 definitions=main-2007240101 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=148.163.156.1; envelope-from=stefanb@linux.vnet.ibm.com; helo=mx0a-001b2d01.pphosted.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/24 09:30:16 X-ACL-Warn: Detected OS = Linux 3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, Stefan Berger , armbru@redhat.com, Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch fixes the odd error reporting when trying to send a file descriptor to the TPM emulator if one has not passed a valid chardev. $ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=3Dtpm0 qemu-system-x86_64: -tpmdev emulator,id=3Dtpm0: tpm-emulator: Failed to sen= d CMD_SET_DATAFD: Success qemu-system-x86_64: -tpmdev emulator,id=3Dtpm0: tpm-emulator: Could not cle= anly shutdown the TPM: Success This is the new error report: $ x86_64-softmmu/qemu-system-x86_64 -tpmdev emulator,id=3Dtpm0 qemu-system-x86_64: -tpmdev emulator,id=3Dtpm0: tpm-emulator: missing chard= ev This change does not hide the display of supported TPM types if a non-exist= ent type is passed: $ x86_64-softmmu/qemu-system-x86_64 -tpmdev nonexistent,id=3Dtpm0 qemu-system-x86_64: -tpmdev nonexistent,id=3Dtpm0: Parameter 'type' expects= a TPM backend type Supported TPM types (choose only one): passthrough Passthrough TPM backend driver emulator TPM emulator backend driver Signed-off-by: Stefan Berger Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Markus Armbruster --- backends/tpm/tpm_emulator.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/backends/tpm/tpm_emulator.c b/backends/tpm/tpm_emulator.c index 9605339f93..55cbc9c60e 100644 --- a/backends/tpm/tpm_emulator.c +++ b/backends/tpm/tpm_emulator.c @@ -568,6 +568,9 @@ static int tpm_emulator_handle_device_opts(TPMEmulator = *tpm_emu, QemuOpts *opts) } =20 tpm_emu->options->chardev =3D g_strdup(value); + } else { + error_report("tpm-emulator: missing chardev"); + goto err; } =20 if (tpm_emulator_prepare_data_fd(tpm_emu) < 0) { @@ -925,6 +928,11 @@ static void tpm_emulator_shutdown(TPMEmulator *tpm_emu) { ptm_res res; =20 + if (!tpm_emu->options->chardev) { + /* was never properly initialized */ + return; + } + if (tpm_emulator_ctrlcmd(tpm_emu, CMD_SHUTDOWN, &res, 0, sizeof(res)) = < 0) { error_report("tpm-emulator: Could not cleanly shutdown the TPM: %s= ", strerror(errno)); --=20 2.24.1