From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012132287220.15717650020304; Mon, 15 Jan 2018 02:28:52 -0800 (PST) Received: from localhost ([::1]:53932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb20T-0002QG-30 for importer@patchew.org; Mon, 15 Jan 2018 05:28:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yV-00013u-Eg for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yT-0007Dj-Uk for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yT-0007Bt-Mv for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:41 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EAB2F552F1; Mon, 15 Jan 2018 10:26:40 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EA83600D2; Mon, 15 Jan 2018 10:26:36 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:09 +0000 Message-Id: <20180115102621.9183-2-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 Jan 2018 10:26:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 01/13] qapi: convert to use python print function instead of statement X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Get Py2 + 3 compatibility by using the print function instead of print statement. This works for 2.6 onwards. Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi.py | 12 ++++++------ scripts/qapi2texi.py | 9 +++++---- tests/qapi-schema/test-qapi.py | 41 +++++++++++++++++++++-----------------= --- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 43a54bf40f..924c762381 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -11,6 +11,7 @@ # This work is licensed under the terms of the GNU GPL, version 2. # See the COPYING file in the top-level directory. =20 +from __future__ import print_function import errno import getopt import os @@ -1467,7 +1468,7 @@ class QAPISchema(object): self._def_exprs() self.check() except QAPIError as err: - print >>sys.stderr, err + print (err, file=3Dsys.stderr) exit(1) =20 def _def_entity(self, ent): @@ -1931,7 +1932,7 @@ def parse_command_line(extra_options=3D'', extra_long= _options=3D[]): ['source', 'header', 'prefix=3D', 'output-dir=3D'] + extra_long_opti= ons) except getopt.GetoptError as err: - print >>sys.stderr, "%s: %s" % (sys.argv[0], str(err)) + print ("%s: %s" % (sys.argv[0], str(err)), file=3Dsys.stderr) sys.exit(1) =20 output_dir =3D '' @@ -1945,9 +1946,8 @@ def parse_command_line(extra_options=3D'', extra_long= _options=3D[]): if o in ('-p', '--prefix'): match =3D re.match(r'([A-Za-z_.-][A-Za-z0-9_.-]*)?', a) if match.end() !=3D len(a): - print >>sys.stderr, \ - "%s: 'funny character '%s' in argument of --prefix" \ - % (sys.argv[0], a[match.end()]) + print ("%s: 'funny character '%s' in argument of --prefix"= \ + % (sys.argv[0], a[match.end()]), file=3Dsys.stderr) sys.exit(1) prefix =3D a elif o in ('-o', '--output-dir'): @@ -1964,7 +1964,7 @@ def parse_command_line(extra_options=3D'', extra_long= _options=3D[]): do_h =3D True =20 if len(args) !=3D 1: - print >>sys.stderr, "%s: need exactly one argument" % sys.argv[0] + print ("%s: need exactly one argument" % sys.argv[0], file=3Dsys.s= tderr) sys.exit(1) fname =3D args[0] =20 diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py index 92e2af2cd6..6630138192 100755 --- a/scripts/qapi2texi.py +++ b/scripts/qapi2texi.py @@ -4,6 +4,7 @@ # This work is licensed under the terms of the GNU LGPL, version 2+. # See the COPYING file in the top-level directory. """This script produces the documentation of a qapi schema in texinfo form= at""" +from __future__ import print_function import re import sys =20 @@ -274,15 +275,15 @@ def texi_schema(schema): def main(argv): """Takes schema argument, prints result to stdout""" if len(argv) !=3D 2: - print >>sys.stderr, "%s: need exactly 1 argument: SCHEMA" % argv[0] + print ("%s: need exactly 1 argument: SCHEMA" % argv[0], file=3Dsys= .stderr) sys.exit(1) =20 schema =3D qapi.QAPISchema(argv[1]) if not qapi.doc_required: - print >>sys.stderr, ("%s: need pragma 'doc-required' " - "to generate documentation" % argv[0]) + print ("%s: need pragma 'doc-required' " + "to generate documentation" % argv[0], file=3Dsys.stderr) sys.exit(1) - print texi_schema(schema) + print (texi_schema(schema)) =20 =20 if __name__ =3D=3D '__main__': diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index fe0ca08d78..aad407e0df 100644 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -10,6 +10,7 @@ # See the COPYING file in the top-level directory. # =20 +from __future__ import print_function from qapi import * from pprint import pprint import os @@ -18,51 +19,51 @@ import sys =20 class QAPISchemaTestVisitor(QAPISchemaVisitor): def visit_enum_type(self, name, info, values, prefix): - print 'enum %s %s' % (name, values) + print ('enum %s %s' % (name, values)) if prefix: - print ' prefix %s' % prefix + print (' prefix %s' % prefix) =20 def visit_object_type(self, name, info, base, members, variants): - print 'object %s' % name + print ('object %s' % name) if base: - print ' base %s' % base.name + print (' base %s' % base.name) for m in members: - print ' member %s: %s optional=3D%s' % \ - (m.name, m.type.name, m.optional) + print (' member %s: %s optional=3D%s' % \ + (m.name, m.type.name, m.optional)) self._print_variants(variants) =20 def visit_alternate_type(self, name, info, variants): - print 'alternate %s' % name + print ('alternate %s' % name) self._print_variants(variants) =20 def visit_command(self, name, info, arg_type, ret_type, gen, success_response, boxed): - print 'command %s %s -> %s' % \ - (name, arg_type and arg_type.name, ret_type and ret_type.name) - print ' gen=3D%s success_response=3D%s boxed=3D%s' % \ - (gen, success_response, boxed) + print ('command %s %s -> %s' % \ + (name, arg_type and arg_type.name, ret_type and ret_type.name)) + print (' gen=3D%s success_response=3D%s boxed=3D%s' % \ + (gen, success_response, boxed)) =20 def visit_event(self, name, info, arg_type, boxed): - print 'event %s %s' % (name, arg_type and arg_type.name) - print ' boxed=3D%s' % boxed + print ('event %s %s' % (name, arg_type and arg_type.name)) + print (' boxed=3D%s' % boxed) =20 @staticmethod def _print_variants(variants): if variants: - print ' tag %s' % variants.tag_member.name + print (' tag %s' % variants.tag_member.name) for v in variants.variants: - print ' case %s: %s' % (v.name, v.type.name) + print (' case %s: %s' % (v.name, v.type.name)) =20 schema =3D QAPISchema(sys.argv[1]) schema.visit(QAPISchemaTestVisitor()) =20 for doc in schema.docs: if doc.symbol: - print 'doc symbol=3D%s' % doc.symbol + print ('doc symbol=3D%s' % doc.symbol) else: - print 'doc freeform' - print ' body=3D\n%s' % doc.body.text + print ('doc freeform') + print (' body=3D\n%s' % doc.body.text) for arg, section in doc.args.iteritems(): - print ' arg=3D%s\n%s' % (arg, section.text) + print (' arg=3D%s\n%s' % (arg, section.text)) for section in doc.sections: - print ' section=3D%s\n%s' % (section.name, section.text) + print (' section=3D%s\n%s' % (section.name, section.text)) --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012142781541.9003132164828; Mon, 15 Jan 2018 02:29:02 -0800 (PST) Received: from localhost ([::1]:53934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb20f-0002dH-Gf for importer@patchew.org; Mon, 15 Jan 2018 05:28:57 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yd-00019h-8u for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yZ-0007HL-2F for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41624) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yY-0007Gv-Pr for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:46 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EA8DDC047B60; Mon, 15 Jan 2018 10:26:45 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 30178600D2; Mon, 15 Jan 2018 10:26:41 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:10 +0000 Message-Id: <20180115102621.9183-3-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 15 Jan 2018 10:26:46 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 02/13] qapi: use items()/values() intead of iteritems()/itervalues() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The iteritems()/itervalues() methods are gone in py3, but the items()/values() methods are still around. The latter are less efficient than the former in py2, but this has unmeasurably small impact on QEMU build time, so taking portability over efficiency is a net win Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi.py | 12 ++++++------ scripts/qapi2texi.py | 2 +- tests/qapi-schema/test-qapi.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 924c762381..5ef50317ca 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -245,7 +245,7 @@ class QAPIDoc(object): "'Returns:' is only valid for commands") =20 def check(self): - bogus =3D [name for name, section in self.args.iteritems() + bogus =3D [name for name, section in self.args.items() if not section.member] if bogus: raise QAPISemError( @@ -300,7 +300,7 @@ class QAPISchemaParser(object): if not isinstance(pragma, dict): raise QAPISemError( info, "Value of 'pragma' must be a dictionary") - for name, value in pragma.iteritems(): + for name, value in pragma.items(): self._pragma(name, value, info) else: expr_elem =3D {'expr': expr, @@ -1566,7 +1566,7 @@ class QAPISchema(object): =20 def _make_members(self, data, info): return [self._make_member(key, value, info) - for (key, value) in data.iteritems()] + for (key, value) in data.items()] =20 def _def_struct_type(self, expr, info, doc): name =3D expr['struct'] @@ -1598,11 +1598,11 @@ class QAPISchema(object): name, info, doc, 'base', self._make_members(base, info))) if tag_name: variants =3D [self._make_variant(key, value) - for (key, value) in data.iteritems()] + for (key, value) in data.items()] members =3D [] else: variants =3D [self._make_simple_variant(key, value, info) - for (key, value) in data.iteritems()] + for (key, value) in data.items()] typ =3D self._make_implicit_enum_type(name, info, [v.name for v in variants]) tag_member =3D QAPISchemaObjectTypeMember('type', typ, False) @@ -1617,7 +1617,7 @@ class QAPISchema(object): name =3D expr['alternate'] data =3D expr['data'] variants =3D [self._make_variant(key, value) - for (key, value) in data.iteritems()] + for (key, value) in data.items()] tag_member =3D QAPISchemaObjectTypeMember('type', 'QType', False) self._def_entity( QAPISchemaAlternateType(name, info, doc, diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py index 6630138192..d155cf099e 100755 --- a/scripts/qapi2texi.py +++ b/scripts/qapi2texi.py @@ -146,7 +146,7 @@ def texi_member(member, suffix=3D''): def texi_members(doc, what, base, variants, member_func): """Format the table of members""" items =3D '' - for section in doc.args.itervalues(): + for section in doc.args.values(): # TODO Drop fallbacks when undocumented members are outlawed if section.text: desc =3D texi_format(section.text) diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py index aad407e0df..f535bc1c0c 100644 --- a/tests/qapi-schema/test-qapi.py +++ b/tests/qapi-schema/test-qapi.py @@ -63,7 +63,7 @@ for doc in schema.docs: else: print ('doc freeform') print (' body=3D\n%s' % doc.body.text) - for arg, section in doc.args.iteritems(): + for arg, section in doc.args.items(): print (' arg=3D%s\n%s' % (arg, section.text)) for section in doc.sections: print (' section=3D%s\n%s' % (section.name, section.text)) --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012137231175.51727661954953; Mon, 15 Jan 2018 02:28:57 -0800 (PST) Received: from localhost ([::1]:53933 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb20e-0002cE-AV for importer@patchew.org; Mon, 15 Jan 2018 05:28:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yd-00019f-8K for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yc-0007KA-56 for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50604) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yb-0007Jt-WB for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:50 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 21934883CA; Mon, 15 Jan 2018 10:26:49 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31FE8600D2; Mon, 15 Jan 2018 10:26:46 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:11 +0000 Message-Id: <20180115102621.9183-4-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 15 Jan 2018 10:26:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 03/13] qapi: Use OrderedDict from standard library if available X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The OrderedDict class appeared in the 'collections' module from python 2.7 onwards, so use that in preference to our local backport if available. Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 5ef50317ca..7ec2e00b2c 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -18,7 +18,10 @@ import os import re import string import sys -from ordereddict import OrderedDict +try: + from collections import OrderedDict +except: + from ordereddict import OrderedDict =20 builtin_types =3D { 'null': 'QTYPE_QNULL', --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012311331684.3100945588787; Mon, 15 Jan 2018 02:31:51 -0800 (PST) Received: from localhost ([::1]:53971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb23S-0005EK-Go for importer@patchew.org; Mon, 15 Jan 2018 05:31:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yj-0001Ge-AI for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yi-0007Ng-KY for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42336) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yi-0007NP-Ep for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:26:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C9177C840; Mon, 15 Jan 2018 10:26:55 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61716600D2; Mon, 15 Jan 2018 10:26:49 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:12 +0000 Message-Id: <20180115102621.9183-5-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jan 2018 10:26:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 04/13] qapi: adapt to moved location of StringIO module in py3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 7ec2e00b2c..eaa63a58be 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -22,6 +22,10 @@ try: from collections import OrderedDict except: from ordereddict import OrderedDict +try: + from StringIO import StringIO +except ImportError: + from io import StringIO =20 builtin_types =3D { 'null': 'QTYPE_QNULL', @@ -1995,8 +1999,7 @@ def open_output(output_dir, do_c, do_h, prefix, c_fil= e, h_file, if really: return open(name, opt) else: - import StringIO - return StringIO.StringIO() + return StringIO() =20 fdef =3D maybe_open(do_c, c_file, 'w') fdecl =3D maybe_open(do_h, h_file, 'w') --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012494913631.5804391850047; Mon, 15 Jan 2018 02:34:54 -0800 (PST) Received: from localhost ([::1]:53987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb26M-0007lO-4Z for importer@patchew.org; Mon, 15 Jan 2018 05:34:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yn-0001K2-Bk for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1ym-0007PW-4y for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60692) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yl-0007PD-VG for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:00 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2311A4C; Mon, 15 Jan 2018 10:26:59 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCFD361357; Mon, 15 Jan 2018 10:26:55 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:13 +0000 Message-Id: <20180115102621.9183-6-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 Jan 2018 10:26:59 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 05/13] qapi: Adapt to moved location of 'maketrans' function in py3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange --- scripts/qapi.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index eaa63a58be..b6a7b5139f 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1734,7 +1734,10 @@ def c_enum_const(type_name, const_name, prefix=3DNon= e): type_name =3D prefix return camel_to_upper(type_name) + '_' + c_name(const_name, False).upp= er() =20 -c_name_trans =3D string.maketrans('.-', '__') +if hasattr(str, 'maketrans'): + c_name_trans =3D str.maketrans('.-', '__') +else: + c_name_trans =3D string.maketrans('.-', '__') =20 =20 # Map @name to a valid C identifier. --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15160123146001021.5465449817899; Mon, 15 Jan 2018 02:31:54 -0800 (PST) Received: from localhost ([::1]:53972 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb23V-0005Fz-Oe for importer@patchew.org; Mon, 15 Jan 2018 05:31:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51601) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yu-0001Qp-VL for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yp-0007Qo-6p for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:08 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yp-0007QQ-0Z for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:03 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDDF97E42C; Mon, 15 Jan 2018 10:27:01 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61BA9600D2; Mon, 15 Jan 2018 10:26:59 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:14 +0000 Message-Id: <20180115102621.9183-7-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jan 2018 10:27:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 06/13] qapi: remove '-q' arg to diff when comparing QAPI output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When the qapi schema tests fail they merely print that the expected output didn't match the actual output. This is largely useless when trying diagnose what went wrong. Removing the '-q' arg to diff means that it is still silent on successful tests, but when it fails we'll see details of the incorrect output. Signed-off-by: Daniel P. Berrange --- tests/Makefile.include | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 39a4b5359d..d65fb4e1b3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -908,10 +908,10 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): check= -%.json: $(SRC_PATH)/%.json $^ >$*.test.out 2>$*.test.err; \ echo $$? >$*.test.exit, \ "TEST","$*.out") - @diff -q $(SRC_PATH)/$*.out $*.test.out + @diff $(SRC_PATH)/$*.out $*.test.out @# Sanitize error messages (make them independent of build directory) - @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -q $(SRC_PATH)/$*.= err - - @diff -q $(SRC_PATH)/$*.exit $*.test.exit + @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff $(SRC_PATH)/$*.err= - + @diff $(SRC_PATH)/$*.exit $*.test.exit =20 .PHONY: check-tests/qapi-schema/doc-good.texi check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012349073144.91005484957964; Mon, 15 Jan 2018 02:32:29 -0800 (PST) Received: from localhost ([::1]:53973 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb244-0005js-A5 for importer@patchew.org; Mon, 15 Jan 2018 05:32:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1yz-0001UT-JX for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yu-0007Sy-6h for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yu-0007Sb-0H for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:08 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E40A272B9; Mon, 15 Jan 2018 10:27:07 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B05E600D2; Mon, 15 Jan 2018 10:27:01 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:15 +0000 Message-Id: <20180115102621.9183-8-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 15 Jan 2018 10:27:07 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 07/13] qapi: ensure stable sort ordering when checking QAPI entities X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some early python 3.x versions will have different default ordering when calling the 'values()' method on a dict, compared to python 2.x and later 3.x versions. Explicitly sort the items to get a stable ordering. Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index b6a7b5139f..6266447eb0 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1678,7 +1678,7 @@ class QAPISchema(object): assert False =20 def check(self): - for ent in self._entity_dict.values(): + for (name, ent) in sorted(self._entity_dict.items()): ent.check(self) =20 def visit(self, visitor): --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012528106326.23983723623326; Mon, 15 Jan 2018 02:35:28 -0800 (PST) Received: from localhost ([::1]:53989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb26x-0008LJ-AW for importer@patchew.org; Mon, 15 Jan 2018 05:35:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1z0-0001Vj-UL for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1yx-0007VQ-SE for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59852) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1yx-0007V7-MA for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:11 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AAFD925B8E; Mon, 15 Jan 2018 10:27:10 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 62B5160472; Mon, 15 Jan 2018 10:27:07 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:16 +0000 Message-Id: <20180115102621.9183-9-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 15 Jan 2018 10:27:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 08/13] scripts: ensure signrom treats data as bytes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/signrom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/signrom.py b/scripts/signrom.py index d1dabe0240..0497a1c32e 100644 --- a/scripts/signrom.py +++ b/scripts/signrom.py @@ -18,7 +18,7 @@ fin =3D open(sys.argv[1], 'rb') fout =3D open(sys.argv[2], 'wb') =20 magic =3D fin.read(2) -if magic !=3D '\x55\xaa': +if magic !=3D b'\x55\xaa': sys.exit("%s: option ROM does not begin with magic 55 aa" % sys.argv[1= ]) =20 size_byte =3D ord(fin.read(1)) @@ -33,7 +33,7 @@ elif len(data) < size: # Add padding if necessary, rounding the whole input to a multiple of # 512 bytes according to the third byte of the input. # size-1 because a final byte is added below to store the checksum. - data =3D data.ljust(size-1, '\0') + data =3D data.ljust(size-1, b'\0') else: if ord(data[-1:]) !=3D 0: sys.stderr.write('WARNING: ROM includes nonzero checksum\n') --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012636042814.9439815558187; Mon, 15 Jan 2018 02:37:16 -0800 (PST) Received: from localhost ([::1]:54391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb28X-0001bG-PN for importer@patchew.org; Mon, 15 Jan 2018 05:37:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1z2-0001XW-Ot for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1z1-0007YB-Vw for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42630) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1z1-0007Xl-QO for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:15 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F0D0B780E8; Mon, 15 Jan 2018 10:27:14 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDE0961357; Mon, 15 Jan 2018 10:27:10 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:17 +0000 Message-Id: <20180115102621.9183-10-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 15 Jan 2018 10:27:15 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 09/13] configure: allow use of python 3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange --- configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index b272a0336b..60b99f45f6 100755 --- a/configure +++ b/configure @@ -1598,9 +1598,8 @@ fi =20 # Note that if the Python conditional here evaluates True we will exit # with status 1 which is a shell 'false' value. -if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6) or sys.vers= ion_info >=3D (3,))'; then - error_exit "Cannot use '$python', Python 2.6 or later is required." \ - "Note that Python 3 or later is not yet supported." \ +if ! $python -c 'import sys; sys.exit(sys.version_info < (2,6))'; then + error_exit "Cannot use '$python', Python 2 >=3D 2.6 or Python 3 is requi= red." \ "Use --python=3D/path/to/python to specify a supported Python." fi =20 --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012306023128.77726692620138; Mon, 15 Jan 2018 02:31:46 -0800 (PST) Received: from localhost ([::1]:53970 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb23K-00057d-VY for importer@patchew.org; Mon, 15 Jan 2018 05:31:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1z5-0001Zz-0j for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1z4-0007Zl-0A for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41212) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1z3-0007Z9-Qk for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:17 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07AB9C057F91; Mon, 15 Jan 2018 10:27:17 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3994B600D2; Mon, 15 Jan 2018 10:27:15 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:18 +0000 Message-Id: <20180115102621.9183-11-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 15 Jan 2018 10:27:17 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 10/13] input: add missing JIS keys to virtio input X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Miika S , Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Miika S keycodemapdb updated to add the QKeyCodes muhenkan and katakanahiragana Signed-off-by: Miika S --- hw/input/virtio-input-hid.c | 7 +++++++ qapi/ui.json | 5 ++++- ui/keycodemapdb | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/input/virtio-input-hid.c b/hw/input/virtio-input-hid.c index e78faec0b1..9628d289f9 100644 --- a/hw/input/virtio-input-hid.c +++ b/hw/input/virtio-input-hid.c @@ -139,6 +139,13 @@ static const unsigned int keymap_qcode[Q_KEY_CODE__MAX= ] =3D { [Q_KEY_CODE_META_L] =3D KEY_LEFTMETA, [Q_KEY_CODE_META_R] =3D KEY_RIGHTMETA, [Q_KEY_CODE_MENU] =3D KEY_MENU, + + [Q_KEY_CODE_MUHENKAN] =3D KEY_MUHENKAN, + [Q_KEY_CODE_HENKAN] =3D KEY_HENKAN, + [Q_KEY_CODE_KATAKANAHIRAGANA] =3D KEY_KATAKANAHIRAGANA, + [Q_KEY_CODE_COMPOSE] =3D KEY_COMPOSE, + [Q_KEY_CODE_RO] =3D KEY_RO, + [Q_KEY_CODE_YEN] =3D KEY_YEN, }; =20 static const unsigned int keymap_button[INPUT_BUTTON__MAX] =3D { diff --git a/qapi/ui.json b/qapi/ui.json index 07b468f625..d6679aa8f5 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -748,6 +748,9 @@ # @ac_bookmarks: since 2.10 # altgr, altgr_r: dropped in 2.10 # +# @muhenkan: since 2.12 +# @katakanahiragana: since 2.12 +# # 'sysrq' was mistakenly added to hack around the fact that # the ps2 driver was not generating correct scancodes sequences # when 'alt+print' was pressed. This flaw is now fixed and the @@ -775,7 +778,7 @@ 'left', 'up', 'down', 'right', 'insert', 'delete', 'stop', 'ag= ain', 'props', 'undo', 'front', 'copy', 'open', 'paste', 'find', 'cu= t', 'lf', 'help', 'meta_l', 'meta_r', 'compose', 'pause', - 'ro', 'hiragana', 'henkan', 'yen', + 'ro', 'hiragana', 'henkan', 'yen', 'muhenkan', 'katakanahiraga= na', 'kp_comma', 'kp_equals', 'power', 'sleep', 'wake', 'audionext', 'audioprev', 'audiostop', 'audioplay', 'audiomute= ', 'volumeup', 'volumedown', 'mediaselect', diff --git a/ui/keycodemapdb b/ui/keycodemapdb index 10739aa260..05dad417e9 160000 --- a/ui/keycodemapdb +++ b/ui/keycodemapdb @@ -1 +1 @@ -Subproject commit 10739aa26051a5d49d88132604539d3ed085e72e +Subproject commit 05dad417e9d0b37ee1fba33056d91a6b734b3357 --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012736412287.48215730706977; Mon, 15 Jan 2018 02:38:56 -0800 (PST) Received: from localhost ([::1]:54449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb2AJ-0002s9-Kx for importer@patchew.org; Mon, 15 Jan 2018 05:38:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51732) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1z9-0001eT-HA for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1z6-0007bP-AL for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50992) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1z6-0007at-4F for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:20 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 48F25806B5; Mon, 15 Jan 2018 10:27:19 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 455D3600D2; Mon, 15 Jan 2018 10:27:17 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:19 +0000 Message-Id: <20180115102621.9183-12-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 15 Jan 2018 10:27:19 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 11/13] ui: update keycodemapdb to get py3 fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel P. Berrange --- ui/keycodemapdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/keycodemapdb b/ui/keycodemapdb index 05dad417e9..6b3d716e2b 160000 --- a/ui/keycodemapdb +++ b/ui/keycodemapdb @@ -1 +1 @@ -Subproject commit 05dad417e9d0b37ee1fba33056d91a6b734b3357 +Subproject commit 6b3d716e2b6472eb7189d3220552280ef3d832ce --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012494704298.75733418885704; Mon, 15 Jan 2018 02:34:54 -0800 (PST) Received: from localhost ([::1]:53986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb26H-0007gb-EE for importer@patchew.org; Mon, 15 Jan 2018 05:34:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1zF-0001kk-Rf for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1z9-0007d2-PQ for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:61335) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1z9-0007ca-KV for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:23 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C192313A82; Mon, 15 Jan 2018 10:27:22 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87CCB6444A; Mon, 15 Jan 2018 10:27:19 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:20 +0000 Message-Id: <20180115102621.9183-13-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 15 Jan 2018 10:27:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 12/13] travis: improve python version test coverage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently travis declares ancient python 2.4 is desired. Update that to 2.6 which is the oldest version any targetted distros still needs. If we just list a python 3 version at the top level this will double the number of travis jobs we run which is unreasonable. So arbitrarily pick the clang test matrix entries to build with python 3.0 and 3.6, to extend coverage of python versions, without increasing job count or build time. Signed-off-by: Daniel P. Berrange --- .travis.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f583839755..708c886017 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: c python: - - "2.4" + - "2.6" compiler: - gcc cache: ccache @@ -115,15 +115,17 @@ matrix: - sudo apt-get build-dep -qq qemu - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-g= it-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - # Trusty System build with latest stable clang + # Trusty System build with latest stable clang & python 3.0 - sudo: required addons: dist: trusty language: generic compiler: none + python: + - "3.0" env: - COMPILER_NAME=3Dclang CXX=3Dclang++-3.9 CC=3Dclang-3.9 - - CONFIG=3D"--disable-linux-user --cc=3Dclang-3.9 --cxx=3Dclang++-= 3.9" + - CONFIG=3D"--disable-linux-user --cc=3Dclang-3.9 --cxx=3Dclang++-= 3.9 --python=3D/usr/bin/python3" before_install: - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo a= pt-key add - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-= toolchain-trusty-3.9 main' @@ -134,15 +136,17 @@ matrix: - git submodule update --init --recursive before_script: - ./configure ${CONFIG} || cat config.log - # Trusty Linux User build with latest stable clang + # Trusty Linux User build with latest stable clang & python 3.6 - sudo: required addons: dist: trusty language: generic compiler: none + python: + - "3.6" env: - COMPILER_NAME=3Dclang CXX=3Dclang++-3.9 CC=3Dclang-3.9 - - CONFIG=3D"--disable-system --cc=3Dclang-3.9 --cxx=3Dclang++-3.9" + - CONFIG=3D"--disable-system --cc=3Dclang-3.9 --cxx=3Dclang++-3.9 = --python=3D/usr/bin/python3" before_install: - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo a= pt-key add - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-= toolchain-trusty-3.9 main' --=20 2.14.3 From nobody Thu May 2 17:07:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516012501540774.2704429638528; Mon, 15 Jan 2018 02:35:01 -0800 (PST) Received: from localhost ([::1]:53988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb26W-0007rL-FM for importer@patchew.org; Mon, 15 Jan 2018 05:35:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb1zC-0001hK-RN for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb1zB-0007eE-Sq for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60048) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb1zB-0007dx-Mi for qemu-devel@nongnu.org; Mon, 15 Jan 2018 05:27:25 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D35B65D5EA; Mon, 15 Jan 2018 10:27:24 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.88]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4804600D2; Mon, 15 Jan 2018 10:27:22 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Mon, 15 Jan 2018 10:26:21 +0000 Message-Id: <20180115102621.9183-14-berrange@redhat.com> In-Reply-To: <20180115102621.9183-1-berrange@redhat.com> References: <20180115102621.9183-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 15 Jan 2018 10:27:24 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 13/13] docker: change Fedora images to run with python3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fedora has switched to Python 3 by default, so it makes sense to use that for testing QEMU builds, so we get testing of Python 3 compatibility. Signed-off-by: Daniel P. Berrange --- tests/docker/dockerfiles/fedora.docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 4b26c3aded..a22fe16157 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:latest ENV PACKAGES \ - ccache gettext git tar PyYAML sparse flex bison python2 bzip2 hostname= \ + ccache gettext git tar PyYAML sparse flex bison python3 bzip2 hostname= \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils libaio-devel \ nettle-devel \ @@ -12,6 +12,7 @@ ENV PACKAGES \ mingw64-gtk2 mingw64-gtk3 mingw64-gnutls mingw64-nettle mingw64-libtas= n1 \ mingw64-libjpeg-turbo mingw64-libpng mingw64-curl mingw64-libssh2 \ mingw64-bzip2 +ENV QEMU_CONFIGURE_OPTS --python=3D/usr/bin/python3 =20 RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt --=20 2.14.3