From patchwork Tue Jun 28 01:32:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 102309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9B442B6F72 for ; Tue, 28 Jun 2011 12:13:52 +1000 (EST) Received: from localhost ([::1]:40493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbNoC-0002yU-NV for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2011 22:13:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:57898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbNBk-0003HO-La for qemu-devel@nongnu.org; Mon, 27 Jun 2011 21:34:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbNBi-0004WU-IU for qemu-devel@nongnu.org; Mon, 27 Jun 2011 21:34:04 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:58674) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbNBi-0004MA-4d for qemu-devel@nongnu.org; Mon, 27 Jun 2011 21:34:02 -0400 Received: by mail-iw0-f173.google.com with SMTP id 3so5602693iwn.4 for ; Mon, 27 Jun 2011 18:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=R/HxGg8z5iQHv8+OJ6ncpnoMp5BcGSLsbhD6axtGvMc=; b=gv6l9i/BtXzDpBsmHMh8uaktjXADEMYEWBxuaOMxCOkoC1aLYfBPzGPTlzY/1eAAhW iVvhLcNFFqf+awvEdXS2mzZYwc5yMJ5ti1wbDLN9BNU9e9Mb/FZpy1TJE092lJ8/i3YZ tTIEm1NTrbF2xboO4xB3v58vjI3eS1FgwTTjk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=xDV5EcUBDaIB9bPzWJQOO7t/+oc6U/zSsPk/XdpNItXK1BxwoURcTbGFwTcloIaiAU GYedMyEfqqkuoKF8fBq/4ywSuPQO4ECxCwnDoU2dNtOL4gOE+hzcjjM6pPIkBWJUsURA OOVKPm1cEjIcMsOV96ZOVszsrY+2XTlxYPWAU= Received: by 10.42.19.69 with SMTP id a5mr7455657icb.69.1309224841678; Mon, 27 Jun 2011 18:34:01 -0700 (PDT) Received: from localhost.localdomain ([111.187.42.58]) by mx.google.com with ESMTPS id p15sm3341784ibh.12.2011.06.27.18.33.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 27 Jun 2011 18:34:00 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2011 09:32:56 +0800 Message-Id: <1309224777-31024-12-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.5.2 In-Reply-To: <1309224777-31024-1-git-send-email-famcool@gmail.com> References: <1309224777-31024-1-git-send-email-famcool@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.173 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH v5 11/12] VMDK: fix coding style X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Conform coding style in vmdk.c to pass scripts/checkpatch.pl checks. Signed-off-by: Fam Zheng --- block/vmdk.c | 79 +++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 48 insertions(+), 31 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index c8f3536..f472e39 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -101,8 +101,9 @@ static int vmdk_probe(const uint8_t *buf, int buf_size, const char *filename) { uint32_t magic; - if (buf_size < 4) + if (buf_size < 4) { return 0; + } magic = be32_to_cpu(*(uint32_t *)buf); if (magic == VMDK3_MAGIC || magic == VMDK4_MAGIC) { @@ -177,9 +178,10 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent) cid_str_size = sizeof("CID"); } - if ((p_name = strstr(desc,cid_str)) != NULL) { + p_name = strstr(desc, cid_str); + if (p_name != NULL) { p_name += cid_str_size; - sscanf(p_name,"%x",&cid); + sscanf(p_name, "%x", &cid); } return cid; @@ -195,9 +197,10 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid) return -EIO; } - tmp_str = strstr(desc,"parentCID"); + tmp_str = strstr(desc, "parentCID"); pstrcpy(tmp_desc, sizeof(tmp_desc), tmp_str); - if ((p_name = strstr(desc,"CID")) != NULL) { + p_name = strstr(desc, "CID"); + if (p_name != NULL) { p_name += sizeof("CID"); snprintf(p_name, sizeof(desc) - (p_name - desc), "%x\n", cid); pstrcat(desc, sizeof(desc), tmp_desc); @@ -217,13 +220,14 @@ static int vmdk_is_cid_valid(BlockDriverState *bs) uint32_t cur_pcid; if (p_bs) { - cur_pcid = vmdk_read_cid(p_bs,0); - if (s->parent_cid != cur_pcid) - // CID not valid + cur_pcid = vmdk_read_cid(p_bs, 0); + if (s->parent_cid != cur_pcid) { + /* CID not valid */ return 0; + } } #endif - // CID valid + /* CID valid */ return 1; } @@ -238,14 +242,18 @@ static int vmdk_parent_open(BlockDriverState *bs) return -1; } - if ((p_name = strstr(desc,"parentFileNameHint")) != NULL) { + p_name = strstr(desc, "parentFileNameHint"); + if (p_name != NULL) { char *end_name; p_name += sizeof("parentFileNameHint") + 1; - if ((end_name = strchr(p_name,'\"')) == NULL) + end_name = strchr(p_name, '\"'); + if (end_name == NULL) { return -1; - if ((end_name - p_name) > sizeof (bs->backing_file) - 1) + } + if ((end_name - p_name) > sizeof(bs->backing_file) - 1) { return -1; + } pstrcpy(bs->backing_file, end_name - p_name + 1, p_name); } @@ -612,8 +620,9 @@ static int get_whole_cluster(BlockDriverState *bs, if (bs->backing_hd) { int ret; - if (!vmdk_is_cid_valid(bs)) + if (!vmdk_is_cid_valid(bs)) { return -1; + } /* floor offset to cluster */ offset -= offset % (extent->cluster_sectors * 512); @@ -672,8 +681,9 @@ static int get_cluster_offset(BlockDriverState *bs, int min_index, i, j; uint32_t min_count, *l2_table, tmp = 0; - if (m_data) + if (m_data) { m_data->valid = 0; + } if (extent->flat) { *cluster_offset = extent->flat_start_offset; return 0; @@ -729,7 +739,7 @@ static int get_cluster_offset(BlockDriverState *bs, return -1; } - // Avoid the L2 tables update for the images that have snapshots. + /* Avoid the L2 tables update for the images that have snapshots. */ *cluster_offset = bdrv_getlength(extent->file); bdrv_truncate( extent->file, @@ -746,8 +756,9 @@ static int get_cluster_offset(BlockDriverState *bs, * or inappropriate VM shutdown. */ if (get_whole_cluster( - bs, extent, *cluster_offset, offset, allocate) == -1) + bs, extent, *cluster_offset, offset, allocate) == -1) { return -1; + } if (m_data) { m_data->offset = tmp; @@ -797,8 +808,9 @@ static int vmdk_is_allocated(BlockDriverState *bs, int64_t sector_num, index_in_cluster = sector_num % extent->cluster_sectors; n = extent->cluster_sectors - index_in_cluster; - if (n > nb_sectors) + if (n > nb_sectors) { n = nb_sectors; + } *pnum = n; return ret; } @@ -822,16 +834,19 @@ static int vmdk_read(BlockDriverState *bs, int64_t sector_num, sector_num << 9, 0, &cluster_offset); index_in_cluster = sector_num % extent->cluster_sectors; n = extent->cluster_sectors - index_in_cluster; - if (n > nb_sectors) + if (n > nb_sectors) { n = nb_sectors; + } if (ret) { /* if not allocated, try to read from parent image, if exist */ if (bs->backing_hd) { - if (!vmdk_is_cid_valid(bs)) + if (!vmdk_is_cid_valid(bs)) { return -EINVAL; + } ret = bdrv_read(bs->backing_hd, sector_num, buf, n); - if (ret < 0) + if (ret < 0) { return ret; + } } else { memset(buf, 0, 512 * n); } @@ -906,7 +921,8 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num, sector_num += n; buf += n * 512; - // update CID on the first write every time the virtual disk is opened + /* update CID on the first write every time the virtual disk is + * opened */ if (!s->cid_updated) { vmdk_write_cid(bs, time(NULL)); s->cid_updated = true; @@ -927,8 +943,9 @@ static int vmdk_create_sparse(const char *filename, int64_t filesize) filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, 0644); - if (fd < 0) + if (fd < 0) { return -errno; + } magic = cpu_to_be32(VMDK4_MAGIC); memset(&header, 0, sizeof(header)); header.version = 1; @@ -1383,16 +1400,16 @@ static QEMUOptionParameter vmdk_create_options[] = { }; static BlockDriver bdrv_vmdk = { - .format_name = "vmdk", - .instance_size = sizeof(BDRVVmdkState), - .bdrv_probe = vmdk_probe, + .format_name = "vmdk", + .instance_size = sizeof(BDRVVmdkState), + .bdrv_probe = vmdk_probe, .bdrv_open = vmdk_open, - .bdrv_read = vmdk_read, - .bdrv_write = vmdk_write, - .bdrv_close = vmdk_close, - .bdrv_create = vmdk_create, - .bdrv_flush = vmdk_flush, - .bdrv_is_allocated = vmdk_is_allocated, + .bdrv_read = vmdk_read, + .bdrv_write = vmdk_write, + .bdrv_close = vmdk_close, + .bdrv_create = vmdk_create, + .bdrv_flush = vmdk_flush, + .bdrv_is_allocated = vmdk_is_allocated, .create_options = vmdk_create_options, };