[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-block] [PATCH v6 17/20] nbd: Switch to byte-based block access
From: |
Kevin Wolf |
Subject: |
Re: [Qemu-block] [PATCH v6 17/20] nbd: Switch to byte-based block access |
Date: |
Fri, 6 May 2016 15:08:04 +0200 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
Am 05.05.2016 um 01:55 hat Eric Blake geschrieben:
> 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];
I like 512 better, actually. This is not the size of the arbitrary unit
that some block layer functions use, but the size of an MBR. If you
don't like the magic number, a new #define would probably be best.
> 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];
Same here.
> 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);
> }
Kevin
- [Qemu-block] [PATCH v6 11/20] nand: Switch to byte-based block access, (continued)
- [Qemu-block] [PATCH v6 11/20] nand: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 12/20] onenand: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 16/20] atapi: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 15/20] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 18/20] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 19/20] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 20/20] block: Kill unused sector-based blk_* functions, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 13/20] pflash: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 14/20] sd: Switch to byte-based block access, Eric Blake, 2016/05/04
- [Qemu-block] [PATCH v6 17/20] nbd: Switch to byte-based block access, Eric Blake, 2016/05/04
- Re: [Qemu-block] [PATCH v6 17/20] nbd: Switch to byte-based block access,
Kevin Wolf <=
- Re: [Qemu-block] [PATCH v6 00/20] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/06