mirror of
https://github.com/mii443/qemu.git
synced 2025-08-22 23:25:48 +00:00
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>
This commit is contained in:
@ -667,6 +667,7 @@ F: hw/block/cdrom.c
|
|||||||
F: hw/block/hd-geometry.c
|
F: hw/block/hd-geometry.c
|
||||||
F: tests/ide-test.c
|
F: tests/ide-test.c
|
||||||
F: tests/ahci-test.c
|
F: tests/ahci-test.c
|
||||||
|
F: tests/libqos/ahci*
|
||||||
T: git git://github.com/jnsnow/qemu.git ide
|
T: git git://github.com/jnsnow/qemu.git ide
|
||||||
|
|
||||||
Floppy
|
Floppy
|
||||||
@ -675,6 +676,7 @@ L: qemu-block@nongnu.org
|
|||||||
S: Supported
|
S: Supported
|
||||||
F: hw/block/fdc.c
|
F: hw/block/fdc.c
|
||||||
F: include/hw/block/fdc.h
|
F: include/hw/block/fdc.h
|
||||||
|
F: tests/fdc-test.c
|
||||||
T: git git://github.com/jnsnow/qemu.git ide
|
T: git git://github.com/jnsnow/qemu.git ide
|
||||||
|
|
||||||
OMAP
|
OMAP
|
||||||
|
@ -633,7 +633,7 @@ static void send_scsi_cdb_read10(uint64_t lba, int nblocks)
|
|||||||
|
|
||||||
/* Send Packet */
|
/* Send Packet */
|
||||||
for (i = 0; i < sizeof(Read10CDB)/2; i++) {
|
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 offset = i * (limit / 2);
|
||||||
size_t rem = (rxsize / 2) - offset;
|
size_t rem = (rxsize / 2) - offset;
|
||||||
for (j = 0; j < MIN((limit / 2), rem); j++) {
|
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);
|
ide_wait_intr(IDE_PRIMARY_IRQ);
|
||||||
}
|
}
|
||||||
|
@ -742,7 +742,7 @@ AHCICommand *ahci_command_create(uint8_t command_name)
|
|||||||
g_assert(!(props->lba28 && props->lba48));
|
g_assert(!(props->lba28 && props->lba48));
|
||||||
g_assert(!(props->read && props->write));
|
g_assert(!(props->read && props->write));
|
||||||
g_assert(!props->size || props->data);
|
g_assert(!props->size || props->data);
|
||||||
g_assert(!props->ncq || (props->ncq && props->lba48));
|
g_assert(!props->ncq || props->lba48);
|
||||||
|
|
||||||
/* Defaults and book-keeping */
|
/* Defaults and book-keeping */
|
||||||
cmd->props = props;
|
cmd->props = props;
|
||||||
|
Reference in New Issue
Block a user