diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-26 16:54:19 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-26 16:54:19 -0500 |
| commit | 405c97c3a5950d8a49b90cb977e33b6b3f9a8f95 (patch) | |
| tree | 0ea08a86ce91960577be3b720de34a0dddfe7623 /include/qapi/qmp/qobject.h | |
| parent | 2fb861eb02f0955876e15b3de1f9c2d1f469dcf2 (diff) | |
| parent | e3409362bd64731e042c9d001e43cc1d13d2df5d (diff) | |
| download | qemu-405c97c3a5950d8a49b90cb977e33b6b3f9a8f95.tar.gz | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
# By Kevin Wolf (16) and Ian Main (2)
# Via Kevin Wolf
* kwolf/for-anthony:
Add tests for sync modes 'TOP' and 'NONE'
Implement sync modes for drive-backup.
Implement qdict_flatten()
blockdev: Split up 'cache' option
blockdev: Rename 'readonly' option to 'read-only'
qcow2: Use dashes instead of underscores in options
blockdev: Rename I/O throttling options for QMP
QemuOpts: Add qemu_opt_unset()
block: Allow "driver" option on the top level
qapi: Anonymous unions
qapi.py: Maintain a list of union types
qapi: Add consume argument to qmp_input_get_object()
qapi: Flat unions with arbitrary discriminator
qapi: Add visitor for implicit structs
docs: Document QAPI union types
qapi-visit.py: Implement 'base' for unions
qapi-visit.py: Split off generate_visit_struct_fields()
qapi-types.py: Implement 'base' for unions
Message-id: 1374870032-31672-1-git-send-email-kwolf@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include/qapi/qmp/qobject.h')
| -rw-r--r-- | include/qapi/qmp/qobject.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/qapi/qmp/qobject.h b/include/qapi/qmp/qobject.h index 9124649ed2..d0bbc7c4a6 100644 --- a/include/qapi/qmp/qobject.h +++ b/include/qapi/qmp/qobject.h @@ -44,6 +44,7 @@ typedef enum { QTYPE_QFLOAT, QTYPE_QBOOL, QTYPE_QERROR, + QTYPE_MAX, } qtype_code; struct QObject; |