• E
    qapi: Use strict QMP input visitor in more places · 240f64b6
    Eric Blake 提交于
    The following uses of a QMP input visitor should be strict
    (that is, excess keys in QDict input should be flagged if not
    converted to QAPI):
    
    - Testsuite code unrelated to explicitly testing non-strict
    mode (test-qmp-commands, test-visitor-serialization); since
    we want more code to be strict by default, having more tests
    of strict mode doesn't hurt
    
    - Code used for cloning QAPI objects (replay-input.c,
    qemu-sockets.c); we are reparsing a QObject just barely
    produced by the qmp output visitor and which therefore should
    not have any garbage, so while it is extra work to be strict,
    it validates that our clone is correct [note that a later patch
    series will simplify these two uses by creating an actual
    clone visitor that is much more efficient than a
    generate/reparse cycle]
    
    - qmp_object_add(), which calls into user_creatable_add_type().
    Since command line parsing for '-object' uses the same
    user_creatable_add_type() through the OptsVisitor, and that is
    always strict, we want to ensure that any nested dictionaries
    would be treated the same in QMP and from the command line (I
    don't actually know if such nested dictionaries exist).  Note
    that on this code change, strictness only matters for nested
    dictionaries (if even possible), since we already flag excess
    input at the top level during an earlier object_property_set()
    on an unknown key, whether from QemuOpts:
    
    $ ./x86_64-softmmu/qemu-system-x86_64 -nographic -nodefaults -qmp stdio -object secret,id=sec0,data=letmein,format=raw,foo=bar
    qemu-system-x86_64: -object secret,id=sec0,data=letmein,format=raw,foo=bar: Property '.foo' not found
    
    or from QMP:
    
    $ ./x86_64-softmmu/qemu-system-x86_64 -nographic -nodefaults -qmp stdio
    {"QMP": {"version": {"qemu": {"micro": 93, "minor": 5, "major": 2}, "package": ""}, "capabilities": []}}
    {"execute":"qmp_capabilities"}
    {"return": {}}
    {"execute":"object-add","arguments":{"qom-type":"secret","id":"sec0","props":{"format":"raw","data":"letmein","foo":"bar"}}}
    {"error": {"class": "GenericError", "desc": "Property '.foo' not found"}}
    
    The only remaining uses of non-strict input visits are:
    
    - QMP 'qom-set' (which eventually executes
    object_property_set_qobject()) - mark it as something to revisit
    in the future (I didn't want to spend any more time on this patch
    auditing if we have any QOM dictionary properties that might be
    impacted, and couldn't easily prove whether this code path is
    shared with anything else).
    
    - test-qmp-input-visitor: explicit tests of non-strict mode. If
    we later get rid of users that don't need strictness, then this
    test should be merged with test-qmp-input-strict
    Signed-off-by: NEric Blake <eblake@redhat.com>
    Message-Id: <1461879932-9020-7-git-send-email-eblake@redhat.com>
    Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
    240f64b6
qmp.c 18.8 KB