From: Aurelien Jarno <aurelien@aurel32.net>
Date: Fri, 30 Jul 2010 19:12:24 +0000 (+0200)
Subject: Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cdc6f542007a6aee0b18a5d616d031c750691e7a;p=qemu.git

Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin

* 'for-anthony' of git://repo.or.cz/qemu/kevin:
  Fix -snapshot deleting images on disk change
  block: Use error codes from lower levels for error message
  block: default to 0 minimal / optiomal I/O size
  move 'unsafe' to end of caching modes in help
  virtio-blk: Create exit function to unregister savevm
  block migration: propagate return value when bdrv_write() returns < 0
  ide/atapi: add support for GET EVENT STATUS NOTIFICATION
---

cdc6f542007a6aee0b18a5d616d031c750691e7a