From f7a5376d4b667cf6c83c1d640e32d22456d7b5ee Mon Sep 17 00:00:00 2001

From: "Daniel P. Berrange" <berrange@redhat.com>

Date: Tue, 16 Jan 2018 13:42:10 +0000

Subject: [PATCH] qapi: ensure stable sort ordering when checking QAPI entities

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

Message-Id: <20180116134217.8725-8-berrange@redhat.com>

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

---

 scripts/qapi.py | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qapi.py b/scripts/qapi.py

index 1fdd189c0d..58f995b07f 100644

--- a/scripts/qapi.py

+++ b/scripts/qapi.py

@@ -1678,7 +1678,7 @@ class QAPISchema(object):

                 assert False

     def check(self):

-        for ent in self._entity_dict.values():

+        for (name, ent) in sorted(self._entity_dict.items()):

             ent.check(self)

     def visit(self, visitor):

-- 

2.14.3