From nobody Sun Feb 8 07:58:24 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 152880483605285.97825441104942; Tue, 12 Jun 2018 05:00:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C030519CBC7; Tue, 12 Jun 2018 12:00:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6D0D0958A2; Tue, 12 Jun 2018 12:00:33 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6B6F7EEF4; Tue, 12 Jun 2018 12:00:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5CC0UX8031406 for ; Tue, 12 Jun 2018 08:00:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id BCE6410FD29B; Tue, 12 Jun 2018 12:00:30 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4295710FD29A; Tue, 12 Jun 2018 12:00:30 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 12 Jun 2018 14:00:16 +0200 Message-Id: <372a07ef243c376bec86adbc82e2f53f6f049e8e.1528804609.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: brijesh.singh@amd.com Subject: [libvirt] [PATCH 02/10] conf: prefer camelCase for launchSecurity X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 12 Jun 2018 12:00:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Adjust the documentation, parser and tests to change: launch-security -> launchSecurity reduced-phys-bits -> reducedPhysBits dh-cert -> dhCert Also fix the headline in formatdomain.html to be more generic, and some leftover closing elements in the documentation. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Daniel P. Berrang=C3=A9 --- docs/formatdomain.html.in | 22 ++++++++++--------= -- docs/schemas/domaincommon.rng | 10 ++++----- src/conf/domain_conf.c | 24 +++++++++++-------= ---- tests/genericxml2xmlindata/launch-security-sev.xml | 8 ++++---- tests/qemuxml2argvdata/launch-security-sev.xml | 8 ++++---- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 77845fe5f7..7e710d7c4a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -8458,12 +8458,12 @@ qemu-kvm -net nic,model=3D? /dev/null =20

Note: DEA/TDEA is synonymous with DES/TDES.

=20 -

Secure Encrypted Virtualization (SEV)

+

Launch Security

=20

- The contents of the <launch-security type=3D'sev'> element + The contents of the <launchSecurity type=3D'sev'> element is used to provide the guest owners input used for creating an encr= ypted - VM using the AMD SEV feature. + VM using the AMD SEV feature (Secure Encrypted Virtualization). =20 SEV is an extension to the AMD-V architecture which supports running encrypted virtual machine (VMs) under the control of KVM. Encrypted @@ -8480,13 +8480,13 @@ qemu-kvm -net nic,model=3D? /dev/null 

 <domain>
   ...
-  <launch-security type=3D'sev'>
+  <launchSecurity type=3D'sev'>
     <policy> 0x0001 </policy>
     <cbitpos> 47 </cbitpos>
-    <reduced-phys-bits> 1 </reduced-phys-bits>
+    <reducedPhysBits> 1 </reducedPhysBits>
+    <dhCert> RBBBSDDD=3DFDDCCCDDDG </dhCert>
     <session> AAACCCDD=3DFFFCCCDSDS </session>
-    <dh-cert> RBBBSDDD=3DFDDCCCDDDG </dh>
-  </sev>
+  </launchSecurity>
   ...
 </domain>
