Commit 49bcce4b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-07-12' into staging 



QAPI patches for 2017-07-12

# gpg: Signature made Wed 12 Jul 2017 17:07:20 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-07-12:
  scripts: use build_ prefix for string not piped through cgen()
  qobject: Update coccinelle script to catch Q{INC, DEC}REF
  qobject: Catch another straggler for use of qdict_put_str()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aa5a7047 086ee7a6

monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -3842,7 +3842,7 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) 


    req_json = qobject_to_json(req);

    trace_handle_qmp_command(mon, qstring_get_str(req_json));

    qobject_decref(QOBJECT(req_json));

    QDECREF(req_json);



    rsp = qmp_dispatch(cur_mon->qmp.commands, req);

qemu-img.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int img_add_key_secrets(void *opaque, 
    QDict *options = opaque;



    if (g_str_has_suffix(name, "key-secret")) {

        qdict_put(options, name, qstring_from_str(value));

        qdict_put_str(options, name, value);

    }



    return 0;

scripts/coccinelle/qobject.cocci

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ 
expression Obj, Key, E;

@@

(

- qobject_incref(QOBJECT(E));

+ QINCREF(E);

|

- qobject_decref(QOBJECT(E));

+ QDECREF(E);

|

- qdict_put_obj(Obj, Key, QOBJECT(E));

+ qdict_put(Obj, Key, E);

|

scripts/qapi-commands.py

+4 −4
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ def gen_command_decl(name, arg_type, boxed, ret_type): 
''',

                 c_type=(ret_type and ret_type.c_type()) or 'void',

                 c_name=c_name(name),

                 params=gen_params(arg_type, boxed, 'Error **errp'))

                 params=build_params(arg_type, boxed, 'Error **errp'))





def gen_call(name, arg_type, boxed, ret_type):
@@ -82,7 +82,7 @@ static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out, 
                 c_type=ret_type.c_type(), c_name=ret_type.c_name())





def gen_marshal_proto(name):

def build_marshal_proto(name):

    return ('void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)'

            % c_name(name))
@@ -91,7 +91,7 @@ def gen_marshal_decl(name): 
    return mcgen('''

%(proto)s;

''',

                 proto=gen_marshal_proto(name))

                 proto=build_marshal_proto(name))





def gen_marshal(name, arg_type, boxed, ret_type):
@@ -103,7 +103,7 @@ def gen_marshal(name, arg_type, boxed, ret_type): 
{

    Error *err = NULL;

''',

                proto=gen_marshal_proto(name))

                proto=build_marshal_proto(name))



    if ret_type:

        ret += mcgen('''

scripts/qapi-event.py

+6 −6
Original line number Diff line number Diff line
@@ -14,10 +14,10 @@ 
from qapi import *





def gen_event_send_proto(name, arg_type, boxed):

def build_event_send_proto(name, arg_type, boxed):

    return 'void qapi_event_send_%(c_name)s(%(param)s)' % {

        'c_name': c_name(name.lower()),

        'param': gen_params(arg_type, boxed, 'Error **errp')}

        'param': build_params(arg_type, boxed, 'Error **errp')}





def gen_event_send_decl(name, arg_type, boxed):
@@ -25,10 +25,10 @@ def gen_event_send_decl(name, arg_type, boxed): 


%(proto)s;

''',

                 proto=gen_event_send_proto(name, arg_type, boxed))

                 proto=build_event_send_proto(name, arg_type, boxed))





# Declare and initialize an object 'qapi' using parameters from gen_params()

# Declare and initialize an object 'qapi' using parameters from build_params()

def gen_param_var(typ):

    assert not typ.variants

    ret = mcgen('''
@@ -42,7 +42,7 @@ def gen_param_var(typ): 
        if memb.optional:

            ret += 'has_' + c_name(memb.name) + sep

        if memb.type.name == 'str':

            # Cast away const added in gen_params()

            # Cast away const added in build_params()

            ret += '(char *)'

        ret += c_name(memb.name)

    ret += mcgen('''
@@ -72,7 +72,7 @@ def gen_event_send(name, arg_type, boxed): 
    Error *err = NULL;

    QMPEventFuncEmit emit;

''',

                proto=gen_event_send_proto(name, arg_type, boxed))

                proto=build_event_send_proto(name, arg_type, boxed))



    if arg_type and not arg_type.is_empty():

        ret += mcgen('''