From nobody Mon Feb 9 09:43:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1633623465; cv=none; d=zohomail.com; s=zohoarc; b=VRNyOvNUkVSK3qv/87Cu1PCDxQ1IHgftyy1sggOBlGeA3OV4BQNmX+oiUSvjIBXO2fY+/OoWIdzj76Un1t2ug9H1H5OF6oSrjrM0tFpIoyUvGbBo96hlJwwhwW96Jyl9bkAclpfORuZQ4/db/0UcmwyUN+JsZENmxt6JB+KcC6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633623465; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=YWQW4qwuIwVFhirEUS8iXAcoBuFkj6ZGIrq5y79ZQBA=; b=boEnestCGyM+R8kHvM48e+phGd7BYcZGV9JfR2zunLoS0ih3su0WoXNynbJXhXCmGcWVi15+vi0RJKj78Gy7tIW0w5e1RL58ANdRuVYhZH58VQzbP4hv2/wNRYulxTQqaQTd6OOC/WxqZ0gVtJb+gYwcJiCaqunOIPVwYqHl4BU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1633623465375105.82058788575387; Thu, 7 Oct 2021 09:17:45 -0700 (PDT) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-250-hAnHzWsMO7qapDhsok__JQ-1; Thu, 07 Oct 2021 12:17:42 -0400 Received: by mail-wr1-f70.google.com with SMTP id m17-20020adffa11000000b00160c1ac74e9so5119790wrr.9 for ; Thu, 07 Oct 2021 09:17:42 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (118.red-83-35-24.dynamicip.rima-tde.net. [83.35.24.118]) by smtp.gmail.com with ESMTPSA id e5sm88818wrd.1.2021.10.07.09.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 09:17:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623464; 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=YWQW4qwuIwVFhirEUS8iXAcoBuFkj6ZGIrq5y79ZQBA=; b=ZVStX8WQ/vDYglNvj95se+TUlnLiFIScGjBKNl8uX4OL/JrPa15RsV/s7zTlmqH0pXvrwq SJqKjwpRVtXpyqrcQO2wN6oo+BuukcnzZU6cpCJfLLpeuwOJKJq2WpB90WQplQCxu1Jelz 6/1po4Yf0Hg2/9fZBU5w12rY+qdBDGA= X-MC-Unique: hAnHzWsMO7qapDhsok__JQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YWQW4qwuIwVFhirEUS8iXAcoBuFkj6ZGIrq5y79ZQBA=; b=iew/XHXLMqRv0VLjAps5Ie23dGm4xL9ABLpJigNhxT8ubkHneUMNWP/7qkX0tr8az3 GIlYqRmY7pTp2rQDP1bLFKnpzOmgGaTfjgwHIs7UUlbIZDsG2d85YX9nj3B3NCHtZo6W MPMBTX9Ajqir2fr+psZh0S5RoT1abEdE8jp+li2x2QzRNAX4eDvG0jDjZuYmCt7hE/+w U5DbxWSjwbnUiBhHkaFkyoc2wwrP34A9x4TIjy7/uhf8YfS7VHHHGkbjZ2vPKK4fiVbX rDYFMEgajjUUsaIgxbhqDfGjkh/bU3OvMMiPVvTSpbtiY5xlAPDezv9njVxZsIRXvnPq lXMg== X-Gm-Message-State: AOAM5328DLPPjPLmuJDBO4osKkAn2P2Wq9K2s04JHWanIJ7/ZRhZGVfm SZ1WfNzFMVFQSkCjTmaGLXmU8RsQAAE42txgg18VIHD0q7fnahBX/lxDXGc8FcnkAkFCipX4NPH G1SclPYeavmEG2g== X-Received: by 2002:a05:600c:190c:: with SMTP id j12mr17723304wmq.122.1633623461588; Thu, 07 Oct 2021 09:17:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx4KQBsttMSUVTx9ahdzw6VyJFfQYYcVssfVN4N4+Jw4Mj8STX+6QzmCQF2fKgdLkdMPO9omQ== X-Received: by 2002:a05:600c:190c:: with SMTP id j12mr17723282wmq.122.1633623461414; Thu, 07 Oct 2021 09:17:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , James Bottomley , Brijesh Singh , Sergio Lopez , Dov Murik , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v4 05/23] target/i386/sev: Prefix QMP errors with 'SEV' Date: Thu, 7 Oct 2021 18:16:58 +0200 Message-Id: <20211007161716.453984-6-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007161716.453984-1-philmd@redhat.com> References: <20211007161716.453984-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" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1633623466997100001 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=C3=A9 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(Erro= r **errp) =20 data =3D sev_get_launch_measurement(); if (!data) { - error_setg(errp, "Measurement is not available"); + error_setg(errp, "SEV launch measurement is not available"); return NULL; } =20 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 =3D sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); if (r < 0) { if (err !=3D SEV_RET_INVALID_LEN) { - error_setg(errp, "failed to export PDH cert ret=3D%d fw_err=3D= %d (%s)", + error_setg(errp, "SEV: Failed to export PDH cert" + " ret=3D%d fw_err=3D%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, =20 r =3D sev_platform_ioctl(fd, SEV_PDH_CERT_EXPORT, &export, &err); if (r < 0) { - error_setg(errp, "failed to export PDH cert ret=3D%d fw_err=3D%d (= %s)", + error_setg(errp, "SEV: Failed to export PDH cert ret=3D%d fw_err= =3D%d (%s)", r, err, fw_error_to_str(err)); goto e_free; } @@ -491,7 +492,7 @@ sev_get_capabilities(Error **errp) =20 fd =3D 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 !=3D SEV_RET_INVALID_LEN) { - error_setg(errp, "failed to query the attestation report lengt= h " - "ret=3D%d fw_err=3D%d (%s)", ret, err, fw_error_to_str= (err)); + error_setg(errp, "SEV: Failed to query the attestation report" + " length ret=3D%d fw_err=3D%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 =3D 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 repo= rt" " ret=3D%d fw_err=3D%d (%s)", ret, err, fw_error_to_str(er= r)); goto e_free_data; } @@ -596,7 +598,7 @@ sev_read_file_base64(const char *filename, guchar **dat= a, gsize *len) GError *error =3D NULL; =20 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->mes= sage); g_error_free(error); return -1; } @@ -911,7 +913,7 @@ sev_encrypt_flash(uint8_t *ptr, uint64_t len, Error **e= rrp) if (sev_check_state(sev_guest, SEV_STATE_LAUNCH_UPDATE)) { int ret =3D 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, co= nst char *secret, MemoryRegion *mr =3D NULL; =20 if (!sev_guest) { - error_setg(errp, "SEV: SEV not enabled."); + error_setg(errp, "SEV not enabled for guest"); return 1; } =20 --=20 2.31.1