From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25188C433F5 for ; Thu, 7 Oct 2021 16:23:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0964B61074 for ; Thu, 7 Oct 2021 16:23:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242604AbhJGQZt (ORCPT ); Thu, 7 Oct 2021 12:25:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23785 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241389AbhJGQZr (ORCPT ); Thu, 7 Oct 2021 12:25:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623833; 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=AmwLsF9obeBKpmt0bFLMFKj9ljedivTYCFvv9GIiOtM=; b=HCtpHQriHIvRewrhjmEkV7pLIasSs+um9hNIQh7veT+Nr3GFlXKPdXIxe4sXTH8z7uJnTn vFSm/FRnEbUTj432hoH5ZQC5iYdZ45+OSBuRf/rirl1pi3qbp3wXLxWDmNpGKuNbHEEKje OpN3KeMbuLoW3WmjRhB+V9Tbruyz32o= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-318-TAVTHrVHNha6Ef-AhPHwLQ-1; Thu, 07 Oct 2021 12:23:50 -0400 X-MC-Unique: TAVTHrVHNha6Ef-AhPHwLQ-1 Received: by mail-wr1-f72.google.com with SMTP id y12-20020a056000168c00b00160da4de2c7so2045041wrd.5 for ; Thu, 07 Oct 2021 09:23:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=AmwLsF9obeBKpmt0bFLMFKj9ljedivTYCFvv9GIiOtM=; b=Y+FqlAyrHHnMXhywg/0GhM3uRplT4uD1QNkc9Rm9u8p0tJTavS26GoVUGEL/G3KaL+ S7wng4hwKP6e+MsNWWSb934d80/KyUpIp2jSWlyBQHBYIb7kOOTStU/xRTF4R7xXeR1E gGsDnAkYHSM2DgENKYoxvTgEPOYO5NE1VjU/dAEFcOU5dAXlAdYZFgPIhCxq3hGpqBef yHfr/Z3M1L/WrXesKlsNXnSHlSm/EC9LMEDx/ZjLUFdHgOcTfS5IovHS/FUIGMN2Uf0U HXlwuoWxSfaKquqC+v57zWQjEYkWg/JZiAYKur7LPAMkwdJ2IM2Xbyf4a3pppJLtT8vj gAew== X-Gm-Message-State: AOAM530JC9GQRyp/wEPCPH2XQQiGhzZcMdfRIOg+LvO/rbIoGKvQoZTw HsQVSC+JHdweil62WTOkxGR+mth86dPTnyRqnHXD0u/4whefetHNrveoAEBKEP6Hi8KnDF9rBT3 M/Tz+zkCifn8f X-Received: by 2002:a1c:f405:: with SMTP id z5mr17305415wma.33.1633623829138; Thu, 07 Oct 2021 09:23:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwrkYTwlvgA3cm/U+NS4vkRGotTH4a3KcWvcpenrkvTNxWSZZ9rsdA8miKnbr5qEa0hE4o9Eg== X-Received: by 2002:a1c:f405:: with SMTP id z5mr17305399wma.33.1633623828953; Thu, 07 Oct 2021 09:23:48 -0700 (PDT) Received: from work-vm (cpc109025-salf6-2-0-cust480.10-2.cable.virginm.net. [82.30.61.225]) by smtp.gmail.com with ESMTPSA id f1sm118958wri.43.2021.10.07.09.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 09:23:48 -0700 (PDT) Date: Thu, 7 Oct 2021 17:23:46 +0100 From: "Dr. David Alan Gilbert" To: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= Cc: qemu-devel@nongnu.org, Paolo Bonzini , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , James Bottomley , Brijesh Singh , Sergio Lopez , Dov Murik Subject: Re: [PATCH v4 05/23] target/i386/sev: Prefix QMP errors with 'SEV' Message-ID: References: <20211007161716.453984-1-philmd@redhat.com> <20211007161716.453984-6-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20211007161716.453984-6-philmd@redhat.com> User-Agent: Mutt/2.0.7 (2021-05-04) Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org * Philippe Mathieu-Daudé (philmd@redhat.com) wrote: > Multiple errors might be reported to the monitor, > better to prefix the SEV ones so we can distinct them. > > Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Dr. David Alan Gilbert > --- > target/i386/monitor.c | 2 +- > target/i386/sev.c | 20 +++++++++++--------- > 2 files changed, 12 insertions(+), 10 deletions(-) > > diff --git a/target/i386/monitor.c b/target/i386/monitor.c > index 196c1c9e77f..eabbeb9be95 100644 > --- a/target/i386/monitor.c > +++ b/target/i386/monitor.c > @@ -717,7 +717,7 @@ SevLaunchMeasureInfo *qmp_query_sev_launch_measure(Error **errp) > > data = sev_get_launch_measurement(); > if (!data) { > - error_setg(errp, "Measurement is not available"); > + error_setg(errp, "SEV launch measurement is not available"); > return NULL; > } > > diff --git a/target/i386/sev.c b/target/i386/sev.c > index bcd9260fa46..4f1952cd32f 100644 > --- a/target/i386/sev.c > +++ b/target/i386/sev.c > @@ -440,7 +440,8 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain, > r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); > if (r < 0) { > if (err != SEV_RET_INVALID_LEN) { > - error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)", > + error_setg(errp, "SEV: Failed to export PDH cert" > + " ret=%d fw_err=%d (%s)", > r, err, fw_error_to_str(err)); > return 1; > } > @@ -453,7 +454,7 @@ sev_get_pdh_info(int fd, guchar **pdh, size_t *pdh_len, guchar **cert_chain, > > r = sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); > if (r < 0) { > - error_setg(errp, "failed to export PDH cert ret=%d fw_err=%d (%s)", > + error_setg(errp, "SEV: Failed to export PDH cert ret=%d fw_err=%d (%s)", > r, err, fw_error_to_str(err)); > goto e_free; > } > @@ -491,7 +492,7 @@ sev_get_capabilities(Error **errp) > > fd = open(DEFAULT_SEV_DEVICE, O_RDWR); > if (fd < 0) { > - error_setg_errno(errp, errno, "Failed to open %s", > + error_setg_errno(errp, errno, "SEV: Failed to open %s", > DEFAULT_SEV_DEVICE); > return NULL; > } > @@ -557,8 +558,9 @@ sev_get_attestation_report(const char *mnonce, Error **errp) > &input, &err); > if (ret < 0) { > if (err != SEV_RET_INVALID_LEN) { > - error_setg(errp, "failed to query the attestation report length " > - "ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err)); > + error_setg(errp, "SEV: Failed to query the attestation report" > + " length ret=%d fw_err=%d (%s)", > + ret, err, fw_error_to_str(err)); > g_free(buf); > return NULL; > } > @@ -572,7 +574,7 @@ sev_get_attestation_report(const char *mnonce, Error **errp) > ret = sev_ioctl(sev->sev_fd, KVM_SEV_GET_ATTESTATION_REPORT, > &input, &err); > if (ret) { > - error_setg_errno(errp, errno, "Failed to get attestation report" > + error_setg_errno(errp, errno, "SEV: Failed to get attestation report" > " ret=%d fw_err=%d (%s)", ret, err, fw_error_to_str(err)); > goto e_free_data; > } > @@ -596,7 +598,7 @@ sev_read_file_base64(const char *filename, guchar **data, gsize *len) > GError *error = NULL; > > if (!g_file_get_contents(filename, &base64, &sz, &error)) { > - error_report("failed to read '%s' (%s)", filename, error->message); > + error_report("SEV: Failed to read '%s' (%s)", filename, error->message); > g_error_free(error); > return -1; > } > @@ -911,7 +913,7 @@ sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **errp) > if (sev_check_state(sev_guest, SEV_STATE_LAUNCH_UPDATE)) { > int ret = sev_launch_update_data(sev_guest, ptr, len); > if (ret < 0) { > - error_setg(errp, "failed to encrypt pflash rom"); > + error_setg(errp, "SEV: Failed to encrypt pflash rom"); > return ret; > } > } > @@ -930,7 +932,7 @@ int sev_inject_launch_secret(const char *packet_hdr, const char *secret, > MemoryRegion *mr = NULL; > > if (!sev_guest) { > - error_setg(errp, "SEV: SEV not enabled."); > + error_setg(errp, "SEV not enabled for guest"); > return 1; > } > > -- > 2.31.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK