From patchwork Fri Dec 27 16:32:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: George Dunlap X-Patchwork-Id: 11311279 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 646206C1 for ; Fri, 27 Dec 2019 16:33:50 +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 410C1208C4 for ; Fri, 27 Dec 2019 16:33:50 +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="Qjn0ZEg7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 410C1208C4 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 1iksXT-0001X0-Ag; Fri, 27 Dec 2019 16:32:35 +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 1iksXS-0001Wv-5h for xen-devel@lists.xenproject.org; Fri, 27 Dec 2019 16:32:34 +0000 X-Inumbo-ID: 7b70c3ca-28c6-11ea-9c5f-12813bfff9fa Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7b70c3ca-28c6-11ea-9c5f-12813bfff9fa; Fri, 27 Dec 2019 16:32:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1577464353; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tgQVqhpD88Shc5uH6gLTpV0x5POAuDsPV4Q79I6AVyA=; b=Qjn0ZEg7ibN1iynJy06PCN0vUkwskjjSePiJ6Fw/6kl81n/OfDTTzplI llrIKuPBqvDiVgZWDTMPXflQKYzw3UoOZoDTnprkEY4FQFF+LXyKotmyc xRduq0dcoiK12brAApUgGx3z95m1bsc7bm7XMSYxH0SNdDRzBkUCw/ilp k=; Authentication-Results: esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="george.dunlap@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa6.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=esa6.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 (esa6.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=esa6.hc3370-68.iphmx.com; envelope-from="George.Dunlap@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: 3BPHlT5ppEa5BEHZK+WdcLxhxN47Pm9UAn0JNWJ9d+ntcUNTfBvFpMD5dOE1Ohen9xmD2iklU8 OapuyABTygnuBe2O/yU4RMLrE5wupxzv2B1Lz5iyx8oCkGTHUIHH74/sGwocub5k3ha9SM1YNP t+dJsKSSTYtPucBKwWyK7C1Kb6JykSZp/ajCpsfi/bZzR8SQDAtj7rO0c2gM09509EIXFwgmGQ Te3PpEcq2WjmiHGXTHVa6YKT+JkcwMxEU/5crlmQWnLLTfqAWSHPpGp3K1BjlOm4norOm7Y3bb 5oI= X-SBRS: 2.7 X-MesageID: 10626138 X-Ironport-Server: esa6.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="10626138" From: George Dunlap To: Date: Fri, 27 Dec 2019 16:32:19 +0000 Message-ID: <20191227163224.4113837-4-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 4/9] 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. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- CC: Nick Rosbrook --- tools/golang/xenlight/xenlight.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index e18f0f35f8..99de68320b 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -317,6 +317,10 @@ type CpuidPolicyList string func (cpl CpuidPolicyList) fromC(ccpl *C.libxl_cpuid_policy_list) error { return nil } func (cpl CpuidPolicyList) toC() (C.libxl_cpuid_policy_list, error) { + if cpl == "" { + return nil, nil + } + var ccpl C.libxl_cpuid_policy_list s := C.CString(string(cpl)) @@ -326,7 +330,8 @@ func (cpl CpuidPolicyList) toC() (C.libxl_cpuid_policy_list, error) { if ret != 0 { C.libxl_cpuid_dispose(&ccpl) - return ccpl, Error(-ret) + // libxl_cpuid_parse_config doesn't return a normal libxl error. + return ccpl, ErrorInval } return ccpl, nil