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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB03EC48BD1 for ; Thu, 10 Jun 2021 06:48:12 +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 87F19613E2 for ; Thu, 10 Jun 2021 06:48:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 87F19613E2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrEU7-0001wd-IB for qemu-devel@archiver.kernel.org; Thu, 10 Jun 2021 02:48:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrESJ-0007b4-OK for qemu-devel@nongnu.org; Thu, 10 Jun 2021 02:46:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28455) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrESG-0005E5-UB for qemu-devel@nongnu.org; Thu, 10 Jun 2021 02:46:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623307576; 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=qAeYox9UkBZPHYKkLVvU16TBQxc6Vg+PmuhGEFonMEo=; b=KVIw1crK1ozf8htPQGLqlP7geu6ZaM5QrEhZnkuOWRCBKvjwoehqUj/0vq3QHyCb2/tfFZ VcfQ5dLTCyWuaKBK50Xa7XkrsMh4hMGeMFF+vpcT9h8YzolID4mf2Nzlg1tHCNPjhzV60S Apt9mBTDow/yFqszavHWMTP7+gi/bZ8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-427-RUaZUZmUO8a71ZFaArt9cg-1; Thu, 10 Jun 2021 02:46:13 -0400 X-MC-Unique: RUaZUZmUO8a71ZFaArt9cg-1 Received: by mail-wr1-f71.google.com with SMTP id z4-20020adfe5440000b0290114f89c9931so415270wrm.17 for ; Wed, 09 Jun 2021 23:46:12 -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=qAeYox9UkBZPHYKkLVvU16TBQxc6Vg+PmuhGEFonMEo=; b=K6pDAcaHt3tg9bbFbKjqilKihRuR7/HdwWjruiaIcr525tXshp/o7KOj4NVAbOaWN2 EJ3XhLfNG0heWrqxXvkfkwdjPP4mghIZ8bN73UKGmtRcuaqmexoSW7EXlXRhjkgchVca s5igXImr/itSrLqofcwScre7o2ice00yQFUKYoaR5c/yRkZmR6x/112e1FdaIewvLMsJ V0tLvkdRYhRZ5VL3XeCwRla52MZXJlYdSfvIQFYalHsWx42OpIacEWK174pT7GsTVTP6 HdaTTcEd+ORREvpX5RV/5Im78iTajLpG/uLoOyFIXLVeOgvk93ol4jiOnY+P7gmS4yTR 36fQ== X-Gm-Message-State: AOAM5304pJwD99kiLCTRiqUwjPO7BWK3kzeV77TbiRHDG9Kg5GkoMb9I troOhH3kFgxPit8E+e2DPilwrBG1RGw0QZL3U1A3ghx1gbLvH9E30bnLDkz7CBPQjOqHijsbIw8 JqOro66nohhujXMd1t08xrncHuQ4K3Om1j84xWdvkRVPS84f+tlcRmR1VoS36zPTk X-Received: by 2002:a1c:c90f:: with SMTP id f15mr13488947wmb.142.1623307571695; Wed, 09 Jun 2021 23:46:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw6Hq00i0ztkKyzUvWxnzo1iEeA/63BuNypt08r8vuuELaHl+8hw5IieEoeFEuIHHuDDp5dsA== X-Received: by 2002:a1c:c90f:: with SMTP id f15mr13488926wmb.142.1623307571548; Wed, 09 Jun 2021 23:46:11 -0700 (PDT) Received: from x1w.redhat.com (235.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.235]) by smtp.gmail.com with ESMTPSA id g23sm8523342wmk.3.2021.06.09.23.46.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 23:46:11 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 03/11] target/i386/monitor: Return QMP error when SEV is disabled in build Date: Thu, 10 Jun 2021 08:45:48 +0200 Message-Id: <20210610064556.1421620-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210610064556.1421620-1-philmd@redhat.com> References: <20210610064556.1421620-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: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Brijesh Singh , Connor Kuehl , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Dr . David Alan Gilbert" , Markus Armbruster , Eric Blake Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" If the management layer tries to inject a secret, it gets an empty response in case the binary built without SEV: { "execute": "sev-inject-launch-secret", "arguments": { "packet-header": "mypkt", "secret": "mypass", "gpa": 4294959104 } } { "return": { } } Make it clearer by returning an error, mentioning the feature is disabled: { "execute": "sev-inject-launch-secret", "arguments": { "packet-header": "mypkt", "secret": "mypass", "gpa": 4294959104 } } { "error": { "class": "GenericError", "desc": "this feature or command is not currently supported" } } Signed-off-by: Philippe Mathieu-Daudé --- target/i386/monitor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/monitor.c b/target/i386/monitor.c index 119211f0b06..c83cca80dc2 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" @@ -742,6 +743,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, QERR_UNSUPPORTED); + return; + } if (!has_gpa) { uint8_t *data; struct sev_secret_area *area; -- 2.31.1