On 07/06/2010 10:33 AM, Kevin Wolf wrote:
The following changes since commit 734003e6153b3552b9406ef598a1e67aac4a899e: Anthony Liguori (1): Merge remote branch 'kwolf/for-anthony' into staging
Pulled. Thanks. Regards, Anthony Liguori
are available in the git repository at: git://repo.or.cz/qemu/kevin.git for-anthony Kevin Wolf (2): qemu-img check: Distinguish different kinds of errors qcow2/vdi: Change check to distinguish error cases MORITA Kazutaka (1): block: add sheepdog driver for distributed storage support Markus Armbruster (13): blockdev: Clean up how readonly persists across virtual media change block migration: Fix test for read-only drive raw-posix: Fix test for host CD-ROM fdc: Reject unimplemented error actions qdev: Don't hw_error() in qdev_init_nofail() scsi: Reject unimplemented error actions error: New qemu_opts_loc_restore() scsi: Error locations for -drive if=scsi device initialization ide: Improve error messages ide: Replace IDEState members is_cdrom, is_cf by drive_kind ide: Make ide_init_drive() return success ide: Reject readonly drives unless CD-ROM ide: Reject invalid CHS geometry john cooper (1): Add virtio disk identification support Makefile.objs | 2 +- block-migration.c | 2 +- block.c | 9 +- block.h | 10 +- block/qcow2-refcount.c | 120 ++-- block/qcow2.c | 4 +- block/qcow2.h | 2 +- block/raw-posix.c | 17 +- block/sheepdog.c | 2036 ++++++++++++++++++++++++++++++++++++++++++++++++ block/vdi.c | 10 +- block_int.h | 7 +- blockdev.c | 2 +- hw/fdc.c | 22 +- hw/ide/core.c | 70 ++- hw/ide/internal.h | 9 +- hw/ide/macio.c | 2 +- hw/ide/microdrive.c | 2 +- hw/ide/qdev.c | 13 +- hw/qdev.c | 6 +- hw/scsi-bus.c | 4 + hw/scsi-disk.c | 5 + hw/scsi-generic.c | 9 + hw/virtio-blk.c | 14 + hw/virtio-blk.h | 3 + qemu-img.c | 63 ++- qemu-option.c | 5 + qemu-option.h | 1 + 27 files changed, 2308 insertions(+), 141 deletions(-) create mode 100644 block/sheepdog.c