[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 17/20] nbd: Switch to byte-based block access
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 17/20] nbd: Switch to byte-based block access |
Date: |
Wed, 4 May 2016 17:55:23 -0600 |
Sector-based blk_read() should die; switch to byte-based
blk_pread() instead.
Signed-off-by: Eric Blake <address@hidden>
---
qemu-nbd.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index c55b40f..c07ceef 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -159,12 +159,13 @@ static int find_partition(BlockBackend *blk, int
partition,
off_t *offset, off_t *size)
{
struct partition_record mbr[4];
- uint8_t data[512];
+ uint8_t data[BDRV_SECTOR_SIZE];
int i;
int ext_partnum = 4;
int ret;
- if ((ret = blk_read(blk, 0, data, 1)) < 0) {
+ ret = blk_pread(blk, 0, data, sizeof(data));
+ if (ret < 0) {
error_report("error while reading: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
@@ -182,10 +183,12 @@ static int find_partition(BlockBackend *blk, int
partition,
if (mbr[i].system == 0xF || mbr[i].system == 0x5) {
struct partition_record ext[4];
- uint8_t data1[512];
+ uint8_t data1[BDRV_SECTOR_SIZE];
int j;
- if ((ret = blk_read(blk, mbr[i].start_sector_abs, data1, 1)) < 0) {
+ ret = blk_pread(blk, mbr[i].start_sector_abs << BDRV_SECTOR_BITS,
+ data1, sizeof(data1));
+ if (ret < 0) {
error_report("error while reading: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
--
2.5.5
- Re: [Qemu-devel] [PATCH v6 05/20] block: Introduce byte-based aio read/write, (continued)
- [Qemu-devel] [PATCH v6 08/20] virtio: Switch to byte-based aio block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 09/20] xen_disk: Switch to byte-based aio block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 18/20] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 10/20] fdc: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 11/20] nand: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 19/20] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 13/20] pflash: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 20/20] block: Kill unused sector-based blk_* functions, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 17/20] nbd: Switch to byte-based block access,
Eric Blake <=
- [Qemu-devel] [PATCH v6 12/20] onenand: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 15/20] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 16/20] atapi: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-devel] [PATCH v6 14/20] sd: Switch to byte-based block access, Eric Blake, 2016/05/04
- Re: [Qemu-devel] [PATCH v6 00/20] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/06