Commit 5c5432e7 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'luiz/queue/qmp' into staging 



# By Luiz Capitulino (1) and Richard Henderson (1)
# Via Luiz Capitulino
* luiz/queue/qmp:
  MAINTAINERS: add git tree info for HMP, QMP and QAPI
  Adjust qapi-visit for python-2.4.3

Message-id: 1384281985-11100-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@amazon.com>
parents 29c5b77d dce07e0b

MAINTAINERS

+4 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ S: Supported 
F: monitor.c

F: hmp.c

F: hmp-commands.hx

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



Network device layer

M: Anthony Liguori <aliguori@amazon.com>
@@ -720,6 +721,7 @@ M: Luiz Capitulino <lcapitulino@redhat.com> 
M: Michael Roth <mdroth@linux.vnet.ibm.com>

S: Supported

F: qapi/

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



QAPI Schema

M: Eric Blake <eblake@redhat.com>
@@ -727,6 +729,7 @@ M: Luiz Capitulino <lcapitulino@redhat.com> 
M: Markus Armbruster <armbru@redhat.com>

S: Supported

F: qapi-schema.json

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



QMP

M: Luiz Capitulino <lcapitulino@redhat.com>
@@ -735,6 +738,7 @@ F: qmp.c 
F: monitor.c

F: qmp-commands.hx

F: QMP/

T: git git://repo.or.cz/qemu/qmp-unstable.git queue/qmp



SLIRP

M: Jan Kiszka <jan.kiszka@siemens.com>

scripts/qapi-visit.py

+14 −3
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ import errno 
def generate_visit_struct_fields(name, field_prefix, fn_prefix, members, base = None):

    substructs = []

    ret = ''

    full_name = name if not fn_prefix else "%s_%s" % (name, fn_prefix)

    if not fn_prefix:

        full_name = name

    else:

        full_name = "%s_%s" % (name, fn_prefix)



    for argname, argentry, optional, structured in parse_args(members):

        if structured:
@@ -97,7 +100,10 @@ if (!error_is_set(errp)) { 
''')

    push_indent()



    full_name = name if not field_prefix else "%s_%s" % (field_prefix, name)

    if not field_prefix:

        full_name = name

    else:

        full_name = "%s_%s" % (field_prefix, name)



    if len(field_prefix):

        ret += mcgen('''
@@ -283,12 +289,17 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** 
            name=name)



    pop_indent()



    if not discriminator:

        desc_type = "type"

    else:

        desc_type = discriminator

    ret += mcgen('''

        visit_type_%(name)sKind(m, &(*obj)->kind, "%(type)s", &err);

        if (!err) {

            switch ((*obj)->kind) {

''',

                 name=name, type="type" if not discriminator else discriminator)

                 name=name, type=desc_type)



    for key in members:

        if not discriminator: