From: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed, 27 Apr 2011 14:26:18 +0000 (+0200)
Subject: Merge branch 'for-anthony' of git://repo.or.cz/qemu/kevin
X-Git-Tag: v0.15.0-rc0~337
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=aa348082d8e89d2ab021caadbcc97c93038fffb2;p=qemu-xen-4.4-testing.git

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

* 'for-anthony' of git://repo.or.cz/qemu/kevin:
  Remove obsolete 'enabled' variable from progress state
  Add dd-style SIGUSR1 progress reporting
  qed: Fix consistency check on 32-bit hosts
  ide/atapi: Introduce CHECK_READY flag for commands
  ide/atapi: Replace bdrv_get_geometry calls by s->nb_sectors
  ide/atapi: Use table instead of switch for commands
  ide/atapi: Factor commands out
  ide: Split atapi.c out
  Improve accuracy of block migration bandwidth calculation
  atapi: Add 'medium ready' to 'medium not ready' transition on cd change
  qemu-img: allow rebase to a NULL backing file when unsafe
---

aa348082d8e89d2ab021caadbcc97c93038fffb2