From patchwork Fri Jan 17 15:57:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 11339505 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 D94A192A for ; Fri, 17 Jan 2020 15:58:54 +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 B58E42064C for ; Fri, 17 Jan 2020 15:58: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="QcJ7OEKb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B58E42064C 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 1isU0X-0002Y8-4Q; Fri, 17 Jan 2020 15:58:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1isU0W-0002Xs-AN for xen-devel@lists.xenproject.org; Fri, 17 Jan 2020 15:58:00 +0000 X-Inumbo-ID: 1900756e-3942-11ea-b833-bc764e2007e4 Received: from esa4.hc3370-68.iphmx.com (unknown [216.71.155.144]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1900756e-3942-11ea-b833-bc764e2007e4; Fri, 17 Jan 2020 15:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1579276664; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VuZJzWZghr54Ihbi9LwnW7Xlt5ouevKSKJb7hSv05Wk=; b=QcJ7OEKbXGlwlvYdF15kAOc2vjT6HNgpLtT7VrRqEnNdGFJeKsBbRn7t v53wgI329wEVMKeQxzRN+FJMyBWGX7rRh3sHG4VK9UstTk8HnCtmeprb9 gEhyrhooaK5vyLuESS9u3lL500DA31yMEAgOyCiOijRtlwx8Gpg5c9/yu E=; Authentication-Results: esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="george.dunlap@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa4.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=esa4.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 (esa4.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=esa4.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: bX1ymuBVfVruhi2tmvXrgWHvEW3aysskTMhoAMxWx5Lj+ZTeubfNF5bhsq6I7RZrj1FORmrb8B sdX3M+tYs24E24ks8sqe2/uualkAxktcKeFINH4D9HgJSR+R4Y/ddckoSQx2AZCObKvF8Rtqo7 3iIJ14dDowKonxX7p1HKlx9yjAzdobGV67AbWI1IxFm9103oY5ghjTZq9GZ2WjEsDkRoX/IxS0 5hqu7crBrwjTdfVT7y7F5HyPfV33yZueDKO+5AgpFVfKMktp4yBdcaPDZ0yK+q7RsMkI5jIzvW RSw= X-SBRS: 2.7 X-MesageID: 11674363 X-Ironport-Server: esa4.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,330,1574139600"; d="scan'208";a="11674363" From: George Dunlap To: Date: Fri, 17 Jan 2020 15:57:28 +0000 Message-ID: <20200117155734.1067550-2-george.dunlap@citrix.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200117155734.1067550-1-george.dunlap@citrix.com> References: <20200117155734.1067550-1-george.dunlap@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 2/8] go/xenlight: Fix CpuidPoliclyList conversion 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" Empty Go strings should be converted to `nil` libxl_cpuid_policy_list; otherwise libxl_cpuid_parse_config gets confused. Also, libxl_cpuid_policy_list returns a weird error, not a "normal" libxl error; if it returns one of these non-standard errors, convert it to ErrorInval. Finally, make the fromC() method take a pointer, and set the value of CpuidPolicyList such that it will generate a valid CpuidPolicyList in response. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- v2: - Port over toC() function signature change - Have fromC set the string to "" CC: Nick Rosbrook --- tools/golang/xenlight/xenlight.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index b1587b964f..1299981713 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -306,9 +306,14 @@ func (el *EvLink) toC(cel *C.libxl_ev_link) (err error) { return } // empty when it is returned from libxl. type CpuidPolicyList string -func (cpl CpuidPolicyList) fromC(ccpl *C.libxl_cpuid_policy_list) error { return nil } +func (cpl *CpuidPolicyList) fromC(ccpl *C.libxl_cpuid_policy_list) error { *cpl = ""; return nil } func (cpl CpuidPolicyList) toC(ccpl *C.libxl_cpuid_policy_list) error { + if cpl == "" { + *ccpl = nil + return nil + } + s := C.CString(string(cpl)) defer C.free(unsafe.Pointer(s)) @@ -316,7 +321,8 @@ func (cpl CpuidPolicyList) toC(ccpl *C.libxl_cpuid_policy_list) error { if ret != 0 { C.libxl_cpuid_dispose(ccpl) - return Error(-ret) + // libxl_cpuid_parse_config doesn't return a normal libxl error. + return ErrorInval } return nil