diff options
author | Alberto Faria | 2022-07-05 18:15:11 +0200 |
---|---|---|
committer | Hanna Reitz | 2022-07-12 12:14:56 +0200 |
commit | a9262f551eba44d4d0f9e396d7124c059a93e204 (patch) | |
tree | db282f0d5ffab8fbaa90e42077a8ea1b12635185 /hw/ide | |
parent | block: Add a 'flags' param to blk_pread() (diff) | |
download | qemu-a9262f551eba44d4d0f9e396d7124c059a93e204.tar.gz qemu-a9262f551eba44d4d0f9e396d7124c059a93e204.tar.xz qemu-a9262f551eba44d4d0f9e396d7124c059a93e204.zip |
block: Change blk_{pread,pwrite}() param order
Swap 'buf' and 'bytes' around for consistency with
blk_co_{pread,pwrite}(), and in preparation to implement these functions
using generated_co_wrapper.
Callers were updated using this Coccinelle script:
@@ expression blk, offset, buf, bytes, flags; @@
- blk_pread(blk, offset, buf, bytes, flags)
+ blk_pread(blk, offset, bytes, buf, flags)
@@ expression blk, offset, buf, bytes, flags; @@
- blk_pwrite(blk, offset, buf, bytes, flags)
+ blk_pwrite(blk, offset, bytes, buf, flags)
It had no effect on hw/block/nand.c, presumably due to the #if, so that
file was updated manually.
Overly-long lines were then fixed by hand.
Signed-off-by: Alberto Faria <afaria@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220705161527.1054072-4-afaria@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Diffstat (limited to 'hw/ide')
-rw-r--r-- | hw/ide/atapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index cd4b5c6806..0a9aa6f009 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -98,11 +98,11 @@ cd_read_sector_sync(IDEState *s) switch (s->cd_sector_size) { case 2048: ret = blk_pread(s->blk, (int64_t)s->lba << ATAPI_SECTOR_BITS, - s->io_buffer, ATAPI_SECTOR_SIZE, 0); + ATAPI_SECTOR_SIZE, s->io_buffer, 0); break; case 2352: ret = blk_pread(s->blk, (int64_t)s->lba << ATAPI_SECTOR_BITS, - s->io_buffer + 16, ATAPI_SECTOR_SIZE, 0); + ATAPI_SECTOR_SIZE, s->io_buffer + 16, 0); if (ret >= 0) { cd_data_to_raw(s->io_buffer, s->lba); } |