aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2010-01-20 00:56:15 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-01-26 14:59:20 -0600
commitdb89119d40390b8db0ea65278a6020e9653651ff (patch)
tree7329db21319416960aedf434693257eee1367c1e /block
parent2dedf83ef0cc3463783d6b71bf1b25476f691f3a (diff)
downloadqemu-db89119d40390b8db0ea65278a6020e9653651ff.zip
qemu-db89119d40390b8db0ea65278a6020e9653651ff.tar.gz
qemu-db89119d40390b8db0ea65278a6020e9653651ff.tar.bz2
block/qcow2.c: fix warnings with _FORTIFY_SOURCE
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 <kirill@shutemov.name> Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block')
-rw-r--r--block/qcow2.c55
1 files changed, 45 insertions, 10 deletions
diff --git a/block/qcow2.c b/block/qcow2.c
index 773d381..8fc8f8c 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -844,7 +844,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));
@@ -927,7 +927,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 = -1;
+ goto exit;
+ }
if (backing_file) {
if (backing_format_len) {
char zero[16];
@@ -936,25 +940,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 = -1;
+ goto exit;
+ }
+ ret = qemu_write_full(fd, backing_format, backing_format_len);
+ if (ret != backing_format_len) {
+ ret = -1;
+ goto exit;
+ }
if (padding > 0) {
- write(fd, zero, padding);
+ ret = qemu_write_full(fd, zero, padding);
+ if (ret != padding) {
+ ret = -1;
+ 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 = -1;
+ 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 = -1;
+ 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 = -1;
+ 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 = -1;
+ goto exit;
+ }
+ ret = 0;
+exit:
qemu_free(s->refcount_table);
qemu_free(s->refcount_block);
close(fd);
@@ -968,7 +1003,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)