From nobody Mon Feb 9 17:06:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591909621; cv=none; d=zohomail.com; s=zohoarc; b=l9J6SdILSv02cARjLNnCguecv6y/O5c9Y5qS/4y/86pOql7CymIdCSKun/scSSx3uxjABaDvCCXWMQnKejESx0GOAI/lSlvRFO0KXarGMWjMDVzr5/y7VH6X7G6iQEZaR/kNHEFRJGao5CRyWw0XOxmKEHwxMOs8YIZ4P+XVnmY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591909621; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rH/ZRONMPh9IjqYbOFigbB9B9pKvj83UfzobVXF1za8=; b=YTFbqSKwzXYvo8VkTSSPCT5sTQdae5n4H4KkwFbimlrlxyOvjwNoorjiSCpGow4B60Y+sXNyhCs/IorVNCJgDZ/BaJ/Bf5c+1fmVY6TdxBhLq/+kEQVj3ppZNitMgSEZpfWRVqqpvda/7HBcfLCmdR3SO1L6a5d5Fbal78QqMh8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1591909621115602.9527869587967; Thu, 11 Jun 2020 14:07:01 -0700 (PDT) Received: from localhost ([::1]:33346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjUPb-0003JH-Td for importer@patchew.org; Thu, 11 Jun 2020 17:06:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjTAS-0001zY-9f for qemu-devel@nongnu.org; Thu, 11 Jun 2020 15:47:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28089 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jjTAO-0001Qc-Tu for qemu-devel@nongnu.org; Thu, 11 Jun 2020 15:47:15 -0400 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-189-svuejcEfP52MH-OHaU3Phg-1; Thu, 11 Jun 2020 15:47:10 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 039B79116F; Thu, 11 Jun 2020 19:47:09 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56EFA60CC0; Thu, 11 Jun 2020 19:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591904832; 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=rH/ZRONMPh9IjqYbOFigbB9B9pKvj83UfzobVXF1za8=; b=Copq0zFuR+nDNvjuMKHMEHaq5JwcAZYPKipR4KsVBFlNrz+boRsiXrogKEvdja01Tj5aG5 +rotoUjTzcJPSKz/kXTiPLKhn6atI6Ta4RVNkQhpNRNUPg5mNpa+yIX88B96bZ6Md8KnYC 0Ev3sFaeidukB99xbCQLsprWVkN9bng= X-MC-Unique: svuejcEfP52MH-OHaU3Phg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 102/115] target/i386: sev: Rename QSevGuestInfo Date: Thu, 11 Jun 2020 15:44:36 -0400 Message-Id: <20200611194449.31468-103-pbonzini@redhat.com> In-Reply-To: <20200611194449.31468-1-pbonzini@redhat.com> References: <20200611194449.31468-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/11 08:37:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: David Gibson At the moment this is a purely passive object which is just a container for information used elsewhere, hence the name. I'm going to change that though, so as a preliminary rename it to SevGuestState. That name risks confusion with both SEVState and SevState, but I'll be working on that in following patches. Signed-off-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20200604064219.436242-4-david@gibson.dropbear.id.au> Signed-off-by: Paolo Bonzini --- target/i386/sev.c | 87 ++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/target/i386/sev.c b/target/i386/sev.c index 53def5f41a..b6ed719fb5 100644 --- a/target/i386/sev.c +++ b/target/i386/sev.c @@ -29,22 +29,23 @@ #include "trace.h" #include "migration/blocker.h" =20 -#define TYPE_QSEV_GUEST_INFO "sev-guest" -#define QSEV_GUEST_INFO(obj) \ - OBJECT_CHECK(QSevGuestInfo, (obj), TYPE_QSEV_GUEST_INFO) +#define TYPE_SEV_GUEST "sev-guest" +#define SEV_GUEST(obj) \ + OBJECT_CHECK(SevGuestState, (obj), TYPE_SEV_GUEST) =20 -typedef struct QSevGuestInfo QSevGuestInfo; +typedef struct SevGuestState SevGuestState; =20 /** - * QSevGuestInfo: + * SevGuestState: * - * The QSevGuestInfo object is used for creating a SEV guest. + * The SevGuestState object is used for creating and managing a SEV + * guest. * * # $QEMU \ * -object sev-guest,id=3Dsev0 \ * -machine ...,memory-encryption=3Dsev0 */ -struct QSevGuestInfo { +struct SevGuestState { Object parent_obj; =20 char *sev_device; @@ -57,7 +58,7 @@ struct QSevGuestInfo { }; =20 struct SEVState { - QSevGuestInfo *sev_info; + SevGuestState *sev_info; uint8_t api_major; uint8_t api_minor; uint8_t build_id; @@ -235,82 +236,82 @@ static struct RAMBlockNotifier sev_ram_notifier =3D { }; =20 static void -qsev_guest_finalize(Object *obj) +sev_guest_finalize(Object *obj) { } =20 static char * -qsev_guest_get_session_file(Object *obj, Error **errp) +sev_guest_get_session_file(Object *obj, Error **errp) { - QSevGuestInfo *s =3D QSEV_GUEST_INFO(obj); + SevGuestState *s =3D SEV_GUEST(obj); =20 return s->session_file ? g_strdup(s->session_file) : NULL; } =20 static void -qsev_guest_set_session_file(Object *obj, const char *value, Error **errp) +sev_guest_set_session_file(Object *obj, const char *value, Error **errp) { - QSevGuestInfo *s =3D QSEV_GUEST_INFO(obj); + SevGuestState *s =3D SEV_GUEST(obj); =20 s->session_file =3D g_strdup(value); } =20 static char * -qsev_guest_get_dh_cert_file(Object *obj, Error **errp) +sev_guest_get_dh_cert_file(Object *obj, Error **errp) { - QSevGuestInfo *s =3D QSEV_GUEST_INFO(obj); + SevGuestState *s =3D SEV_GUEST(obj); =20 return g_strdup(s->dh_cert_file); } =20 static void -qsev_guest_set_dh_cert_file(Object *obj, const char *value, Error **errp) +sev_guest_set_dh_cert_file(Object *obj, const char *value, Error **errp) { - QSevGuestInfo *s =3D QSEV_GUEST_INFO(obj); + SevGuestState *s =3D SEV_GUEST(obj); =20 s->dh_cert_file =3D g_strdup(value); } =20 static char * -qsev_guest_get_sev_device(Object *obj, Error **errp) +sev_guest_get_sev_device(Object *obj, Error **errp) { - QSevGuestInfo *sev =3D QSEV_GUEST_INFO(obj); + SevGuestState *sev =3D SEV_GUEST(obj); =20 return g_strdup(sev->sev_device); } =20 static void -qsev_guest_set_sev_device(Object *obj, const char *value, Error **errp) +sev_guest_set_sev_device(Object *obj, const char *value, Error **errp) { - QSevGuestInfo *sev =3D QSEV_GUEST_INFO(obj); + SevGuestState *sev =3D SEV_GUEST(obj); =20 sev->sev_device =3D g_strdup(value); } =20 static void -qsev_guest_class_init(ObjectClass *oc, void *data) +sev_guest_class_init(ObjectClass *oc, void *data) { object_class_property_add_str(oc, "sev-device", - qsev_guest_get_sev_device, - qsev_guest_set_sev_device); + sev_guest_get_sev_device, + sev_guest_set_sev_device); object_class_property_set_description(oc, "sev-device", "SEV device to use"); object_class_property_add_str(oc, "dh-cert-file", - qsev_guest_get_dh_cert_file, - qsev_guest_set_dh_cert_file); + sev_guest_get_dh_cert_file, + sev_guest_set_dh_cert_file); object_class_property_set_description(oc, "dh-cert-file", "guest owners DH certificate (encoded with base64)"); object_class_property_add_str(oc, "session-file", - qsev_guest_get_session_file, - qsev_guest_set_session_file); + sev_guest_get_session_file, + sev_guest_set_session_file); object_class_property_set_description(oc, "session-file", "guest owners session parameters (encoded with base64)"); } =20 static void -qsev_guest_init(Object *obj) +sev_guest_instance_init(Object *obj) { - QSevGuestInfo *sev =3D QSEV_GUEST_INFO(obj); + SevGuestState *sev =3D SEV_GUEST(obj); =20 sev->sev_device =3D g_strdup(DEFAULT_SEV_DEVICE); sev->policy =3D DEFAULT_GUEST_POLICY; @@ -326,32 +327,32 @@ qsev_guest_init(Object *obj) } =20 /* sev guest info */ -static const TypeInfo qsev_guest_info =3D { +static const TypeInfo sev_guest_info =3D { .parent =3D TYPE_OBJECT, - .name =3D TYPE_QSEV_GUEST_INFO, - .instance_size =3D sizeof(QSevGuestInfo), - .instance_finalize =3D qsev_guest_finalize, - .class_init =3D qsev_guest_class_init, - .instance_init =3D qsev_guest_init, + .name =3D TYPE_SEV_GUEST, + .instance_size =3D sizeof(SevGuestState), + .instance_finalize =3D sev_guest_finalize, + .class_init =3D sev_guest_class_init, + .instance_init =3D sev_guest_instance_init, .interfaces =3D (InterfaceInfo[]) { { TYPE_USER_CREATABLE }, { } } }; =20 -static QSevGuestInfo * +static SevGuestState * lookup_sev_guest_info(const char *id) { Object *obj; - QSevGuestInfo *info; + SevGuestState *info; =20 obj =3D object_resolve_path_component(object_get_objects_root(), id); if (!obj) { return NULL; } =20 - info =3D (QSevGuestInfo *) - object_dynamic_cast(obj, TYPE_QSEV_GUEST_INFO); + info =3D (SevGuestState *) + object_dynamic_cast(obj, TYPE_SEV_GUEST); if (!info) { return NULL; } @@ -510,7 +511,7 @@ sev_launch_start(SEVState *s) gsize sz; int ret =3D 1; int fw_error, rc; - QSevGuestInfo *sev =3D s->sev_info; + SevGuestState *sev =3D s->sev_info; struct kvm_sev_launch_start *start; guchar *session =3D NULL, *dh_cert =3D NULL; =20 @@ -696,7 +697,7 @@ sev_guest_init(const char *id) s->sev_info =3D lookup_sev_guest_info(id); if (!s->sev_info) { error_report("%s: '%s' is not a valid '%s' object", - __func__, id, TYPE_QSEV_GUEST_INFO); + __func__, id, TYPE_SEV_GUEST); goto err; } =20 @@ -786,7 +787,7 @@ sev_encrypt_data(void *handle, uint8_t *ptr, uint64_t l= en) static void sev_register_types(void) { - type_register_static(&qsev_guest_info); + type_register_static(&sev_guest_info); } =20 type_init(sev_register_types); --=20 2.26.2