From patchwork Thu Dec 31 01:33:13 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 41948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 501501007D1 for ; Thu, 31 Dec 2009 12:37:23 +1100 (EST) Received: from localhost ([127.0.0.1]:48085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ9ya-0006xi-Dy for incoming@patchwork.ozlabs.org; Wed, 30 Dec 2009 20:37:20 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NQ9uy-0005o1-Hn for qemu-devel@nongnu.org; Wed, 30 Dec 2009 20:33:36 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NQ9ut-0005l6-CR for qemu-devel@nongnu.org; Wed, 30 Dec 2009 20:33:35 -0500 Received: from [199.232.76.173] (port=40609 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NQ9ut-0005l3-9J for qemu-devel@nongnu.org; Wed, 30 Dec 2009 20:33:31 -0500 Received: from mail-fx0-f222.google.com ([209.85.220.222]:55327) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NQ9ut-00031j-03 for qemu-devel@nongnu.org; Wed, 30 Dec 2009 20:33:31 -0500 Received: by mail-fx0-f222.google.com with SMTP id 22so15607316fxm.2 for ; Wed, 30 Dec 2009 17:33:30 -0800 (PST) Received: by 10.223.144.204 with SMTP id a12mr22000641fav.49.1262223210455; Wed, 30 Dec 2009 17:33:30 -0800 (PST) Received: from localhost.localdomain (a88-114-220-92.elisa-laajakaista.fi [88.114.220.92]) by mx.google.com with ESMTPS id 18sm20568832fks.34.2009.12.30.17.33.28 (version=SSLv3 cipher=RC4-MD5); Wed, 30 Dec 2009 17:33:29 -0800 (PST) From: "Kirill A. Shutemov" To: qemu-devel@nongnu.org Date: Thu, 31 Dec 2009 03:33:13 +0200 Message-Id: <1262223199-19062-3-git-send-email-kirill@shutemov.name> X-Mailer: git-send-email 1.6.5.7 In-Reply-To: <1262223199-19062-2-git-send-email-kirill@shutemov.name> References: <1262223199-19062-1-git-send-email-kirill@shutemov.name> <1262223199-19062-2-git-send-email-kirill@shutemov.name> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: "Kirill A. Shutemov" Subject: [Qemu-devel] [PATCH 03/14] block/cow.c: fix warnings with _FORTIFY_SOURCE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org CC block/cow.o cc1: warnings being treated as errors block/cow.c: In function 'cow_create': block/cow.c:251: error: ignoring return value of 'write', declared with attribute warn_unused_result block/cow.c:253: error: ignoring return value of 'ftruncate', declared with attribute warn_unused_result make: *** [block/cow.o] Error 1 Signed-off-by: Kirill A. Shutemov --- block/cow.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/block/cow.c b/block/cow.c index a70854e..ba07b97 100644 --- a/block/cow.c +++ b/block/cow.c @@ -209,6 +209,7 @@ static int cow_create(const char *filename, QEMUOptionParameter *options) struct stat st; int64_t image_sectors = 0; const char *image_filename = NULL; + int ret; /* Read out options */ while (options && options->name) { @@ -248,11 +249,23 @@ static int cow_create(const char *filename, QEMUOptionParameter *options) } cow_header.sectorsize = cpu_to_be32(512); cow_header.size = cpu_to_be64(image_sectors * 512); - write(cow_fd, &cow_header, sizeof(cow_header)); + ret = qemu_write_full(cow_fd, &cow_header, sizeof(cow_header)); + if (ret != sizeof(cow_header)) { + ret = -errno; + goto exit; + } + /* resize to include at least all the bitmap */ - ftruncate(cow_fd, sizeof(cow_header) + ((image_sectors + 7) >> 3)); + ret = ftruncate(cow_fd, sizeof(cow_header) + ((image_sectors + 7) >> 3)); + if (ret) { + ret = -errno; + goto exit; + } + + ret = 0; +exit: close(cow_fd); - return 0; + return ret; } static void cow_flush(BlockDriverState *bs)