From fd315167e08887c434ad6c89546f60d35af76074 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 4 Mar 2010 23:11:47 -0300 Subject: [PATCH 25/42] qcow2: return errno instead of -1 RH-Author: Juan Quintela Message-id: Patchwork-id: 7554 O-Subject: [PATCH 25/32] qcow2: return errno instead of -1 Bugzilla: 567099 RH-Acked-by: Kevin Wolf RH-Acked-by: Amit Shah RH-Acked-by: Marcelo Tosatti Signed-off-by: Juan Quintela --- block/qcow2.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) Signed-off-by: Eduardo Habkost --- block/qcow2.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 48fd06a..6110076 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -850,7 +850,7 @@ static int qcow_create2(const char *filename, int64_t total_size, fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); if (fd < 0) - return -1; + return -errno; memset(&header, 0, sizeof(header)); header.magic = cpu_to_be32(QCOW_MAGIC); header.version = cpu_to_be32(QCOW_VERSION); @@ -929,7 +929,7 @@ static int qcow_create2(const char *filename, int64_t total_size, /* write all the data */ ret = qemu_write_full(fd, &header, sizeof(header)); if (ret != sizeof(header)) { - ret = -1; + ret = -errno; goto exit; } if (backing_file) { @@ -942,25 +942,25 @@ static int qcow_create2(const char *filename, int64_t total_size, cpu_to_be32s(&ext_bf.len); ret = qemu_write_full(fd, &ext_bf, sizeof(ext_bf)); if (ret != sizeof(ext_bf)) { - ret = -1; + ret = -errno; goto exit; } ret = qemu_write_full(fd, backing_format, backing_format_len); if (ret != backing_format_len) { - ret = -1; + ret = -errno; goto exit; } if (padding > 0) { ret = qemu_write_full(fd, zero, padding); if (ret != padding) { - ret = -1; + ret = -errno; goto exit; } } } ret = qemu_write_full(fd, backing_file, backing_filename_len); if (ret != backing_filename_len) { - ret = -1; + ret = -errno; goto exit; } } @@ -969,14 +969,14 @@ static int qcow_create2(const char *filename, int64_t total_size, for(i = 0;i < l1_size; i++) { ret = qemu_write_full(fd, &tmp, sizeof(tmp)); if (ret != sizeof(tmp)) { - ret = -1; + ret = -errno; goto exit; } } lseek(fd, s->refcount_table_offset, SEEK_SET); ret = qemu_write_full(fd, s->refcount_table, s->cluster_size); if (ret != s->cluster_size) { - ret = -1; + ret = -errno; goto exit; } @@ -984,7 +984,7 @@ static int qcow_create2(const char *filename, int64_t total_size, ret = qemu_write_full(fd, s->refcount_block, ref_clusters * s->cluster_size); if (ret != ref_clusters * s->cluster_size) { - ret = -1; + ret = -errno; goto exit; } -- 1.6.3.rc4.29.g8146