summary refs log tree commit diff stats
path: root/include/hw/qdev-core.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-09-25 12:29:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-09-25 12:29:14 +0100
commitf69d20fa8badbd6b515cc3d9e0a95b36f0410a46 (patch)
treeb6e37a862c8603fbf3f4d3b66fac27417a35d7d5 /include/hw/qdev-core.h
parent2f831d04985f064e9306fa58db516e0a3e1df918 (diff)
parent1e960b46024d468e76d2f42ddcfa5a9d521db492 (diff)
downloadfocaccia-qemu-f69d20fa8badbd6b515cc3d9e0a95b36f0410a46.tar.gz
focaccia-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 'include/hw/qdev-core.h')
0 files changed, 0 insertions, 0 deletions