From patchwork Fri Dec 27 16:32:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 11311283 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1009A13A4 for ; Fri, 27 Dec 2019 16:33:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E09EE208C4 for ; Fri, 27 Dec 2019 16:33:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="APrc4I1C" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E09EE208C4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iksXh-0001ZT-O6; Fri, 27 Dec 2019 16:32:49 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iksXh-0001ZA-2t for xen-devel@lists.xenproject.org; Fri, 27 Dec 2019 16:32:49 +0000 X-Inumbo-ID: 7c626770-28c6-11ea-9c5f-12813bfff9fa Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7c626770-28c6-11ea-9c5f-12813bfff9fa; Fri, 27 Dec 2019 16:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1577464355; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=d0ZRc2Gh+5cHHLFgYbcoEi7+559DscdSg7RCLEHbsbI=; b=APrc4I1CSqfw1/qkBTZqgLsayLWEVI2h3nkjtR8U2T23pb7pXDgCew+0 fRHKjesz7QOKiR+OUG5uRi8QqBE0R0VQGA6QG5Cu8QKt431t7FcqX8DsM KFI2EyW13xr5/otyqLa0MJ0KncnlFob4X01eSyhah72Fk+ficrc6QqaEX U=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=george.dunlap@citrix.com; spf=Pass smtp.mailfrom=George.Dunlap@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of george.dunlap@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="george.dunlap@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa3.hc3370-68.iphmx.com: domain of George.Dunlap@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="George.Dunlap@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa3.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa3.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: NOrYm6dHLDNUooZs4DMZGl+2tEflhqKMomBjOly/399JKxSDBkfis1rrWGf32dCSMTMCBBOpCN xyN3R+tTO97bYwNsoqKJ6lKlwWBGVq/QSk3M5hcuiThfJNtK8XR3zOZXValUBy8+epXLPz18TV 06ggJKwBdFXP8YLnUbJWD21r3IQEsC/ik7GkYwCuU0pn6AfwURz8whYVOxV7uoXLJvA1RrbBU5 llw334gtHao1H7t1u8j/+YnxsGCTYtI9h/DhRqXrbOfk5KLuAVXG7+9pFn84QD0BlH0O6ZPTba rug= X-SBRS: 2.7 X-MesageID: 10186051 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.69,363,1571716800"; d="scan'208";a="10186051" From: George Dunlap To: Date: Fri, 27 Dec 2019 16:32:17 +0000 Message-ID: <20191227163224.4113837-2-george.dunlap@citrix.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191227163224.4113837-1-george.dunlap@citrix.com> References: <20191227163224.4113837-1-george.dunlap@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH 2/9] golang/xenlight: Do proper nil / NULL conversions for builtin Bitmap type X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Nick Rosbrook , George Dunlap Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Similar to the autogenerated types, but for `builtin` Bitmap type. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- CC: Nick Rosbrook --- 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 }