Commit 20946956 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2019-09-28' into staging 



QAPI patches for 2019-09-28

# gpg: Signature made Sat 28 Sep 2019 16:18:13 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2019-09-28: (27 commits)
  qapi: Improve source file read error handling
  qapi: Improve reporting of redefinition
  qapi: Improve reporting of missing documentation comment
  qapi: Eliminate check_keys(), rename check_known_keys()
  qapi: Improve reporting of invalid 'if' further
  qapi: Avoid redundant definition references in error messages
  qapi: Improve reporting of missing / unknown definition keys
  qapi: Improve reporting of invalid flags
  qapi: Improve reporting of invalid 'if' errors
  qapi: Move context-free checking to the proper place
  qapi: Move context-sensitive checking to the proper place
  qapi: Inline check_name() into check_union()
  qapi: Plumb info to the QAPISchemaMember
  qapi: Make check_type()'s array case a bit more obvious
  qapi: Move check for reserved names out of add_name()
  qapi: Report invalid '*' prefix like any other invalid name
  qapi: Use check_name_str() where it suffices
  qapi: Improve reporting of invalid name errors
  qapi: Reorder check_FOO() parameters for consistency
  qapi: Improve reporting of member name clashes
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 95e9d74f c615550d

qapi/qapi-schema.json

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
        'QapiErrorClass',           # all members, visible through errors

        'UuidInfo',                 # UUID, visible through query-uuid

        'X86CPURegister32',         # all members, visible indirectly through qom-get

        'q_obj_CpuInfo-base'        # CPU, visible through query-cpu

        'CpuInfo'                   # CPU, visible through query-cpu

    ] } }



# Documentation generated with qapi-gen.py is in source order, with

qapi/qmp-dispatch.c

+3 −2
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request, 
        return NULL;

    }

    if (!cmd->enabled) {

        error_setg(errp, "The command %s has been disabled for this instance",

        error_set(errp, ERROR_CLASS_COMMAND_NOT_FOUND,

                  "The command %s has been disabled for this instance",

                  command);

        return NULL;

    }

scripts/qapi/common.py

+539 −513

File changed.

Preview size limit exceeded, changes collapsed.

scripts/qapi/events.py

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ void %(event_emit)s(%(event_enum)s event, QDict *qdict); 
                                          self._event_emit_name))

        # Note: we generate the enum member regardless of @ifcond, to

        # keep the enumeration usable in target-independent code.

        self._event_enum_members.append(QAPISchemaEnumMember(name))

        self._event_enum_members.append(QAPISchemaEnumMember(name, None))





def gen_events(schema, output_dir, prefix):

tests/qapi-schema/allow-preconfig-test.err

+2 −1
Original line number Diff line number Diff line 
tests/qapi-schema/allow-preconfig-test.json:2: 'allow-preconfig' of command 'allow-preconfig-test' should only use true value
 
tests/qapi-schema/allow-preconfig-test.json: In command 'allow-preconfig-test':

tests/qapi-schema/allow-preconfig-test.json:2: flag 'allow-preconfig' may only use true value