From 1e37d05904e300a0bfc8e3240e24ecc83d54c2e3 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 11 Jul 2009 16:43:37 +0200 Subject: [PATCH] raw-posix: Handle errors in raw_create In qemu-iotests, some large images are created using qemu-img. Without checks for errors, qemu-img will just create an empty image, and later read / write tests will fail. With the patch, failures during image creation are detected and reported. Signed-off-by: Stefan Weil Signed-off-by: Anthony Liguori --- block/raw-posix.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index fa4f83e8fc..389903e44b 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -852,6 +852,7 @@ again: static int raw_create(const char *filename, QEMUOptionParameter *options) { int fd; + int result = 0; int64_t total_size = 0; /* Read out options */ @@ -864,11 +865,17 @@ static int raw_create(const char *filename, QEMUOptionParameter *options) fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0644); - if (fd < 0) - return -EIO; - ftruncate(fd, total_size * 512); - close(fd); - return 0; + if (fd < 0) { + result = -errno; + } else { + if (ftruncate(fd, total_size * 512) != 0) { + result = -errno; + } + if (close(fd) != 0) { + result = -errno; + } + } + return result; } static void raw_flush(BlockDriverState *bs)