diff options
| author | Anthony Liguori | 2013-07-26 23:54:19 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-07-26 23:54:19 +0200 |
| commit | 405c97c3a5950d8a49b90cb977e33b6b3f9a8f95 (patch) | |
| tree | 0ea08a86ce91960577be3b720de34a0dddfe7623 /qobject/qjson.c | |
| parent | seccomp: removing unused syscalls gtom whitelist (diff) | |
| parent | Add tests for sync modes 'TOP' and 'NONE' (diff) | |
| download | qemu-405c97c3a5950d8a49b90cb977e33b6b3f9a8f95.tar.gz qemu-405c97c3a5950d8a49b90cb977e33b6b3f9a8f95.tar.xz qemu-405c97c3a5950d8a49b90cb977e33b6b3f9a8f95.zip | |
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 'qobject/qjson.c')
| -rw-r--r-- | qobject/qjson.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c index 19085a1bb7..6cf2511580 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -260,6 +260,8 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent) /* XXX: should QError be emitted? */ case QTYPE_NONE: break; + case QTYPE_MAX: + abort(); } } |