summary refs log tree commit diff stats
path: root/hw/core/machine.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2017-06-26 14:57:27 +0200
committerKevin Wolf <kwolf@redhat.com>2017-06-26 14:57:27 +0200
commit704e41ba789ad88158f051eee648d7087beffac7 (patch)
treeeb0666929a0bb50eec2b6c6e69151919691ff3f7 /hw/core/machine.c
parentc5f1ad429cdf26023cf331075a7d327708e3db6d (diff)
parent2a245709099e98bca638694c182f1e5627567df7 (diff)
downloadfocaccia-qemu-704e41ba789ad88158f051eee648d7087beffac7.tar.gz
focaccia-qemu-704e41ba789ad88158f051eee648d7087beffac7.zip
Merge remote-tracking branch 'mreitz/tags/pull-block-2017-06-26' into queue-block
Block patches for the block queue

# gpg: Signature made Mon Jun 26 14:56:24 2017 CEST
# gpg:                using RSA key 0xF407DB0061D5CF40
# gpg: Good signature from "Max Reitz <mreitz@redhat.com>"
# Primary key fingerprint: 91BE B60A 30DB 3E88 57D1  1829 F407 DB00 61D5 CF40

* mreitz/tags/pull-block-2017-06-26:
  qemu-img: don't shadow opts variable in img_dd()
  block: Do not strcmp() with NULL uri->scheme
  blkverify: Catch bs->exact_filename overflow
  blkdebug: Catch bs->exact_filename overflow
  fix: avoid an infinite loop or a dangling pointer problem in img_commit
  block: change variable names in BlockDriverState

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/core/machine.c')
0 files changed, 0 insertions, 0 deletions