From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 25 Sep 2018 11:29:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-09-24' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f69d20fa8badbd6b515cc3d9e0a95b36f0410a46;p=qemu.git

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>
---

f69d20fa8badbd6b515cc3d9e0a95b36f0410a46