The following changes since commit 9d861fa595c93f22d1d55b723a691531c36c9672:
Merge remote branch 'arm/for-anthony' into staging (2010-12-17 08:25:17 -0600) are available in the git repository at: git://repo.or.cz/qemu/kevin.git for-anthony Alexander Graf (10): ide: split ide command interpretation off ide: fix whitespace gap in ide_exec_cmd ide: Split out BMDMA code from ATA core ide: move transfer_start after variable modification pci: add storage class for sata pci: add ich9 pci id ahci: add ahci emulation config: move ide core and pci to pci.mak config: add ahci for pci capable machines ide: honor ncq for atapi Christoph Hellwig (3): block: add discard support scsi-disk: support WRITE SAME (16) with unmap bit raw-posix: add discard support Jes Sorensen (9): Introduce strtosz_suffix() qemu-img.c: Clean up handling of image size in img_create() qemu-img.c: Re-factor img_create() Introduce do_snapshot_blkdev() and monitor command to handle it. Prevent creating an image with the same filename as backing file bdrv_img_create() use proper errno return values qemu.img.c: Use error_report() instead of own error() implementation block/qcow2.c: rename qcow_ functions to qcow2_ Add proper -errno error return values to qcow2_open() Kevin Wolf (3): qemu-img: Call error_set_progname Remove NULL checks for bdrv_new return value qemu-io: Fix typo in help texts Roland Elek (1): ide: add ncq identify data for ahci sata drives Ryan Harper (1): blockdev: check dinfo ptr before using Sebastian Herbszt (1): ahci: set SATA Mode Select Stefan Hajnoczi (10): block: Introduce path_has_protocol() function block: Fix the use of protocols in backing files ide: Register vm change state handler once only qemu-io: Add discard command docs: Add QED image format specification qed: Add QEMU Enhanced Disk image format qed: Table, L2 cache, and cluster functions qed: Read/write support qed: Consistency check support docs: Fix missing carets in QED specification Makefile.objs | 3 + block.c | 234 +++++- block.h | 5 + block/qcow2-cluster.c | 6 +- block/qcow2-snapshot.c | 6 +- block/qcow2.c | 248 +++--- block/qed-check.c | 210 +++++ block/qed-cluster.c | 154 ++++ block/qed-gencb.c | 32 + block/qed-l2-cache.c | 173 ++++ block/qed-table.c | 319 +++++++ block/qed.c | 1349 ++++++++++++++++++++++++++++++ block/qed.h | 301 +++++++ block/raw-posix.c | 45 + block/raw.c | 6 + block_int.h | 8 +- blockdev.c | 68 ++- blockdev.h | 1 + configure | 26 + cutils.c | 17 +- default-configs/arm-softmmu.mak | 1 - default-configs/i386-softmmu.mak | 3 - default-configs/mips-softmmu.mak | 3 - default-configs/mips64-softmmu.mak | 3 - default-configs/mips64el-softmmu.mak | 3 - default-configs/mipsel-softmmu.mak | 3 - default-configs/pci.mak | 4 + default-configs/ppc-softmmu.mak | 3 - default-configs/ppc64-softmmu.mak | 3 - default-configs/ppcemb-softmmu.mak | 3 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 3 - default-configs/x86_64-softmmu.mak | 3 - docs/specs/qed_spec.txt | 130 +++ hmp-commands.hx | 19 + hw/ide/ahci.c | 1527 ++++++++++++++++++++++++++++++++++ hw/ide/cmd646.c | 18 +- hw/ide/core.c | 1116 +++++++++++-------------- hw/ide/internal.h | 73 +- hw/ide/pci.c | 280 ++++++- hw/ide/pci.h | 30 + hw/ide/piix.c | 34 +- hw/ide/via.c | 34 +- hw/pci.h | 1 + hw/pci_ids.h | 1 + hw/scsi-defs.h | 1 + hw/scsi-disk.c | 53 ++- hw/xen_disk.c | 17 +- qemu-common.h | 7 + qemu-img.c | 250 ++---- qemu-io.c | 102 +++- qemu-nbd.c | 2 - trace-events | 21 + 54 files changed, 5892 insertions(+), 1072 deletions(-) create mode 100644 block/qed-check.c create mode 100644 block/qed-cluster.c create mode 100644 block/qed-gencb.c create mode 100644 block/qed-l2-cache.c create mode 100644 block/qed-table.c create mode 100644 block/qed.c create mode 100644 block/qed.h create mode 100644 docs/specs/qed_spec.txt create mode 100644 hw/ide/ahci.c