yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-10 19:35:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Fix file name in error messages for included files

Browse source 
We print the name as it appears in the include expression. Tools
processing error messages want it relative to the working directory.
Make it so.

Backports commit 8608d2525186062099a38971c276752e7a38903a from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 15:39:05 -05:00 committed by Lioncash
parent a48f709cd8
commit b387a62f73
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/scripts/qapi.py
View file

@ -101,14 +101,13 @@ class QAPIExprError(Exception):
class QAPISchema:
def __init__(self, fp, fname = None, include_hist = [],
def __init__(self, fp, include_hist = [],
previously_included = [], incl_info = None):
""" include_hist is a stack used to detect inclusion cycles
previously_included is a global state used to avoid multiple
inclusions of the same file"""
abs_fname = os.path.abspath(fp.name)
if fname is None:
fname = fp.name
fname = fp.name
self.fname = fname
self.include_hist = include_hist + [(fname, abs_fname)]
previously_included.append(abs_fname)
@ -148,7 +147,7 @@ class QAPISchema:
except IOError, e:
raise QAPIExprError(expr_info,
'%s: %s' % (e.strerror, include))
exprs_include = QAPISchema(fobj, include, self.include_hist,
exprs_include = QAPISchema(fobj, self.include_hist,
previously_included, expr_info)
self.exprs.extend(exprs_include.exprs)
else: