From: John Snow <jsnow@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>, qemu-devel@nongnu.org
Cc: stefanha@redhat.com, mst@redhat.com
Subject: Re: [Qemu-devel] [RFC 01/10] ide: add is_write() macro for semantic consistency
Date: Sat, 13 Sep 2014 13:01:01 -0400 [thread overview]
Message-ID: <5414784D.6060308@redhat.com> (raw)
In-Reply-To: <54143E8D.3010704@redhat.com>
On 09/13/2014 08:54 AM, Paolo Bonzini wrote:
> Il 13/09/2014 06:34, John Snow ha scritto:
>> The prepare_buf callback takes an argument named /is_write/,
>> however in core.c we are checking to see if this DMA command
>> is /is_read/. I am adding a small macro to correct this oversight.
>>
>> Impact: Nothing, yet.
>> -The prepare_buf callback is only used in ahci and pci, and both
>> versions of this callback name the incoming argument is_write.
>> -Both functions ignore this hint currently, anyway.
>>
>> This is therefore a simple patch to avoid future mistakes.
>>
>> Signed-off-by: John Snow <jsnow@redhat.com>
>> ---
>> hw/ide/core.c | 2 +-
>> hw/ide/internal.h | 2 ++
>> 2 files changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/ide/core.c b/hw/ide/core.c
>> index 191f893..3d682e2 100644
>> --- a/hw/ide/core.c
>> +++ b/hw/ide/core.c
>> @@ -718,7 +718,7 @@ void ide_dma_cb(void *opaque, int ret)
>> n = s->nsector;
>> s->io_buffer_index = 0;
>> s->io_buffer_size = n * 512;
>> - if (s->bus->dma->ops->prepare_buf(s->bus->dma, ide_cmd_is_read(s)) == 0) {
>> + if (s->bus->dma->ops->prepare_buf(s->bus->dma, ide_cmd_is_write(s)) == 0) {
>> /* The PRDs were too short. Reset the Active bit, but don't raise an
>> * interrupt. */
>> s->status = READY_STAT | SEEK_STAT;
>> diff --git a/hw/ide/internal.h b/hw/ide/internal.h
>> index 5c19f79..72d0147 100644
>> --- a/hw/ide/internal.h
>> +++ b/hw/ide/internal.h
>> @@ -338,6 +338,8 @@ enum ide_dma_cmd {
>>
>> #define ide_cmd_is_read(s) \
>> ((s)->dma_cmd == IDE_DMA_READ)
>> +#define ide_cmd_is_write(s) \
>> + ((s)->dma_cmd == IDE_DMA_WRITE)
>>
>> /* NOTE: IDEState represents in fact one drive */
>> struct IDEState {
>>
>
> Actually the code is right (!).
>
> A read command corresponds to a DMA write. A write or trim will read
> data from memory, so it is a DMA read.
>
> See for example how rw_buf is only used from the READ CD command, but
> passes 1 for the second argument of prepare_buf.
>
> Paolo
>
Ah, okay ... It didn't seem as if this argument was actually getting
/used/ anywhere yet, so it wasn't really clear what it was intended to
mean or for whom. None of the prepare_buf implementations actually seem
to use this bit.
If you think this is correct the way it is, we should probably add some
documentation to the prepare_buf callback to explain the nature of the
argument to prevent someone from being helpful and trying to fix it
again in the future.
Thanks for reviewing, this series is RFC for a reason :)
next prev parent reply other threads:[~2014-09-13 17:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-13 4:34 [Qemu-devel] [RFC 00/10] AHCI Device improvements John Snow
2014-09-13 4:34 ` [Qemu-devel] [RFC 01/10] ide: add is_write() macro for semantic consistency John Snow
2014-09-13 12:54 ` Paolo Bonzini
2014-09-13 17:01 ` John Snow [this message]
2014-09-13 4:34 ` [Qemu-devel] [RFC 02/10] AHCI: Update byte count after DMA completion John Snow
2014-09-13 13:21 ` Paolo Bonzini
2014-09-15 20:07 ` John Snow
2014-09-16 7:54 ` Paolo Bonzini
2014-09-13 4:34 ` [Qemu-devel] [RFC 03/10] AHCI: Add PRD interrupt John Snow
2014-09-13 13:26 ` Paolo Bonzini
2014-09-13 19:50 ` Paolo Bonzini
2014-09-15 16:31 ` John Snow
2014-09-16 7:44 ` Paolo Bonzini
2014-09-15 16:13 ` John Snow
2014-09-13 4:34 ` [Qemu-devel] [RFC 04/10] ide: Correct handling of malformed/short PRDTs John Snow
2014-09-13 13:23 ` Paolo Bonzini
2014-09-13 4:34 ` [Qemu-devel] [RFC 05/10] AHCI: Rename NCQFIS structure fields John Snow
2014-09-13 4:34 ` [Qemu-devel] [RFC 06/10] AHCI: Fix FIS decomposition John Snow
2014-09-13 4:34 ` [Qemu-devel] [RFC 07/10] ide/ahci: Reorder error cases in handle_cmd John Snow
2014-09-13 13:27 ` Paolo Bonzini
2014-09-13 4:34 ` [Qemu-devel] [RFC 08/10] ahci: Check cmd_fis[1] more explicitly John Snow
2014-09-13 13:26 ` Paolo Bonzini
2014-09-13 4:34 ` [Qemu-devel] [RFC 09/10] ahci: factor out FIS decomposition John Snow
2014-09-13 13:27 ` Paolo Bonzini
2014-09-13 4:34 ` [Qemu-devel] [RFC 10/10] AHCI: Fix SDB FIS Construction John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5414784D.6060308@redhat.com \
--to=jsnow@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.