[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/10] qcow2: return errno instead of -1
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 03/10] qcow2: return errno instead of -1 |
Date: |
Thu, 4 Mar 2010 10:00:32 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
block/qcow2.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index bf8170e..5b6dad9 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -851,7 +851,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);
@@ -930,7 +930,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) {
@@ -943,25 +943,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;
}
}
@@ -970,14 +970,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;
}
@@ -985,7 +985,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.6.1
- [Qemu-devel] [PATCH v2 00/10] FORTIFY_SOURCE followup, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 03/10] qcow2: return errno instead of -1,
Juan Quintela <=
- [Qemu-devel] [PATCH 02/10] slirp: check system() success, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 01/10] cow: return errno instead of -1, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 04/10] qcow: return errno instead of -1, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 05/10] vmdk: return errno instead of -1, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 06/10] vmdk: make vmdk_snapshot_create return -errno, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 07/10] vmdk: fix double free, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 08/10] vmdk: share cleanup code, Juan Quintela, 2010/03/04
- [Qemu-devel] [PATCH 09/10] block: print errno on error, Juan Quintela, 2010/03/04