diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-06 12:09:56 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-06 12:09:56 +0100 |
commit | 006d5c741bbfcdbedeb59e14527fe58d45c9c76b (patch) | |
tree | 9b7a95c315e702ec6bab2277b8f2a2176d96e8a5 | |
parent | 7fe34ca9c2e99560dc65395d599a6920624b127d (diff) | |
parent | ec6b69ca0305ab3a3e0461aecb6f190c59a765df (diff) | |
download | qemu-006d5c741bbfcdbedeb59e14527fe58d45c9c76b.zip qemu-006d5c741bbfcdbedeb59e14527fe58d45c9c76b.tar.gz qemu-006d5c741bbfcdbedeb59e14527fe58d45c9c76b.tar.bz2 |
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: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | MAINTAINERS | 2 | ||||
-rw-r--r-- | tests/ide-test.c | 4 | ||||
-rw-r--r-- | tests/libqos/ahci.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e3e34fb..7603ea2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/tests/ide-test.c b/tests/ide-test.c index 5594738..b6e9e1a 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -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); } diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index cf66b3e..adb2665 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -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; |