Merge remote-tracking branch 'stefanha/block' into staging
commiteddbf0ab9db8385d7cb57e23891c1d41488b303e
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Jul 2013 16:33:48 +0000 (29 11:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Jul 2013 16:33:48 +0000 (29 11:33 -0500)
tree54e875e237c4a0d0f6ee09f3489dd9ceaf5f529b
parent4ff1fac4305f78d9cf987ca8abf3bda7f29c856e
parentb0f2027cde31c645524256763672e09eeb204a9a
Merge remote-tracking branch 'stefanha/block' into staging

# By Stefan Hajnoczi (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
  dataplane: refuse to start if device is already in use
  dataplane: enable virtio-blk x-data-plane=on live migration
  migration: fix spice migration
  migration: notify migration state before starting thread
  block: Repair the throttling code.
  gluster: Add image resize support

Message-id: 1375112172-24863-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/block/virtio-blk.c