From patchwork Wed Jul 22 11:23:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1333837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Dx+gaAkS; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BBY546gmkz9sSn for ; Wed, 22 Jul 2020 21:24:08 +1000 (AEST) Received: from localhost ([::1]:37230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyCr0-0000Ej-LF for incoming@patchwork.ozlabs.org; Wed, 22 Jul 2020 07:24:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyCqf-0000CX-MS for qemu-devel@nongnu.org; Wed, 22 Jul 2020 07:23:45 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42957 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 1jyCqe-0007y5-7h for qemu-devel@nongnu.org; Wed, 22 Jul 2020 07:23:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595417023; 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=h5oXpUWch3F8Ua+y75ZO2Q633jp6+26jI2RA6vc9UC8=; b=Dx+gaAkSuhmj9A092quog0b+gEKy6olJcQZ8HmhyKxllbu4bXVQBLB3383KAI7D1+N/Sdi RNVU+/+DUBHv+pVnOa6NW6QYZBUC0lP7f74B/+ytNRbZbjREJczLvDLpzITKC0Z6vLWIRE AG+JE/UqWwoJl8/nxcGbj40j4qNHTmQ= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-hQ17zt1SMw6u7XsVVAucMA-1; Wed, 22 Jul 2020 07:23:41 -0400 X-MC-Unique: hQ17zt1SMw6u7XsVVAucMA-1 Received: by mail-ed1-f72.google.com with SMTP id k2so640181edn.12 for ; Wed, 22 Jul 2020 04:23:41 -0700 (PDT) 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=h5oXpUWch3F8Ua+y75ZO2Q633jp6+26jI2RA6vc9UC8=; b=WRLAiRRg4OKPPsUrEAmIfY5Zrd7xjVTjPtzIjYU24hBdSqAEaZzbOPGfvS80MuPgIL yz2KJfh89aXbmFTh9zzdy2e+GrfiTSLAVAzPSqvjXe8WpQINg+nvaWL5+zfMVFCHkPsU RbQ86RYH+Dr2sqvlurEh7IWbd33LJDvZu2RZATy/oku7w5isI+Hm0DwfDB0W0M9iCILZ 3dYQr1bCIb8ioVjCBE/jtnBwiTkusXY04Gb+Z/bE3OSDB24DuCIHLE7Ga1k/1BqIrdHr NlnejsvqDeC+7BPDD/+xWyTDz4DuLkUNjBlFlmWwkRVFLWD2YjDzNMDTcF/0Nq++h3QZ TRZQ== X-Gm-Message-State: AOAM532R2vzE67iKJyl9tJ76fnbIVOVrUBUV2axPzDczFw1CqbRudHOG L9QYw6a89Rq6LZeDcm1PBQDoBHhE1F6YkXaNoWEG8RYvE8OFvXpQp1v4IA6pP7f2h88zrdMTxrd 3LFFQbP/AKqbGoaI= X-Received: by 2002:a17:906:17c1:: with SMTP id u1mr20482944eje.536.1595417020356; Wed, 22 Jul 2020 04:23:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/llDMwXF4x09TLsPxBCJhxi+rgC7SA075GNe/B3qIiDjpJPQr0XSMA9BDcWp905ket4MUwQ== X-Received: by 2002:a17:906:17c1:: with SMTP id u1mr20482935eje.536.1595417020190; Wed, 22 Jul 2020 04:23:40 -0700 (PDT) Received: from x1w.redhat.com (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id e22sm18541984ejd.36.2020.07.22.04.23.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 04:23:39 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.1 1/2] tpm: Display when no backend is available Date: Wed, 22 Jul 2020 13:23:32 +0200 Message-Id: <20200722112333.29966-2-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200722112333.29966-1-philmd@redhat.com> References: <20200722112333.29966-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/21 23:27:14 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_Mathieu-Daud=C3=A9?= , Markus Armbruster , Stefan Berger Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Display "No TPM backend available in this binary." error when no backend is available. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Berger --- 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); } +/* + * Walk the list of available TPM backend drivers and count them. + */ +static int tpm_backend_drivers_count(void) +{ + int count = 0, i; + + for (i = 0; i < TPM_TYPE__MAX; i++) { + const TPMBackendClass *bc = 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; + 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; From patchwork Wed Jul 22 11:23:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1333838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=bxDQ23RV; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BBY5953jbz9sQt for ; Wed, 22 Jul 2020 21:24:13 +1000 (AEST) Received: from localhost ([::1]:37486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyCr5-0000MI-Dn for incoming@patchwork.ozlabs.org; Wed, 22 Jul 2020 07:24:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyCqk-0000KU-Pj for qemu-devel@nongnu.org; Wed, 22 Jul 2020 07:23:50 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:29939 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 1jyCqj-0007yO-4Y for qemu-devel@nongnu.org; Wed, 22 Jul 2020 07:23:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595417028; 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=yrbqFvmIKnjyDf9/OryLKH0ntyIN25/qYYjTu4IPCmw=; b=bxDQ23RV5vzebvmMLlCUZ9RDMQZ2gSZKmMst0IonetVKLIdZcj8M8jIZHY04SHfEuXZ0/B P3OU1oMZ9L7WN7NlWjmAxpUuywrKOn7NzfvnNlLJG2TUoXNoY8WRcX+/Q35ArnO3jZjGsR dwsTVnZZQh2BjJjxP6IUNukg3XurtJk= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-9XEKb-NTOQuMQ8H6or0aUA-1; Wed, 22 Jul 2020 07:23:46 -0400 X-MC-Unique: 9XEKb-NTOQuMQ8H6or0aUA-1 Received: by mail-ej1-f71.google.com with SMTP id cf15so887304ejb.6 for ; Wed, 22 Jul 2020 04:23:46 -0700 (PDT) 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=yrbqFvmIKnjyDf9/OryLKH0ntyIN25/qYYjTu4IPCmw=; b=ltW/eRJgrWxMW2jM7yO+OpKOe9seV3Xtgyo/BDZgdQ0WFj+pwugWrgBXUcUQixTGuB m+OKr6sPzDF7lLbBCPIpaSDEBb8Iboa/Ls/4nUawnbcqh3y8AZG+hU+C4RmEUe/W7Vaj evESj1aWXKUlizuzcywf90BKWiFoSw5F8fYHO4cAFStJVtkOkldaVeATTHBT2g9p0riB UQL3nHyCcpdOcAHS8JdLcVu2RtR1finpqFbXV7NUqAA2G62bIt4QIKuG/8QUR0rI57S3 oWZYVPqziHOBWm9v/6B/ZRACbvVVKkhUu+WSVe/7ASY2H9NwSvNwU37f5ZuPOqIYvA3U GXPg== X-Gm-Message-State: AOAM532FxvdWBwObZT95SEF+HJ4go2X1e0WdeY2euQk1rR5U58sKdkYi BNRJtFTmeHnuXemqy/N9Roa5suHqNTPulNnq5Bt/ajf0fF180uJqHEIDAjRoSNxBWizO/OmuFFj OaqmEW8XBBG+TA/w= X-Received: by 2002:a17:906:a84d:: with SMTP id dx13mr28187838ejb.246.1595417025320; Wed, 22 Jul 2020 04:23:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw7AK71tp9g4bDc/z5K5txCzOy7B3/ZYdvnKwBw8s5iWKkcuWCw434qEx20qvm0tsDWL2faaw== X-Received: by 2002:a17:906:a84d:: with SMTP id dx13mr28187820ejb.246.1595417025123; Wed, 22 Jul 2020 04:23:45 -0700 (PDT) Received: from x1w.redhat.com (138.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.138]) by smtp.gmail.com with ESMTPSA id jo25sm18530650ejb.116.2020.07.22.04.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 04:23:44 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH-for-5.1 2/2] tpm: List the available TPM backends Date: Wed, 22 Jul 2020 13:23:33 +0200 Message-Id: <20200722112333.29966-3-philmd@redhat.com> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200722112333.29966-1-philmd@redhat.com> References: <20200722112333.29966-1-philmd@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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/21 23:34:34 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_Mathieu-Daud=C3=A9?= , Markus Armbruster , Stefan Berger Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é --- RFC because this is now odd in tpm_config_parse(): tpm_list_backend_drivers_hint(&error_fatal); return -1; --- tpm.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tpm.c b/tpm.c index e36803a64d..358566cb10 100644 --- a/tpm.c +++ b/tpm.c @@ -58,23 +58,21 @@ static int tpm_backend_drivers_count(void) } /* - * 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 hint. */ -static void tpm_display_backend_drivers(void) +static void tpm_list_backend_drivers_hint(Error **errp) { int i; - fprintf(stderr, "Supported TPM types (choose only one):\n"); + error_append_hint(errp, "Supported TPM types (choose only one):\n"); for (i = 0; i < TPM_TYPE__MAX; i++) { const TPMBackendClass *bc = 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"); } /* @@ -97,6 +95,7 @@ TPMBackend *qemu_find_tpm_be(const char *id) 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 = 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; } @@ -131,7 +130,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp) if (be == 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; } @@ -184,7 +183,7 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg) QemuOpts *opts; if (!strcmp(optarg, "help")) { - tpm_display_backend_drivers(); + tpm_list_backend_drivers_hint(&error_fatal); return -1; } opts = qemu_opts_parse_noisily(opts_list, optarg, true);