summaryrefslogtreecommitdiffstats
path: root/hw/display/framebuffer.c
diff options
context:
space:
mode:
authorMarkus Armbruster2015-06-08 10:44:30 +0200
committerPeter Maydell2015-06-08 13:12:11 +0200
commit779cec4d20907cbccb26fbf5f5c19c6cdee33eff (patch)
treeb730bc9f1dd4e1c39356f61fa06037534d73a03c /hw/display/framebuffer.c
parentMerge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' in... (diff)
downloadqemu-779cec4d20907cbccb26fbf5f5c19c6cdee33eff.tar.gz
qemu-779cec4d20907cbccb26fbf5f5c19c6cdee33eff.tar.xz
qemu-779cec4d20907cbccb26fbf5f5c19c6cdee33eff.zip
monitor: Fix QMP ABI breakage around "id"
Commit 65207c5 accidentally dropped a line of code we need along with a comment that became wrong then. This made QMP reject "id": {"execute": "system_reset", "id": "1"} {"error": {"class": "GenericError", "desc": "QMP input object member 'id' is unexpected"}} Put the lost line right back, so QMP again accepts and returns "id", as promised by the ABI: {"execute": "system_reset", "id": "1"} {"return": {}, "id": "1"} Reported-by: Fabio Fantoni <fabio.fantoni@m2r.biz> Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Don Slutz <dslutz@verizon.com> Tested-by: Fabio Fantoni <fabio.fantoni@m2r.biz> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> Signed-off-by: Pavel Fedin <p.fedin@samsung.com> Tested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-id: 1433753070-12632-2-git-send-email-armbru@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/framebuffer.c')
0 files changed, 0 insertions, 0 deletions