]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
qapi-commands: Fix gen_err_check(e) for e and e != 'local_err'
authorMarkus Armbruster <armbru@redhat.com>
Sat, 27 Jun 2015 14:48:14 +0000 (16:48 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 4 Sep 2015 13:47:15 +0000 (15:47 +0200)
gen_err_check() hard-codes 'local_err' instead of substituting the
argument.  Currently harmless, since all callers pass either None or
'local_err'.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
scripts/qapi-commands.py

index 69029f58fb49bee0da55f8218fda3e2493fb4746..3965ca8e9ac407537b4ab3bda1e03d2f536eeb96 100644 (file)
@@ -29,14 +29,15 @@ def generate_command_decl(name, args, ret_type):
                  ret_type=c_type(ret_type), name=c_name(name),
                  args=arglist).strip()
 
-def gen_err_check(errvar):
-    if errvar:
-        return mcgen('''
-if (local_err) {
+def gen_err_check(err):
+    if not err:
+        return ''
+    return mcgen('''
+if (%(err)s) {
     goto out;
 }
-''')
-    return ''
+''',
+                 err=err)
 
 def gen_sync_call(name, args, ret_type):
     ret = ""