@@ -8498,8 +8498,8 @@ qemu-kvm -net nic,model=3D? /dev/null hypervisor dependent and can be obtained through the sev element from the domain capabilities. -
reduced-phys-bits
-
The required reduced-phys-bits element provides the= physical +
reducedPhysBits
+
The required reducedPhysBits element provides the p= hysical address bit reducation. Similar to cbitpos the value of= reduced-phys-bit is hypervisor dependent and can be obtained through the sev element from the domain capabilities. @@ -8558,8 +8558,8 @@ qemu-kvm -net nic,model=3D? /dev/null =20
-
dh-cert
-
The optional dh-cert element provides the guest own= ers +
dhCert
+
The optional dhCert element provides the guest owne= rs base64 encoded Diffie-Hellman (DH) key. The key is used to negotiate= a master secret key between the SEV firmware and guest owner. This mas= ter secret key is then used to establish a trusted channel between SEV diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1d06a5ea89..4a454dddb4 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -78,7 +78,7 @@ - + @@ -439,8 +439,8 @@ =20 - - + + sev @@ -448,7 +448,7 @@ - + @@ -460,7 +460,7 @@ - + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 85f07af46e..ac5484d070 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15862,7 +15862,7 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, =20 if (!(type =3D virXMLPropString(sevNode, "type"))) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing launch-security type")); + _("missing launch security type")); goto error; } =20 @@ -15874,33 +15874,33 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode, case VIR_DOMAIN_LAUNCH_SECURITY_LAST: default: virReportError(VIR_ERR_XML_ERROR, - _("unsupported launch-security type '%s'"), + _("unsupported launch security type '%s'"), type); goto error; } =20 if (virXPathUInt("string(./cbitpos)", ctxt, &def->cbitpos) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("failed to get launch-security cbitpos")); + _("failed to get launch security cbitpos")); goto error; } =20 - if (virXPathUInt("string(./reduced-phys-bits)", ctxt, + if (virXPathUInt("string(./reducedPhysBits)", ctxt, &def->reduced_phys_bits) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("failed to get launch-security reduced-phys-bits"= )); + _("failed to get launch security reduced-phys-bits"= )); goto error; } =20 if (virXPathULongHex("string(./policy)", ctxt, &policy) < 0) { virReportError(VIR_ERR_XML_ERROR, "%s", - _("failed to get launch-security policy")); + _("failed to get launch security policy")); goto error; } =20 def->policy =3D policy; =20 - if ((tmp =3D virXPathString("string(./dh-cert)", ctxt))) { + if ((tmp =3D virXPathString("string(./dhCert)", ctxt))) { if (VIR_STRDUP(def->dh_cert, tmp) < 0) goto error; =20 @@ -20730,7 +20730,7 @@ virDomainDefParseXML(xmlDocPtr xml, VIR_FREE(nodes); =20 /* Check for SEV feature */ - if ((node =3D virXPathNode("./launch-security", ctxt)) !=3D NULL) { + if ((node =3D virXPathNode("./launchSecurity", ctxt)) !=3D NULL) { def->sev =3D virDomainSEVDefParseXML(node, ctxt); if (!def->sev) goto error; @@ -26771,22 +26771,22 @@ virDomainSEVDefFormat(virBufferPtr buf, virDomain= SevDefPtr sev) if (!sev) return; =20 - virBufferAsprintf(buf, "\n", + virBufferAsprintf(buf, "\n", virDomainLaunchSecurityTypeToString(sev->sectype)); virBufferAdjustIndent(buf, 2); =20 virBufferAsprintf(buf, "%d\n", sev->cbitpos); - virBufferAsprintf(buf, "%d\n", + virBufferAsprintf(buf, "%d\n", sev->reduced_phys_bits); virBufferAsprintf(buf, "0x%04x\n", sev->policy); if (sev->dh_cert) - virBufferEscapeString(buf, "%s\n", sev->dh_cert= ); + virBufferEscapeString(buf, "%s\n", sev->dh_cert); =20 if (sev->session) virBufferEscapeString(buf, "%s\n", sev->session= ); =20 virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); + virBufferAddLit(buf, "\n"); } =20 =20 diff --git a/tests/genericxml2xmlindata/launch-security-sev.xml b/tests/gen= ericxml2xmlindata/launch-security-sev.xml index fb64e1e4be..c25cfbbf14 100644 --- a/tests/genericxml2xmlindata/launch-security-sev.xml +++ b/tests/genericxml2xmlindata/launch-security-sev.xml @@ -14,11 +14,11 @@ destroy - + 47 - 1 + 1 0x0001 - AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA + AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA IHAVENOIDEABUTJUSTPROVIDINGASTRING - + diff --git a/tests/qemuxml2argvdata/launch-security-sev.xml b/tests/qemuxml= 2argvdata/launch-security-sev.xml index 5ae83f61c1..b73defd6ee 100644 --- a/tests/qemuxml2argvdata/launch-security-sev.xml +++ b/tests/qemuxml2argvdata/launch-security-sev.xml @@ -27,11 +27,11 @@ - + 47 - 1 + 1 0x0001 - AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA + AQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAAAQAAAAAOAAA IHAVENOIDEABUTJUSTPROVIDINGASTRING - + --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list