mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-----BEGIN PGP SIGNATURE-----

Browse Source 
Version: GnuPG v1
 
 iQIcBAABAgAGBQJWEp7HAAoJEH3vgQaq/DkOUgIP/18CdrHP6B75zd3Za8wB9OKD
 MZRz1Nu3KLfxqBNp7kuE2JxdtuUhbEeotT7rapP5cUkksjsj7LiSDViBTOw31P3z
 3HwsPcjKhQoFOxD5UlwwwbvpZoqBZ5iLT6UVPiZmIkr3rQtq0oGmsUwmmLnpoo8D
 v6gSV8D0w1lJ4ZZyTNL0sypGz9ZXQYpm9hFP837do9wvXwROEdl6+zwK1JwnC1zV
 DEv3dmbdak+V2W8HSRMrFsdJ3zKNj0il/TfPSIWSpLxszbe2LMKjJEzx4RnZqvQ8
 6ug0PgD7vCAFhOEUuw9vT933dl+iGFtlZV4p6CtSfaEBfci6q/zDoIain3VGJLca
 ULqSyl7HX+wTE9zIYiijRFZri5BLo/J1CvsnMOmk+S0dMzCYYo+I+HsYeCujf9Ro
 XWoSr1IS9Enua+w4AfWEvYazDsEyKhBADCrrwpQ5/QMpRywYu2WDIFYgkf2h78hX
 tZVH7T9t+swTRzpHhjxGNxUpvqg1zpCUAfQCkKjS29CUb/pyXO8dJjaPrsbzzOA5
 DEt5QNW4H5hmTNw8Jv7fEcalOPDDrnVmSYZYMl6F3xbIPMY0G+xM02thNuoiBQsY
 b2R1evgdNtJNUqxPhpk2LXo/b9psSQ8PlRhhnPD7U5xb3NeaKp44foq0skWRPs3M
 w41eSjTsMzyl3zVdNw+f
 =r+UL
 -----END PGP SIGNATURE-----

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:
Peter Maydell 2015-10-06 12:09:56 +01:00
commit 006d5c741b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -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

4
tests/ide-test.c
View File

@ -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);
} }

2
tests/libqos/ahci.c
View File

@ -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;