From: George Dunlap <george.dunlap@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Nick Rosbrook <rosbrookn@ainfosec.com>,
George Dunlap <george.dunlap@citrix.com>
Subject: [Xen-devel] [PATCH 2/9] golang/xenlight: Do proper nil / NULL conversions for builtin Bitmap type
Date: Fri, 27 Dec 2019 16:32:17 +0000 [thread overview]
Message-ID: <20191227163224.4113837-2-george.dunlap@citrix.com> (raw)
In-Reply-To: <20191227163224.4113837-1-george.dunlap@citrix.com>
Similar to the autogenerated types, but for `builtin` Bitmap type.
Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
CC: Nick Rosbrook <rosbrookn@ainfosec.com>
---
tools/golang/xenlight/xenlight.go | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go
index 237f26bce9..e18f0f35f8 100644
--- a/tools/golang/xenlight/xenlight.go
+++ b/tools/golang/xenlight/xenlight.go
@@ -408,15 +408,17 @@ type Bitmap struct {
}
func (bm *Bitmap) fromC(cbm *C.libxl_bitmap) error {
- // Alloc a Go slice for the bytes
- size := int(cbm.size)
- bm.bitmap = make([]C.uint8_t, size)
+ bm.bitmap = nil
+ if size := int(cbm.size); size > 0 {
+ // Alloc a Go slice for the bytes
+ bm.bitmap = make([]C.uint8_t, size)
- // Make a slice pointing to the C array
- cs := (*[1 << 30]C.uint8_t)(unsafe.Pointer(cbm._map))[:size:size]
+ // Make a slice pointing to the C array
+ cs := (*[1 << 30]C.uint8_t)(unsafe.Pointer(cbm._map))[:size:size]
- // And copy the C array into the Go array
- copy(bm.bitmap, cs)
+ // And copy the C array into the Go array
+ copy(bm.bitmap, cs)
+ }
return nil
}
@@ -426,10 +428,12 @@ func (bm *Bitmap) toC() (C.libxl_bitmap, error) {
size := len(bm.bitmap)
cbm.size = C.uint32_t(size)
- cbm._map = (*C.uint8_t)(C.malloc(C.ulong(cbm.size) * C.sizeof_uint8_t))
- cs := (*[1 << 31]C.uint8_t)(unsafe.Pointer(cbm._map))[:size:size]
+ if cbm.size > 0 {
+ cbm._map = (*C.uint8_t)(C.malloc(C.ulong(cbm.size) * C.sizeof_uint8_t))
+ cs := (*[1 << 31]C.uint8_t)(unsafe.Pointer(cbm._map))[:size:size]
- copy(cs, bm.bitmap)
+ copy(cs, bm.bitmap)
+ }
return cbm, nil
}
--
2.24.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-12-27 16:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-27 16:32 [Xen-devel] [PATCH 1/9] golang/xenlight: Don't try to marshall zero-length arrays George Dunlap
2019-12-27 16:32 ` George Dunlap [this message]
2020-01-04 18:00 ` [Xen-devel] [PATCH 2/9] golang/xenlight: Do proper nil / NULL conversions for builtin Bitmap type Nick Rosbrook
2019-12-27 16:32 ` [Xen-devel] [PATCH 3/9] golang/xenlight: Convert "" to NULL George Dunlap
2020-01-04 18:25 ` Nick Rosbrook
2019-12-27 16:32 ` [Xen-devel] [PATCH 4/9] go/xenlight: Fix CpuidPoliclyList conversion George Dunlap
2020-01-04 18:42 ` Nick Rosbrook
2019-12-27 16:32 ` [Xen-devel] [PATCH 5/9] go/xenlight: More informative error messages George Dunlap
2020-01-04 19:06 ` Nick Rosbrook
2020-01-16 16:46 ` George Dunlap
2019-12-27 16:32 ` [Xen-devel] [PATCH 6/9] golang/xenlight: Errors are negative George Dunlap
2020-01-04 19:27 ` Nick Rosbrook
2020-01-16 16:59 ` George Dunlap
2019-12-27 16:32 ` [Xen-devel] [PATCH 7/9] golang/xenlight: Default loglevel to DEBUG until we get everything working George Dunlap
2019-12-27 16:32 ` [Xen-devel] [PATCH 8/9] RFC: golang/xenlight: Notify xenlight of SIGCHLD George Dunlap
2019-12-27 16:32 ` [Xen-devel] [PATCH 9/9] DO NOT APPLY: Sketch constructors, DomainCreateNew George Dunlap
2019-12-27 16:36 ` [Xen-devel] [PATCH 1/9] golang/xenlight: Don't try to marshall zero-length arrays George Dunlap
2020-01-04 17:11 ` Nick Rosbrook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191227163224.4113837-2-george.dunlap@citrix.com \
--to=george.dunlap@citrix.com \
--cc=rosbrookn@ainfosec.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).