ioemu: cope with partial reads/writes
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
diff -r bab9e298450a tools/ioemu/block-raw.c
--- a/tools/ioemu/block-raw.c Mon Feb 11 10:57:17 2008 +0000
+++ b/tools/ioemu/block-raw.c Mon Feb 11 11:57:37 2008 +0000
@@ -169,10 +169,16 @@ static int raw_pread(BlockDriverState *b
}
s->lseek_err_cnt=0;
- ret = read(s->fd, buf, count);
- if (ret == count)
- goto label__raw_read__success;
+ uint64_t done;
+ for (done = 0; done < count; done += ret) {
+ ret = read(s->fd, buf + done, count - done);
+ if (ret == -1)
+ goto label__raw_read__error;
+ }
+ ret = count;
+ goto label__raw_read__success;
+label__raw_read__error:
DEBUG_BLOCK_PRINT("raw_read(%d:%s, %" PRId64 ", %p, %d) [%" PRId64 "] read
failed %d : %d = %s\n",
s->fd,
bs->filename,
@@ -234,9 +240,16 @@ static int raw_pwrite(BlockDriverState *
}
s->lseek_err_cnt = 0;
- ret = write(s->fd, buf, count);
- if (ret == count)
- goto label__raw_write__success;
+ uint64_t done;
+ for (done = 0; done < count; done += ret) {
+ ret = write(s->fd, buf + done, count - done);
+ if (ret == -1)
+ goto label__raw_write__error;
+ }
+ ret = count;
+ goto label__raw_write__success;
+
+label__raw_write__error:
DEBUG_BLOCK_PRINT("raw_write(%d:%s, %" PRId64 ", %p, %d) [%" PRId64 "]
write failed %d : %d = %s\n",
s->fd,
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|