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=-15.1 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_SANE_1 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 B8F6AC433EF for ; Fri, 10 Sep 2021 13:47: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 29CA3611C9 for ; Fri, 10 Sep 2021 13:47:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29CA3611C9 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]:43624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mOgs9-0006LE-Bm for qemu-devel@archiver.kernel.org; Fri, 10 Sep 2021 09:47:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOgr5-0004m8-2S for qemu-devel@nongnu.org; Fri, 10 Sep 2021 09:46:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:26238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mOgr3-0001Mt-8r for qemu-devel@nongnu.org; Fri, 10 Sep 2021 09:46:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631281568; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=q4/gb+qVUAomME3TjVIdhuX90g7r+OwtBqpGKOAdhhw=; b=RsT+6TAkDCH2vsPvMkwyX4+AJ/S6vnVvt8arQ1Z1nQNWaZ+65ZGqoM+6dChh3zOu9DUIsF LrYyctJNtjLon9vgEAY+ScLq/gWPohhWA3gDm+UVxoV5cnUZzFCD3fvsmrBF0GdCs+GtnT uVXC+ytU1xrEUvHZvRAd/shYV0W6ZWo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-248-472B_ZBXPom5HVQwXuXPgg-1; Fri, 10 Sep 2021 09:46:05 -0400 X-MC-Unique: 472B_ZBXPom5HVQwXuXPgg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 37D9610247A6; Fri, 10 Sep 2021 13:46:04 +0000 (UTC) Received: from redhat.com (unknown [10.39.194.181]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B410719D9F; Fri, 10 Sep 2021 13:46:02 +0000 (UTC) Date: Fri, 10 Sep 2021 14:46:00 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Yang Zhong Subject: Re: [PATCH v2 1/3] monitor: Add HMP and QMP interfaces Message-ID: References: <20210910102258.46648-1-yang.zhong@intel.com> <20210910102258.46648-2-yang.zhong@intel.com> MIME-Version: 1.0 In-Reply-To: <20210910102258.46648-2-yang.zhong@intel.com> User-Agent: Mutt/2.0.7 (2021-05-04) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, 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_H2=-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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: pbonzini@redhat.com, philmd@redhat.com, qemu-devel@nongnu.org, eblake@redhat.com, seanjc@google.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Sep 10, 2021 at 06:22:56PM +0800, Yang Zhong wrote: > The QMP and HMP interfaces can be used by monitor or QMP tools to retrieve > the SGX information from VM side when SGX is enabled on Intel platform. > > Signed-off-by: Yang Zhong > --- > hmp-commands-info.hx | 15 +++++++++++++ > hw/i386/sgx.c | 29 ++++++++++++++++++++++++ > include/hw/i386/sgx.h | 11 +++++++++ > include/monitor/hmp-target.h | 1 + > qapi/misc-target.json | 43 ++++++++++++++++++++++++++++++++++++ > target/i386/monitor.c | 36 ++++++++++++++++++++++++++++++ > tests/qtest/qmp-cmd-test.c | 1 + > 7 files changed, 136 insertions(+) > create mode 100644 include/hw/i386/sgx.h > diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c > index 02fa6487c3..8a32d62d7e 100644 > --- a/hw/i386/sgx.c > +++ b/hw/i386/sgx.c > @@ -17,6 +17,35 @@ > #include "monitor/qdev.h" > #include "qapi/error.h" > #include "exec/address-spaces.h" > +#include "hw/i386/sgx.h" > + > +SGXInfo *sgx_get_info(void) I'd suggest this should have an 'Error **errp' > +{ > + SGXInfo *info = NULL; > + X86MachineState *x86ms; > + PCMachineState *pcms = > + (PCMachineState *)object_dynamic_cast(qdev_get_machine(), > + TYPE_PC_MACHINE); > + if (!pcms) { error_setg(errp, "SGX is only available for x86 PC machines"); > + return NULL; > + } > + > + x86ms = X86_MACHINE(pcms); > + if (!x86ms->sgx_epc_list) { error_setg(errp "SGX is not enabled on this machine"); > + return NULL; > + } > + > + SGXEPCState *sgx_epc = &pcms->sgx_epc; > + info = g_new0(SGXInfo, 1); > + > + info->sgx = true; > + info->sgx1 = true; > + info->sgx2 = true; > + info->flc = true; > + info->section_size = sgx_epc->size; > + > + return info; > +} > diff --git a/target/i386/monitor.c b/target/i386/monitor.c > index 119211f0b0..0f1b48b4f8 100644 > --- a/target/i386/monitor.c > +++ b/target/i386/monitor.c > @@ -35,6 +35,7 @@ > #include "qapi/qapi-commands-misc-target.h" > #include "qapi/qapi-commands-misc.h" > #include "hw/i386/pc.h" > +#include "hw/i386/sgx.h" > > /* Perform linear address sign extension */ > static hwaddr addr_canonical(CPUArchState *env, hwaddr addr) > @@ -763,3 +764,38 @@ qmp_query_sev_attestation_report(const char *mnonce, Error **errp) > { > return sev_get_attestation_report(mnonce, errp); > } > + > +SGXInfo *qmp_query_sgx(Error **errp) > +{ > + SGXInfo *info; > + > + info = sgx_get_info(); Pass errp into this > + if (!info) { > + error_setg(errp, "SGX features are not available"); And get rid of this. > + return NULL; > + } > + > + return info; > +} > + > +void hmp_info_sgx(Monitor *mon, const QDict *qdict) > +{ g_autoptr(Error) err = NULL > + SGXInfo *info = qmp_query_sgx(NULL); Pass in &err not NULL; Also declare it with 'g_autoptr(SGXInfo) info = ...' And then if (err) { monitor_printf(mon, "%s\n", error_get_pretty(err); return; } > + > + if (info && info->sgx) { > + monitor_printf(mon, "SGX support: %s\n", > + info->sgx ? "enabled" : "disabled"); > + monitor_printf(mon, "SGX1 support: %s\n", > + info->sgx1 ? "enabled" : "disabled"); > + monitor_printf(mon, "SGX2 support: %s\n", > + info->sgx2 ? "enabled" : "disabled"); > + monitor_printf(mon, "FLC support: %s\n", > + info->flc ? "enabled" : "disabled"); > + monitor_printf(mon, "size: %" PRIu64 "\n", > + info->section_size); > + } else { > + monitor_printf(mon, "SGX is not enabled\n"); > + } Now you can remove the if/else and just print the result > + > + qapi_free_SGXInfo(info); This can be dropped with the g_autoptr usage Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|