From patchwork Tue Feb 25 16:57:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11404257 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 70ED6930 for ; Tue, 25 Feb 2020 16:59:11 +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 4CC532082F for ; Tue, 25 Feb 2020 16:59:11 +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="BsUJEwF8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4CC532082F 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 1j6dWs-0003Xg-Of; Tue, 25 Feb 2020 16:57:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j6dWr-0003Xb-1u for xen-devel@lists.xenproject.org; Tue, 25 Feb 2020 16:57:53 +0000 X-Inumbo-ID: f58d5bca-57ef-11ea-8fc3-bc764e2007e4 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f58d5bca-57ef-11ea-8fc3-bc764e2007e4; Tue, 25 Feb 2020 16:57:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1582649871; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=QiXCFQLc229JCoCO7jGrVffJefusghndv/ZjLSED+hE=; b=BsUJEwF8sdFAe6QfEywiBT0pdnYOSrWlY31LH7i/8NFoSiBYIq4RiFZD 1B3nMzIFrNrbrmPPLWY4m0vz69ArOMLlC9yeGy+++fR767B89JEznD7zK oQ3dq+uyoC0IDP+IlcaQYb0vI/tRffpNbkPogp8pLAIXuz6k7bHcM4ode s=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@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 (esa5.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=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: DdG045Dx2QMlJ87xLCG0Z++Xte7eNk+D7d74c1vCgyvNxxWx9Mcj4LPc4OD91436g6ZKOvpuuR wOhW17tWKX75mvLR7Wi6f7v/iP6+RS63SpXK6+HuCEUEyaExWXk0SCobDApXU0dFMLCfN39vJI 5cUSJrsGDd8ERtCPiaBoc8qCOunqamUipySyjGY3MPn/M2pX8J4AVfvgyVdFbBTeHEB32106xG OKmUk1RXUuewkeebI7r92LjMQ1np1C9jSjgsBFvu9S0YSe3a4/TVXhAIFZtw8AhVvZFDpKDcjl 168= X-SBRS: 2.7 X-MesageID: 13342017 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.70,484,1574139600"; d="scan'208";a="13342017" From: Andrew Cooper To: Xen-devel Date: Tue, 25 Feb 2020 16:57:48 +0000 Message-ID: <20200225165748.6531-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/gen-cpuid: Fix Py2/3 compatibility 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: Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There is a fencepost error on the sys.version_info check which will break on Python 3.0. Reverse the logic to make py2 compatible with py3 (rather than py3 compatible with py2) which will be more natural to follow as py2 usage reduces. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné --- xen/tools/gen-cpuid.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 362cdb5306..71ea78f4eb 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -3,9 +3,8 @@ import sys, os, re -if (sys.version_info > (3, 0)): - def xrange(x): - return range(x) +if sys.version_info < (3, 0): + range = xrange class Fail(Exception): pass @@ -330,10 +329,10 @@ def crunch_numbers(state): state.deep_deps[k] = featureset_to_uint32s(v, nr_entries) # Calculate the bitfield name declarations - for word in xrange(nr_entries): + for word in range(nr_entries): names = [] - for bit in xrange(32): + for bit in range(32): name = state.names.get(word * 32 + bit, "")