From nobody Thu May 2 01:26:17 2024 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 1528986642475347.1026548031632; Thu, 14 Jun 2018 07:30:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 550423082144; Thu, 14 Jun 2018 14:30:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EE5267A408; Thu, 14 Jun 2018 14:30:39 +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 741A31800540; Thu, 14 Jun 2018 14:30:39 +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 w5EEUa1k025222 for ; Thu, 14 Jun 2018 10:30:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3FF431117631; Thu, 14 Jun 2018 14:30:36 +0000 (UTC) Received: from beluga.usersys.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8D391117624; Thu, 14 Jun 2018 14:30:35 +0000 (UTC) From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 14 Jun 2018 16:30:29 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [libvirt-go-xml PATCH 1/2] Add support for domain launch security 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 14 Jun 2018 14:30:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- domain.go | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/domain.go b/domain.go index aeeb24a..27e2fdc 100644 --- a/domain.go +++ b/domain.go @@ -1863,6 +1863,15 @@ type DomainFeatureCapability struct { State string `xml:"state,attr,omitempty"` } =20 +type DomainLaunchSecurity struct { + Sectype string `xml:"type,attr"` + Cbitpos *uint `xml:"cbitpos"` + ReducedPhysBits *uint `xml:"reducedPhysBits"` + Policy *uint `xml:"policy"` + DhCert string `xml:"dhCert"` + Session string `xml:"sesion"` +} + type DomainFeatureCapabilities struct { Policy string `xml:"policy,attr,omitempty"` AuditControl *DomainFeatureCapability `xml:"audit_control"` @@ -2182,7 +2191,8 @@ type Domain struct { QEMUCommandline *DomainQEMUCommandline LXCNamespace *DomainLXCNamespace VMWareDataCenterPath *DomainVMWareDataCenterPath - KeyWrap *DomainKeyWrap `xml:"keywrap"` + KeyWrap *DomainKeyWrap `xml:"keywrap"` + LaunchSecurity *DomainLaunchSecurity `xml:"launchSecurity"` } =20 func (d *Domain) Unmarshal(doc string) error { @@ -4864,3 +4874,126 @@ func (d *DomainCPU) Marshal() (string, error) { } return string(doc), nil } + +func (a *DomainLaunchSecurity) MarshalXML(e *xml.Encoder, start xml.StartE= lement) error { + start.Attr =3D append(start.Attr, xml.Attr{ + xml.Name{Local: "type"}, "sev", + }) + + e.EncodeToken(start) + cbitpos :=3D xml.StartElement{ + Name: xml.Name{Local: "cbitpos"}, + } + e.EncodeToken(cbitpos) + e.EncodeToken(xml.CharData(fmt.Sprintf("%d", *a.Cbitpos))) + e.EncodeToken(cbitpos.End()) + + reducedPhysBits :=3D xml.StartElement{ + Name: xml.Name{Local: "reducedPhysBits"}, + } + e.EncodeToken(reducedPhysBits) + e.EncodeToken(xml.CharData(fmt.Sprintf("%d", *a.ReducedPhysBits))) + e.EncodeToken(reducedPhysBits.End()) + + if a.Policy !=3D nil { + policy :=3D xml.StartElement{ + Name: xml.Name{Local: "policy"}, + } + e.EncodeToken(policy) + e.EncodeToken(xml.CharData(fmt.Sprintf("0x%04x", *a.Policy))) + e.EncodeToken(policy.End()) + } + + dhcert :=3D xml.StartElement{ + Name: xml.Name{Local: "dhCert"}, + } + e.EncodeToken(dhcert) + e.EncodeToken(xml.CharData(fmt.Sprintf("%s", a.DhCert))) + e.EncodeToken(dhcert.End()) + + session :=3D xml.StartElement{ + Name: xml.Name{Local: "session"}, + } + e.EncodeToken(session) + e.EncodeToken(xml.CharData(fmt.Sprintf("%s", a.Session))) + e.EncodeToken(session.End()) + + e.EncodeToken(start.End()) + + return nil +} + +func (a *DomainLaunchSecurity) UnmarshalXML(d *xml.Decoder, start xml.Star= tElement) error { + for _, attr :=3D range start.Attr { + if attr.Name.Local =3D=3D "type" { + a.Sectype =3D attr.Value + } + } + + for { + tok, err :=3D d.Token() + if err =3D=3D io.EOF { + break + } + if err !=3D nil { + return err + } + + switch tok :=3D tok.(type) { + case xml.StartElement: + if tok.Name.Local =3D=3D "policy" { + data, err :=3D d.Token() + if err !=3D nil { + return err + } + switch data :=3D data.(type) { + case xml.CharData: + if err :=3D unmarshalUintAttr(string(data), &a.Policy, 16); err !=3D = nil { + return err + } + } + } else if tok.Name.Local =3D=3D "cbitpos" { + data, err :=3D d.Token() + if err !=3D nil { + return err + } + switch data :=3D data.(type) { + case xml.CharData: + if err :=3D unmarshalUintAttr(string(data), &a.Cbitpos, 10); err !=3D= nil { + return err + } + } + } else if tok.Name.Local =3D=3D "reducedPhysBits" { + data, err :=3D d.Token() + if err !=3D nil { + return err + } + switch data :=3D data.(type) { + case xml.CharData: + if err :=3D unmarshalUintAttr(string(data), &a.ReducedPhysBits, 10); = err !=3D nil { + return err + } + } + } else if tok.Name.Local =3D=3D "dhCert" { + data, err :=3D d.Token() + if err !=3D nil { + return err + } + switch data :=3D data.(type) { + case xml.CharData: + a.DhCert =3D string(data) + } + } else if tok.Name.Local =3D=3D "session" { + data, err :=3D d.Token() + if err !=3D nil { + return err + } + switch data :=3D data.(type) { + case xml.CharData: + a.Session =3D string(data) + } + } + } + } + return nil +} --=20 2.14.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu May 2 01:26:17 2024 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 1528986674617235.42451707962243; Thu, 14 Jun 2018 07:31:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6B76930BF55E; Thu, 14 Jun 2018 14:31:13 +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 1B30C9D5F4; Thu, 14 Jun 2018 14:31:13 +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 8C5A94CA80; Thu, 14 Jun 2018 14:31:12 +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 w5EEUb80025230 for ; Thu, 14 Jun 2018 10:30:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 006A01117631; Thu, 14 Jun 2018 14:30:37 +0000 (UTC) Received: from beluga.usersys.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AACE1117624; Thu, 14 Jun 2018 14:30:36 +0000 (UTC) From: Erik Skultety To: libvir-list@redhat.com Date: Thu, 14 Jun 2018 16:30:30 +0200 Message-Id: <4c89ba7bdaab5b0f3a9e9062fd5fd270686c37e1.1528981771.git.eskultet@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [libvirt-go-xml PATCH 2/2] Add support for SEV in domain capabilities XML 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 14 Jun 2018 14:31:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- domain_capabilities.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/domain_capabilities.go b/domain_capabilities.go index 3f5a752..4844fd9 100644 --- a/domain_capabilities.go +++ b/domain_capabilities.go @@ -106,6 +106,7 @@ type DomainCapsFeatures struct { GIC *DomainCapsFeatureGIC `xml:"gic"` VMCoreInfo *DomainCapsFeatureVMCoreInfo `xml:"vmcoreinfo"` GenID *DomainCapsFeatureGenID `xml:"genid"` + SEV *DomainCapsFeatureSEV `xml:"sev"` } =20 type DomainCapsFeatureGIC struct { @@ -121,6 +122,12 @@ type DomainCapsFeatureGenID struct { Supported string `xml:"supported,attr"` } =20 +type DomainCapsFeatureSEV struct { + Supported string `xml:"supported,attr"` + Cbitpos uint `xml:"cbitpos,omitempty"` + ReducedPhysBits uint `xml:"reducedPhysBits,omitempty"` +} + func (c *DomainCaps) Unmarshal(doc string) error { return xml.Unmarshal([]byte(doc), c) } --=20 2.14.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list