Message ID | 20211119102948.156887-1-anthony.perard@citrix.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [XEN,for-4.16] golang/xenlight: regen generated code | expand |
On 19/11/2021 10:29, Anthony PERARD wrote: > Fixes: 7379f9e10a3b ("gnttab: allow setting max version per-domain") > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Fixes: 1e6706b0d123 ("xen/arm: Introduce gpaddr_bits field to struct xen_domctl_getdomaininfo") as well, by the looks of things. ~Andrew
On Fri, Nov 19, 2021 at 10:38:04AM +0000, Andrew Cooper wrote: > On 19/11/2021 10:29, Anthony PERARD wrote: > > Fixes: 7379f9e10a3b ("gnttab: allow setting max version per-domain") > > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > > Fixes: 1e6706b0d123 ("xen/arm: Introduce gpaddr_bits field to struct > xen_domctl_getdomaininfo") > > as well, by the looks of things. Indeed, I miss that as I didn't look at the diff. But there is one commit between those two which does update the *.gen.go files... Thanks,
On Fri, Nov 19, 2021 at 10:29:48AM +0000, Anthony PERARD wrote: > Fixes: 7379f9e10a3b ("gnttab: allow setting max version per-domain") > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > --- > tools/golang/xenlight/helpers.gen.go | 4 ++++ > tools/golang/xenlight/types.gen.go | 2 ++ > 2 files changed, 6 insertions(+) > > diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go > index 6e1b05431056..b746ff108131 100644 > --- a/tools/golang/xenlight/helpers.gen.go > +++ b/tools/golang/xenlight/helpers.gen.go > @@ -323,6 +323,7 @@ x.CpuTime = uint64(xc.cpu_time) > x.VcpuMaxId = uint32(xc.vcpu_max_id) > x.VcpuOnline = uint32(xc.vcpu_online) > x.Cpupool = uint32(xc.cpupool) > +x.GpaddrBits = byte(xc.gpaddr_bits) > x.DomainType = DomainType(xc.domain_type) > > return nil} > @@ -355,6 +356,7 @@ xc.cpu_time = C.uint64_t(x.CpuTime) > xc.vcpu_max_id = C.uint32_t(x.VcpuMaxId) > xc.vcpu_online = C.uint32_t(x.VcpuOnline) > xc.cpupool = C.uint32_t(x.Cpupool) > +xc.gpaddr_bits = C.uint8_t(x.GpaddrBits) > xc.domain_type = C.libxl_domain_type(x.DomainType) > > return nil > @@ -1012,6 +1014,7 @@ return fmt.Errorf("converting field VnumaNodes: %v", err) } > } > x.MaxGrantFrames = uint32(xc.max_grant_frames) > x.MaxMaptrackFrames = uint32(xc.max_maptrack_frames) > +x.MaxGrantVersion = int(xc.max_grant_version) > x.DeviceModelVersion = DeviceModelVersion(xc.device_model_version) > if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain);err != nil { > return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) > @@ -1341,6 +1344,7 @@ return fmt.Errorf("converting field VnumaNodes: %v", err) > } > xc.max_grant_frames = C.uint32_t(x.MaxGrantFrames) > xc.max_maptrack_frames = C.uint32_t(x.MaxMaptrackFrames) > +xc.max_grant_version = C.int(x.MaxGrantVersion) > xc.device_model_version = C.libxl_device_model_version(x.DeviceModelVersion) > if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { > return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) > diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go > index a0acfaacc3a8..b1e84d525843 100644 > --- a/tools/golang/xenlight/types.gen.go > +++ b/tools/golang/xenlight/types.gen.go > @@ -316,6 +316,7 @@ CpuTime uint64 > VcpuMaxId uint32 > VcpuOnline uint32 > Cpupool uint32 > +GpaddrBits byte > DomainType DomainType > } > > @@ -479,6 +480,7 @@ BlkdevStart string > VnumaNodes []VnodeInfo > MaxGrantFrames uint32 > MaxMaptrackFrames uint32 > +MaxGrantVersion int > DeviceModelVersion DeviceModelVersion > DeviceModelStubdomain Defbool > StubdomainMemkb uint64 > -- > Anthony PERARD > Acked-by: Nick Rosbrook <rosbrookn@ainfosec.com> Thanks for catching that. -NR
Nick Rosbrook writes ("Re: [XEN PATCH for-4.16] golang/xenlight: regen generated code"): > Acked-by: Nick Rosbrook <rosbrookn@ainfosec.com> Thanks all. Acked-by: Ian Jackson <iwj@xenproject.org> Release-Acked-by: Ian Jackson <iwj@xenproject.org> and pushed. Ian.
diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 6e1b05431056..b746ff108131 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -323,6 +323,7 @@ x.CpuTime = uint64(xc.cpu_time) x.VcpuMaxId = uint32(xc.vcpu_max_id) x.VcpuOnline = uint32(xc.vcpu_online) x.Cpupool = uint32(xc.cpupool) +x.GpaddrBits = byte(xc.gpaddr_bits) x.DomainType = DomainType(xc.domain_type) return nil} @@ -355,6 +356,7 @@ xc.cpu_time = C.uint64_t(x.CpuTime) xc.vcpu_max_id = C.uint32_t(x.VcpuMaxId) xc.vcpu_online = C.uint32_t(x.VcpuOnline) xc.cpupool = C.uint32_t(x.Cpupool) +xc.gpaddr_bits = C.uint8_t(x.GpaddrBits) xc.domain_type = C.libxl_domain_type(x.DomainType) return nil @@ -1012,6 +1014,7 @@ return fmt.Errorf("converting field VnumaNodes: %v", err) } } x.MaxGrantFrames = uint32(xc.max_grant_frames) x.MaxMaptrackFrames = uint32(xc.max_maptrack_frames) +x.MaxGrantVersion = int(xc.max_grant_version) x.DeviceModelVersion = DeviceModelVersion(xc.device_model_version) if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain);err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) @@ -1341,6 +1344,7 @@ return fmt.Errorf("converting field VnumaNodes: %v", err) } xc.max_grant_frames = C.uint32_t(x.MaxGrantFrames) xc.max_maptrack_frames = C.uint32_t(x.MaxMaptrackFrames) +xc.max_grant_version = C.int(x.MaxGrantVersion) xc.device_model_version = C.libxl_device_model_version(x.DeviceModelVersion) if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index a0acfaacc3a8..b1e84d525843 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -316,6 +316,7 @@ CpuTime uint64 VcpuMaxId uint32 VcpuOnline uint32 Cpupool uint32 +GpaddrBits byte DomainType DomainType } @@ -479,6 +480,7 @@ BlkdevStart string VnumaNodes []VnodeInfo MaxGrantFrames uint32 MaxMaptrackFrames uint32 +MaxGrantVersion int DeviceModelVersion DeviceModelVersion DeviceModelStubdomain Defbool StubdomainMemkb uint64
Fixes: 7379f9e10a3b ("gnttab: allow setting max version per-domain") Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- tools/golang/xenlight/helpers.gen.go | 4 ++++ tools/golang/xenlight/types.gen.go | 2 ++ 2 files changed, 6 insertions(+)