* [Qemu-devel] [PULL 0/3] Ide patches
@ 2015-10-05 16:01 John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion John Snow
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: John Snow @ 2015-10-05 16:01 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
The following changes since commit c0b520dfb8890294a9f8879f4759172900585995:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-10-02 16:59:21 +0100)
are available in the git repository at:
https://github.com/jnsnow/qemu.git tags/ide-pull-request
for you to fetch changes up to ec6b69ca0305ab3a3e0461aecb6f190c59a765df:
qtest/ide-test: ppc64be correction for ATAPI tests (2015-10-05 12:00:56 -0400)
----------------------------------------------------------------
----------------------------------------------------------------
John Snow (3):
qtest/ahci: fix redundant assertion
MAINTAINERS: Small IDE/FDC touchup
qtest/ide-test: ppc64be correction for ATAPI tests
MAINTAINERS | 2 ++
tests/ide-test.c | 4 ++--
tests/libqos/ahci.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
--
2.4.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion
2015-10-05 16:01 [Qemu-devel] [PULL 0/3] Ide patches John Snow
@ 2015-10-05 16:01 ` John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 2/3] MAINTAINERS: Small IDE/FDC touchup John Snow
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: John Snow @ 2015-10-05 16:01 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
Fixes https://bugs.launchpad.net/qemu/+bug/1497711
(!ncq || (ncq && lba48)) is the same as
(!ncq || lba48).
The intention is simply: "If a command is NCQ,
it must also be LBA48."
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1442868929-17777-1-git-send-email-jsnow@redhat.com
---
tests/libqos/ahci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 2/3] MAINTAINERS: Small IDE/FDC touchup
2015-10-05 16:01 [Qemu-devel] [PULL 0/3] Ide patches John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion John Snow
@ 2015-10-05 16:01 ` John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 3/3] qtest/ide-test: ppc64be correction for ATAPI tests John Snow
2015-10-06 12:42 ` [Qemu-devel] [PULL 0/3] Ide patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: John Snow @ 2015-10-05 16:01 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
libqos/ahci and tests/fdc-test are under my purview also,
include them in the appropriate stanzas.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1443117055-29240-1-git-send-email-jsnow@redhat.com
---
MAINTAINERS | 2 ++
1 file changed, 2 insertions(+)
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
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PULL 3/3] qtest/ide-test: ppc64be correction for ATAPI tests
2015-10-05 16:01 [Qemu-devel] [PULL 0/3] Ide patches John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 2/3] MAINTAINERS: Small IDE/FDC touchup John Snow
@ 2015-10-05 16:01 ` John Snow
2015-10-06 12:42 ` [Qemu-devel] [PULL 0/3] Ide patches Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: John Snow @ 2015-10-05 16:01 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, jsnow
the 16bit ide data register is LE by definition.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1443461938-30039-1-git-send-email-jsnow@redhat.com
---
tests/ide-test.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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);
}
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PULL 0/3] Ide patches
2015-10-05 16:01 [Qemu-devel] [PULL 0/3] Ide patches John Snow
` (2 preceding siblings ...)
2015-10-05 16:01 ` [Qemu-devel] [PULL 3/3] qtest/ide-test: ppc64be correction for ATAPI tests John Snow
@ 2015-10-06 12:42 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2015-10-06 12:42 UTC (permalink / raw)
To: John Snow; +Cc: QEMU Developers
On 5 October 2015 at 17:01, John Snow <jsnow@redhat.com> wrote:
> The following changes since commit c0b520dfb8890294a9f8879f4759172900585995:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2015-10-02 16:59:21 +0100)
>
> are available in the git repository at:
>
> https://github.com/jnsnow/qemu.git tags/ide-pull-request
>
> for you to fetch changes up to ec6b69ca0305ab3a3e0461aecb6f190c59a765df:
>
> qtest/ide-test: ppc64be correction for ATAPI tests (2015-10-05 12:00:56 -0400)
>
> ----------------------------------------------------------------
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-06 12:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-05 16:01 [Qemu-devel] [PULL 0/3] Ide patches John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 1/3] qtest/ahci: fix redundant assertion John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 2/3] MAINTAINERS: Small IDE/FDC touchup John Snow
2015-10-05 16:01 ` [Qemu-devel] [PULL 3/3] qtest/ide-test: ppc64be correction for ATAPI tests John Snow
2015-10-06 12:42 ` [Qemu-devel] [PULL 0/3] Ide patches Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).