From nobody Sun May 19 04:34:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595500859; cv=none; d=zohomail.com; s=zohoarc; b=XPo8v/PZ0Hetcy1EAY4A1H9hkWymHKLOhkZBcUjUDZP3svo7Ft9E/N2LWsgfKiVYSaTJmqO9keSzPdI9XgL3MiYXEpjYoS89NI4ujxBEvwH+sxB+DCjKGFOfgWaqhPaQB6nbP1oidLIOW4zh3OaSP5FmO4Z4hBlrFuorp+jok+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595500859; h=Content-Type:Content-Transfer-Encoding:Cc: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=UtNs8VuwihTgshljERkoFHj70ClwopH4n+3eavsWdDE=; b=j539U+rWLkFv+Y1Kakq9GPtc4COhR8gsn31lxUfO4ep/SnWkpm1PmlXK7jRW++d6MKxps49f53PSeChLqA07228ZGY4kT3ecC/qAznJ0ROQh0GS+o1i+l++boFmuifg6GC5FNMVUEXRK73Qqlj73Aq6ap3QX4Jlk5on6IN0K6P8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595500859297441.4708675069903; Thu, 23 Jul 2020 03:40:59 -0700 (PDT) Received: from localhost ([::1]:38638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyYen-0008NR-V7 for importer@patchew.org; Thu, 23 Jul 2020 06:40:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46936) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyYdj-000748-HF for qemu-devel@nongnu.org; Thu, 23 Jul 2020 06:39:51 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32708 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyYdh-0006Od-V1 for qemu-devel@nongnu.org; Thu, 23 Jul 2020 06:39:51 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-wQQTrWFsOuOcIxm0tnBrEQ-1; Thu, 23 Jul 2020 06:39:47 -0400 Received: by mail-wm1-f71.google.com with SMTP id z74so2212519wmc.4 for ; Thu, 23 Jul 2020 03:39:47 -0700 (PDT) Received: from localhost.localdomain (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id u16sm2980346wmn.11.2020.07.23.03.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 03:39:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595500789; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UtNs8VuwihTgshljERkoFHj70ClwopH4n+3eavsWdDE=; b=MyrNkFoGQtaiEbYPkIqXuZjm24trV+tVrTFKaW7m1kl5E+XgAlhX0Z2agUcpT6Yf+EBwFl of1Tk+mSLzghHRoYTrcR9yYCF+C+bgshUAnFBDaf6Q0FR9lODzYWQB3OWYyMV+l3eOJYPL YbRBiyaX4p/C1kqYgyCaBzXCpHR1PXs= X-MC-Unique: wQQTrWFsOuOcIxm0tnBrEQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UtNs8VuwihTgshljERkoFHj70ClwopH4n+3eavsWdDE=; b=swxfEq0c2btHNsLl509jxeEWACXgMPvJFt/xBX31wxVRnNIaTPmWyAevtqgV0rtexI w1mIteiF18aT6yFfW6tnFGnY8a/JkdCXrY2YlfYJJJkUzOcQfqDif3jyiMT/+DwP59Gv bRKcrn311zno/zuPY3upPqr25Xp+cYO7bemYuO/mGSq145U5NIQqGPRWESxqINPPPHqL YnYmbtShMuQKLMvu22IxK0wJya6DSYpiKgVrbu0eWCd/KezI3kQrP+CYWACk4Xp0MtgV TNe2um5aN+8IAiJz633aewT6GoBkVIzKnMzD7KjlzWI83C/M51qkmGG67c4TPe3b+JQd IRGg== X-Gm-Message-State: AOAM530jlKNAVVF/PBrC2RJScwKS4VsLKH62jxC2UZ0BSURsm5j3aq0I +EvtEPGrLJEcddW9X2qWUrmHwW8wFdXrXoLNOeHvp3c/Pj957k3C6eswC8Rbg2sUGbkGte1l7kE 8yxyg5bSDYH5Yk3U= X-Received: by 2002:a7b:c4d8:: with SMTP id g24mr3398242wmk.127.1595500786313; Thu, 23 Jul 2020 03:39:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxANh/5uaqCtdERd+zBUOH65xjwFMNI2cWxOtc+A82JuG4eL9aIZASiUOnO8fBXtpE+B34rIg== X-Received: by 2002:a7b:c4d8:: with SMTP id g24mr3398231wmk.127.1595500786076; Thu, 23 Jul 2020 03:39:46 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 v2 1/2] tpm: Display when no backend is available Date: Thu, 23 Jul 2020 12:39:38 +0200 Message-Id: <20200723103939.19624-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200723103939.19624-1-philmd@redhat.com> References: <20200723103939.19624-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 02:26:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Display "No TPM backend available in this binary." error when no backend is available. Reviewed-by: Stefan Berger Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tpm.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tpm.c b/tpm.c index fe03b24858..e36803a64d 100644 --- a/tpm.c +++ b/tpm.c @@ -41,6 +41,22 @@ tpm_be_find_by_type(enum TpmType type) return TPM_BACKEND_CLASS(oc); } =20 +/* + * Walk the list of available TPM backend drivers and count them. + */ +static int tpm_backend_drivers_count(void) +{ + int count =3D 0, i; + + for (i =3D 0; i < TPM_TYPE__MAX; i++) { + const TPMBackendClass *bc =3D tpm_be_find_by_type(i); + if (bc) { + count++; + } + } + return count; +} + /* * Walk the list of available TPM backend drivers and display them on the * screen. @@ -87,6 +103,11 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts,= Error **errp) TPMBackend *drv; int i; =20 + if (!tpm_backend_drivers_count()) { + error_setg(errp, "No TPM backend available in this binary."); + return 1; + } + if (!QLIST_EMPTY(&tpm_backends)) { error_setg(errp, "Only one TPM is allowed."); return 1; --=20 2.21.3 From nobody Sun May 19 04:34:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1595500867; cv=none; d=zohomail.com; s=zohoarc; b=VJHu9c5NX7vgmRV5fpstxA1S2dYOigatzpKeJkZjuk+3tMj6jlcArRjjsJ6Mahuf+dooc/sHwyqPbHWfK4lODBoumL3peQfYXOTi8JtMHHSWffpnZ2DWxQVjyyUwHG1Wd3HGnQn0TaBbkc73X2QqT0iADjJ3xG9/9tXT2ere97M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595500867; h=Content-Type:Content-Transfer-Encoding:Cc: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=ULFq2sr1um0IElm/mRL00zDsTy/K+6mOuA39u/j/7RY=; b=GDbIh6iNwMQIDROqKDMGy/ve2ibYAqBRSIJgHbUfaaQPGD/LMcdDn+M5pRO0oPBip0pJjVabkzZbiXnvYPwA/7ar+hfpDgQpIWNpOZfxEyYX9gjXRxnpocDxqrjW57wveAQr+cBDU52mp2ir042NSfxM97/1XG4AJjrSML7HQLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595500867087277.1539022262293; Thu, 23 Jul 2020 03:41:07 -0700 (PDT) Received: from localhost ([::1]:39286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyYev-0000CQ-OZ for importer@patchew.org; Thu, 23 Jul 2020 06:41:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyYdq-0007Fi-89 for qemu-devel@nongnu.org; Thu, 23 Jul 2020 06:39:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55403 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jyYdo-0006P4-Gp for qemu-devel@nongnu.org; Thu, 23 Jul 2020 06:39:57 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-126-OWB82MrHN-mpY5TNxKnYGw-1; Thu, 23 Jul 2020 06:39:52 -0400 Received: by mail-wr1-f69.google.com with SMTP id c6so1257864wru.7 for ; Thu, 23 Jul 2020 03:39:52 -0700 (PDT) Received: from localhost.localdomain (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id w12sm3458770wrm.79.2020.07.23.03.39.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 03:39:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595500795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ULFq2sr1um0IElm/mRL00zDsTy/K+6mOuA39u/j/7RY=; b=bWZwjkzlYFaDXUMHdqUHS2DAGIZy/7jDGS2yjUVnjUFbYC6VQNZhJe+SLmMW6jsQdxbnz1 EjfiULWfKHC0cEF9X5flpImintPkvf9nVuJc0M5PMawXI96/Qmq0CnZhERi4o5Or1Hr2CG GWO3YxjGFC3aS+8Q57r0S4fCATu590U= X-MC-Unique: OWB82MrHN-mpY5TNxKnYGw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ULFq2sr1um0IElm/mRL00zDsTy/K+6mOuA39u/j/7RY=; b=nW6Y+aVhbVfShFO5o196wepv5/K6nnSs0Fqs5xXN2CCqNWvcBqPX5JSedHjP8HWdjJ Zy8S3071NmFXkvtbFlx/A3ri4vDim5iDOanZkEs0SKcOOI96gGS6qvyaxgO4qdF1lxiD yshE8l9NVzHH5G72S55DdMxdIACaI8JhS+I4pLg7ko/yqRSN+9lr3SDEjfWxab+L+59s 3o1Do6t8LS8k++Gru/i+8owQOQeWhQnrgVnX0+mgyi5i3+YtU336l1oATwdJkaegegAS p82aueVciKnOSTfv196r4EoYc+ZIlZc9r+8rIGiokY7xKnGyV92nPTZ8YgcqshD2zifo VHOg== X-Gm-Message-State: AOAM530EoGYIhCNEmrLYI/hQ+kY4Os+ZpgFjk6Aegxc9vFMA1rvEgXat vCKvwGqi84D7OZipAb0yEb7cU+BxdjuzXZvwZ+PSQxgXJsVvlsRXEDeo9oWvJLwrAiaI+pAMWrK xI547oSZAkxp4Mes= X-Received: by 2002:a5d:4649:: with SMTP id j9mr3294178wrs.270.1595500790930; Thu, 23 Jul 2020 03:39:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykokyIPjm/nyNn0pza00qb9x5RadO7Y0dHihZom59dUZz4jf5QzH48Y7UTObicSnLJOG2y8g== X-Received: by 2002:a5d:4649:: with SMTP id j9mr3294166wrs.270.1595500790745; Thu, 23 Jul 2020 03:39:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 v2 2/2] tpm: List the available TPM backends Date: Thu, 23 Jul 2020 12:39:39 +0200 Message-Id: <20200723103939.19624-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200723103939.19624-1-philmd@redhat.com> References: <20200723103939.19624-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/23 06:04:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Stefan Berger Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When an incorrect backend is selected, tpm_display_backend_drivers() is supposed to list the available backends. However the error is directly propagated, and we never display the list. The user only gets "Parameter 'type' expects a TPM backend type" error. Convert the fprintf(stderr,) calls to error hints propagated with the error. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Since v1: - Use g_assert_not_reached after processing 'help' in tpm_config_parse --- tpm.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tpm.c b/tpm.c index e36803a64d..f883340d1a 100644 --- a/tpm.c +++ b/tpm.c @@ -58,23 +58,21 @@ static int tpm_backend_drivers_count(void) } =20 /* - * Walk the list of available TPM backend drivers and display them on the - * screen. + * Walk the list of available TPM backend drivers and list them as Error h= int. */ -static void tpm_display_backend_drivers(void) +static void tpm_list_backend_drivers_hint(Error **errp) { int i; =20 - fprintf(stderr, "Supported TPM types (choose only one):\n"); + error_append_hint(errp, "Supported TPM types (choose only one):\n"); =20 for (i =3D 0; i < TPM_TYPE__MAX; i++) { const TPMBackendClass *bc =3D tpm_be_find_by_type(i); if (!bc) { continue; } - fprintf(stderr, "%12s %s\n", TpmType_str(i), bc->desc); + error_append_hint(errp, "%12s %s\n", TpmType_str(i), bc->desc); } - fprintf(stderr, "\n"); } =20 /* @@ -97,6 +95,7 @@ TPMBackend *qemu_find_tpm_be(const char *id) =20 static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp) { + ERRP_GUARD(); const char *value; const char *id; const TPMBackendClass *be; @@ -122,7 +121,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts,= Error **errp) value =3D qemu_opt_get(opts, "type"); if (!value) { error_setg(errp, QERR_MISSING_PARAMETER, "type"); - tpm_display_backend_drivers(); + tpm_list_backend_drivers_hint(errp); return 1; } =20 @@ -131,7 +130,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts,= Error **errp) if (be =3D=3D NULL) { error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "type", "a TPM backend type"); - tpm_display_backend_drivers(); + tpm_list_backend_drivers_hint(errp); return 1; } =20 @@ -184,8 +183,8 @@ int tpm_config_parse(QemuOptsList *opts_list, const cha= r *optarg) QemuOpts *opts; =20 if (!strcmp(optarg, "help")) { - tpm_display_backend_drivers(); - return -1; + tpm_list_backend_drivers_hint(&error_fatal); + g_assert_not_reached(); /* Using &error_fatal triggers exit(1). */ } opts =3D qemu_opts_parse_noisily(opts_list, optarg, true); if (!opts) { --=20 2.21.3