diff options
author | Peter Maydell | 2018-09-25 13:29:14 +0200 |
---|---|---|
committer | Peter Maydell | 2018-09-25 13:29:14 +0200 |
commit | f69d20fa8badbd6b515cc3d9e0a95b36f0410a46 (patch) | |
tree | b6e37a862c8603fbf3f4d3b66fac27417a35d7d5 /cpus.c | |
parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2018-09-24' into... (diff) | |
parent | json: Eliminate lexer state IN_WHITESPACE, pseudo-token JSON_SKIP (diff) | |
download | qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.tar.gz qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.tar.xz qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.zip |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-09-24' into staging
QObject patches for 2018-09-24
# gpg: Signature made Mon 24 Sep 2018 17:09:58 BST
# gpg: using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-qobject-2018-09-24:
json: Eliminate lexer state IN_WHITESPACE, pseudo-token JSON_SKIP
json: Eliminate lexer state IN_ERROR
json: Nicer recovery from lexical errors
json: Make lexer's "character consumed" logic less confusing
json: Clean up how lexer consumes "end of input"
json: Fix lexer for lookahead character beyond '\x7F'
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'cpus.c')
0 files changed, 0 insertions, 0 deletions