diff options
| author | Peter Maydell | 2017-08-10 19:53:39 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-08-10 19:53:39 +0200 |
| commit | 95766c2cd04395e5712b4d5967b3251f35d537df (patch) | |
| tree | 3a57304ab5961497cfec4ac3c00d818e4053f3f4 /qobject/json-parser.c | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | virtio-blk: handle blk_getlength() errors (diff) | |
| download | qemu-95766c2cd04395e5712b4d5967b3251f35d537df.tar.gz qemu-95766c2cd04395e5712b4d5967b3251f35d537df.tar.xz qemu-95766c2cd04395e5712b4d5967b3251f35d537df.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Thu 10 Aug 2017 18:48:13 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: handle blk_getlength() errors
IDE: test flush on empty CDROM
IDE: Do not flush empty CDROM drives
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-parser.c')
0 files changed, 0 insertions, 0 deletions