Commit 006d5c74 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging 



# gpg: Signature made Mon 05 Oct 2015 17:01:11 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  qtest/ide-test: ppc64be correction for ATAPI tests
  MAINTAINERS: Small IDE/FDC touchup
  qtest/ahci: fix redundant assertion

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7fe34ca9 ec6b69ca

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ F: hw/block/cdrom.c 
F: hw/block/hd-geometry.c

F: tests/ide-test.c

F: tests/ahci-test.c

F: tests/libqos/ahci*

T: git git://github.com/jnsnow/qemu.git ide



Floppy
@@ -675,6 +676,7 @@ L: qemu-block@nongnu.org 
S: Supported

F: hw/block/fdc.c

F: include/hw/block/fdc.h

F: tests/fdc-test.c

T: git git://github.com/jnsnow/qemu.git ide



OMAP

tests/ide-test.c

+2 −2
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ static void send_scsi_cdb_read10(uint64_t lba, int nblocks) 


    /* Send Packet */

    for (i = 0; i < sizeof(Read10CDB)/2; i++) {

        outw(IDE_BASE + reg_data, ((uint16_t *)&pkt)[i]);

        outw(IDE_BASE + reg_data, cpu_to_le16(((uint16_t *)&pkt)[i]));

    }

}
@@ -733,7 +733,7 @@ static void cdrom_pio_impl(int nblocks) 
        size_t offset = i * (limit / 2);

        size_t rem = (rxsize / 2) - offset;

        for (j = 0; j < MIN((limit / 2), rem); j++) {

            rx[offset + j] = inw(IDE_BASE + reg_data);

            rx[offset + j] = le16_to_cpu(inw(IDE_BASE + reg_data));

        }

        ide_wait_intr(IDE_PRIMARY_IRQ);

    }

tests/libqos/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ AHCICommand *ahci_command_create(uint8_t command_name) 
    g_assert(!(props->lba28 && props->lba48));

    g_assert(!(props->read && props->write));

    g_assert(!props->size || props->data);

    g_assert(!props->ncq || (props->ncq && props->lba48));

    g_assert(!props->ncq || props->lba48);



    /* Defaults and book-keeping */

    cmd->props = props;