[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 16/19] nbd: Switch to byte-based block access
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 16/19] nbd: Switch to byte-based block access |
Date: |
Fri, 6 May 2016 10:26:42 -0600 |
Sector-based blk_read() should die; switch to byte-based
blk_pread() instead.
Add a constant for our magic number 512, to make it obvious
that this size will NOT change even if BDRV_SECTOR_SIZE does,
even though the two happen to be the same for now. Split
assignments from conditionals to keep checkpatch.pl happy.
Signed-off-by: Eric Blake <address@hidden>
---
v7: new magic number
---
qemu-nbd.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index c55b40f..3e54113 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -46,6 +46,8 @@
#define QEMU_NBD_OPT_TLSCREDS 261
#define QEMU_NBD_OPT_IMAGE_OPTS 262
+#define MBR_SIZE 512
+
static NBDExport *exp;
static bool newproto;
static int verbose;
@@ -159,12 +161,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[MBR_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 +185,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[MBR_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 * MBR_SIZE,
+ data1, sizeof(data1));
+ if (ret < 0) {
error_report("error while reading: %s", strerror(-ret));
exit(EXIT_FAILURE);
}
--
2.5.5
- [Qemu-devel] [PATCH v7 15/19] atapi: Switch to byte-based block access, (continued)
- [Qemu-devel] [PATCH v7 15/19] atapi: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 02/19] block: Switch blk_read_unthrottled() to byte interface, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 19/19] block: Kill unused sector-based blk_* functions, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 05/19] ide: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 11/19] onenand: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 18/19] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 08/19] xen_disk: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 14/19] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 13/19] sd: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 01/19] block: Allow BDRV_REQ_FUA through blk_pwrite(), Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 16/19] nbd: Switch to byte-based block access,
Eric Blake <=
- [Qemu-devel] [PATCH v7 10/19] nand: Switch to byte-based block access, Eric Blake, 2016/05/06
- [Qemu-devel] [PATCH v7 06/19] scsi-disk: Switch to byte-based aio block access, Eric Blake, 2016/05/06
- Re: [Qemu-devel] [PATCH v7 06/19] scsi-disk: Switch to byte-based aio block access, Paolo Bonzini, 2016/05/12
- Re: [Qemu-devel] [PATCH v7 00/19] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/10
- Re: [Qemu-devel] [PATCH v7 00/19] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/10