From nobody Tue Feb 10 10:54:53 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 ARC-Seal: i=1; a=rsa-sha256; t=1590032812; cv=none; d=zohomail.com; s=zohoarc; b=lSNacljcu9Vg9hICk8JkeC6NwdvgWDmT72zHf6SPmvdOPTG23uK99MoZU6o+2xltnzK8uijujFnKpvR/2COs9c8tP4dEddPsUH51sS1NFsPhn8kPZUpYHTd8tCKTM58byq7+yS2teLYmEgT+geoMEaEvsXb6GiGOtWSwzwtFCfw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590032812; h=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=0RxqLfoXjiyn0JvOPjV8pWh9gWzSYdHU/1Nq8okGMA8=; b=LhMVi5u0kKOzto3zF690zz6cpmWLkSPvN/F0vxATGJlytL0WDnTz5D3V0lK7Lh5/3QLWKp9QmfIxKHGem1pMbOTZ0FcGJc7FqiUsvlypT8fpHOCzkNKTNbcVH5GUwlw3JGf/K9nKKAVf2fhgiEWOQ0Z/3sUrmHpd+lLo0bkDHC8= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590032812780151.76712845784357; Wed, 20 May 2020 20:46:52 -0700 (PDT) Received: from localhost ([::1]:60588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jbcAV-0008Q1-Fb for importer@patchew.org; Wed, 20 May 2020 23:46:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbc7E-0002ry-D6; Wed, 20 May 2020 23:43:28 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:55165 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jbc7C-0003Ts-FF; Wed, 20 May 2020 23:43:27 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 49SFnr52Ckz9sTN; Thu, 21 May 2020 13:43:12 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1590032592; bh=x4cTpeERhufcej3SjqDJ1ML9cL1niX2LXo7xACc0qi0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eIWFqhrta5l5bLqtDrBdfgvlDjka8MFRqDAsW5kekdT0Lc9sAwvViTrNX0B48cvRP n+48jvSD9YMVSHoIkDJRIbI6oBx29HZZefsP0NZx6NC5qhD+Jbi9SslSttHmujDpSg O0bB+nFiCZi0/9C5iXKNk2OK+QmtZIi+tCqjX8WI= From: David Gibson To: qemu-devel@nongnu.org, brijesh.singh@amd.com, frankja@linux.ibm.com, dgilbert@redhat.com, pair@us.ibm.com Subject: [RFC v2 03/18] target/i386: sev: Rename QSevGuestInfo Date: Thu, 21 May 2020 13:42:49 +1000 Message-Id: <20200521034304.340040-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200521034304.340040-1-david@gibson.dropbear.id.au> References: <20200521034304.340040-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 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=203.11.71.1; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/20 23:43:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , cohuck@redhat.com, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, Paolo Bonzini , Richard Henderson , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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