[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/14] block/qcow2.c: fix warnings with _FORTIFY_SOU
From: |
Kirill A. Shutemov |
Subject: |
[Qemu-devel] [PATCH 07/14] block/qcow2.c: fix warnings with _FORTIFY_SOURCE |
Date: |
Thu, 31 Dec 2009 03:33:17 +0200 |
CC block/qcow2.o
cc1: warnings being treated as errors
block/qcow2.c: In function 'qcow_create2':
block/qcow2.c:829: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:838: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:839: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:841: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:844: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:849: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:852: error: ignoring return value of 'write', declared with
attribute warn_unused_result
block/qcow2.c:855: error: ignoring return value of 'write', declared with
attribute warn_unused_result
make: *** [block/qcow2.o] Error 1
Signed-off-by: Kirill A. Shutemov <address@hidden>
---
block/qcow2.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 984264b..44dc195 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -743,7 +743,7 @@ static int qcow_create2(const char *filename, int64_t
total_size,
uint64_t tmp, offset;
QCowCreateState s1, *s = &s1;
QCowExtension ext_bf = {0, 0};
-
+ int ret;
memset(s, 0, sizeof(*s));
@@ -826,7 +826,11 @@ static int qcow_create2(const char *filename, int64_t
total_size,
ref_clusters * s->cluster_size);
/* write all the data */
- write(fd, &header, sizeof(header));
+ ret = qemu_write_full(fd, &header, sizeof(header));
+ if (ret != sizeof(header)) {
+ ret = -errno;
+ goto exit;
+ }
if (backing_file) {
if (backing_format_len) {
char zero[16];
@@ -835,25 +839,56 @@ static int qcow_create2(const char *filename, int64_t
total_size,
memset(zero, 0, sizeof(zero));
cpu_to_be32s(&ext_bf.magic);
cpu_to_be32s(&ext_bf.len);
- write(fd, &ext_bf, sizeof(ext_bf));
- write(fd, backing_format, backing_format_len);
+ ret = qemu_write_full(fd, &ext_bf, sizeof(ext_bf));
+ if (ret != sizeof(ext_bf)) {
+ ret = -errno;
+ goto exit;
+ }
+ ret = qemu_write_full(fd, backing_format, backing_format_len);
+ if (ret != backing_format_len) {
+ ret = -errno;
+ goto exit;
+ }
if (padding > 0) {
- write(fd, zero, padding);
+ ret = qemu_write_full(fd, zero, padding);
+ if (ret != padding) {
+ ret = -errno;
+ goto exit;
+ }
}
}
- write(fd, backing_file, backing_filename_len);
+ ret = qemu_write_full(fd, backing_file, backing_filename_len);
+ if (ret != backing_filename_len) {
+ ret = -errno;
+ goto exit;
+ }
}
lseek(fd, s->l1_table_offset, SEEK_SET);
tmp = 0;
for(i = 0;i < l1_size; i++) {
- write(fd, &tmp, sizeof(tmp));
+ ret = qemu_write_full(fd, &tmp, sizeof(tmp));
+ if (ret != sizeof(tmp)) {
+ ret = -errno;
+ goto exit;
+ }
}
lseek(fd, s->refcount_table_offset, SEEK_SET);
- write(fd, s->refcount_table, s->cluster_size);
+ ret = qemu_write_full(fd, s->refcount_table, s->cluster_size);
+ if (ret != s->cluster_size) {
+ ret = -errno;
+ goto exit;
+ }
lseek(fd, s->refcount_block_offset, SEEK_SET);
- write(fd, s->refcount_block, ref_clusters * s->cluster_size);
+ ret = qemu_write_full(fd, s->refcount_block,
+ ref_clusters * s->cluster_size);
+ if (ret != s->cluster_size) {
+ ret = -errno;
+ goto exit;
+ }
+ ret = 0;
+exit:
qemu_free(s->refcount_table);
qemu_free(s->refcount_block);
close(fd);
@@ -867,7 +902,7 @@ static int qcow_create2(const char *filename, int64_t
total_size,
bdrv_close(bs);
}
- return 0;
+ return ret;
}
static int qcow_create(const char *filename, QEMUOptionParameter *options)
--
1.6.5.7
- [Qemu-devel] [PATCH 01/14] Introduce qemu_write_full(), Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 02/14] posix-aio-compat.c: fix warning with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 03/14] block/cow.c: fix warnings with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 04/14] block/qcow.c: fix warnings with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 05/14] block/vmdk.o: fix warnings with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 06/14] block/vvfat.c: fix warnings with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 07/14] block/qcow2.c: fix warnings with _FORTIFY_SOURCE,
Kirill A. Shutemov <=
- [Qemu-devel] [PATCH 08/14] net/slirp.c: fix warning with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] [PATCH 09/14] usb-linux.c: fix warning with _FORTIFY_SOURCE, Kirill A. Shutemov, 2009/12/30
- [Qemu-devel] Re: [PATCH 06/14] block/vvfat.c: fix warnings with _FORTIFY_SOURCE, Paolo Bonzini, 2009/12/31
- Re: [Qemu-devel] [PATCH 04/14] block/qcow.c: fix warnings with _FORTIFY_SOURCE, malc, 2009/12/30
- [Qemu-devel] Re: [PATCH 04/14] block/qcow.c: fix warnings with _FORTIFY_SOURCE, Paolo Bonzini, 2009/12/31
Re: [Qemu-devel] [PATCH 01/14] Introduce qemu_write_full(), malc, 2009/12/30