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 29730C433F5 for ; Wed, 13 Oct 2021 09:15:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C0073610CE for ; Wed, 13 Oct 2021 09:15:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C0073610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1maaM0-0002xr-TW for qemu-devel@archiver.kernel.org; Wed, 13 Oct 2021 05:15:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1maaEl-0002Fa-E8 for qemu-devel@nongnu.org; Wed, 13 Oct 2021 05:07:48 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:35653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1maaEh-0005hm-9Z for qemu-devel@nongnu.org; Wed, 13 Oct 2021 05:07:47 -0400 Received: by mail-ed1-x531.google.com with SMTP id w19so7362093edd.2 for ; Wed, 13 Oct 2021 02:07:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vu1dBQYjlPMeD+bu2re3t6lrd4Enxp4xeWWzptccB38=; b=p01dKUSbEV49MZMNsEcKPIzfqdfmtkwBQu4b9cIhX7TOS7DBY/77eH9x/gJh8XX55n nXEWDo2Xqe1QwEVyLJmtRIOOI8ujn0OEfJzMKWn6k2BrX0MnoRzgMQ2aBNdpTTGOtETd kN4ZJbRpD4kgH8zkrat7wPpgaGSmejG3PH7QaVKikRpIUviO/GLcvWY/x37s13VHxlWF JMdBPB9sQ9FSDgYN/jEA+WEL1U/YWqgQx134KmS1J/wTNXc1pD5XAo6mBb58JFgU1IgI JYChvqHHXQfPJ62aKkEXlluZYv5Bh10rSDk0lwG7lBRcm7+lhwy0poSTKTq2AUmT8+rD ad0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vu1dBQYjlPMeD+bu2re3t6lrd4Enxp4xeWWzptccB38=; b=22RWF5fHf0eQpIz+wYVH3Z7POUXp9e5t8Ep44BXFaeAiAbfA46rwFTh+HrLJS/gLsE OIfxA4VZmzRavPldAvyBoFOrZREyPyA/5nnVFGmRlsNPVBEWb6pfKg1vk7f6mnAdXqdT c/VZCmShYl/lyPtWEq35BlIx+e0jj8nideox1NW7T0iljyPwOr5RP68xO+Lr1qXBzcaH bBczwC4PhHrxZuPHRSd8LAgjI4Fcna6YbU4WzXA0VmHjNa8KRESPVVvicx9yXobFxoWK BNx/IuKMt2VPpWRpRmDGHdfT2Ct0+ejxo6oQJg+A0BhMK/t4l1M4qNpx/OqdxZF2R2Qk 4aPQ== X-Gm-Message-State: AOAM530bUgQX7O9qoUlwnN9v1UcAWZahinTZ7dq53/n1gv1SnZ4Oa3am 8EUAhNyHBOEF3psCmKpsSykMpyPBG4U= X-Google-Smtp-Source: ABdhPJw9+8z42YwwztR8UCTDcYE97tDFmDTiB/bwO+5zo5V+j5y8/lHbeIKPjsOAx5iCIoZjKnuDBQ== X-Received: by 2002:a17:906:ccde:: with SMTP id ot30mr17457924ejb.121.1634116057603; Wed, 13 Oct 2021 02:07:37 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id c6sm6177849ejb.41.2021.10.13.02.07.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Oct 2021 02:07:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/40] target/i386/monitor: Return QMP error when SEV is not enabled for guest Date: Wed, 13 Oct 2021 11:06:59 +0200 Message-Id: <20211013090728.309365-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211013090728.309365-1-pbonzini@redhat.com> References: <20211013090728.309365-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Connor Kuehl , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé If the management layer tries to inject a secret, it gets an empty response in case the guest doesn't have SEV enabled, or the binary is built without SEV: { "execute": "sev-inject-launch-secret", "arguments": { "packet-header": "mypkt", "secret": "mypass", "gpa": 4294959104 } } { "return": { } } Make it clearer by returning an error: { "execute": "sev-inject-launch-secret", "arguments": { "packet-header": "mypkt", "secret": "mypass", "gpa": 4294959104 } } { "error": { "class": "GenericError", "desc": "SEV not enabled for guest" } } Note: we will remove the sev_inject_launch_secret() stub in few commits, so we don't bother to add error_setg() there. Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Connor Kuehl Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20211007161716.453984-7-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index eabbeb9be9..ea836678f5 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -28,6 +28,7 @@ #include "monitor/hmp-target.h" #include "monitor/hmp.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qerror.h" #include "sysemu/kvm.h" #include "sysemu/sev.h" #include "qapi/error.h" @@ -743,6 +744,10 @@ void qmp_sev_inject_launch_secret(const char *packet_hdr, bool has_gpa, uint64_t gpa, Error **errp) { + if (!sev_enabled()) { + error_setg(errp, "SEV not enabled for guest"); + return; + } if (!has_gpa) { uint8_t *data; struct sev_secret_area *area; -- 2.31.1