From patchwork Thu Aug 4 03:09:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feiran Zheng X-Patchwork-Id: 108341 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 F099CB6F6F for ; Thu, 4 Aug 2011 13:11:21 +1000 (EST) Received: from localhost ([::1]:33426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QooL2-0003p1-CO for incoming@patchwork.ozlabs.org; Wed, 03 Aug 2011 23:11:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QooK1-0000dI-QY for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QooJz-0006C8-SQ for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:09 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:33900) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QooJz-00065n-NW for qemu-devel@nongnu.org; Wed, 03 Aug 2011 23:10:07 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so1345829pzk.29 for ; Wed, 03 Aug 2011 20:10:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=K6xaKBdgBJascGfoRoYUEmL5F8xFTLHZ2SvRQyeuQF8=; b=NOGO/3+sikNluMuH7KgbbqjR0JhaMe0B6Y1A007NEVy9PvtXCA8H0hDYtWdCXDDa4+ /B3nkrB5WVArSQfJKJ1bSkvzSARaDkLMANT9Ms+xNWsTGYTJ9UD7FjMhhSMRh3IIyKDn PlskQzuRp/9eCr0jvEh1AUzNPEBgegIdSXfS0= Received: by 10.142.204.9 with SMTP id b9mr276729wfg.3.1312427407276; Wed, 03 Aug 2011 20:10:07 -0700 (PDT) Received: from localhost.localdomain ([111.187.40.210]) by mx.google.com with ESMTPS id d1sm1690302pbj.40.2011.08.03.20.10.04 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 03 Aug 2011 20:10:06 -0700 (PDT) From: Fam Zheng To: qemu-devel@nongnu.org Date: Thu, 4 Aug 2011 11:09:21 +0800 Message-Id: <1312427361-7046-7-git-send-email-famcool@gmail.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1312427361-7046-1-git-send-email-famcool@gmail.com> References: <1312427361-7046-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.210.42 Cc: kwolf@redhat.com, Fam Zheng , hch@lst.de, stefanha@gmail.com Subject: [Qemu-devel] [PATCH v2 6/6] VMDK: creating streamOptimized subformat 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 Creating streamOptimized subformat. Added subformat option 'streamOptimized', to create a image with compression enabled and each cluster with a GrainMarker. Signed-off-by: Fam Zheng --- block/vmdk.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index da34b9d..ff83f8c 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1089,7 +1089,8 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num, } -static int vmdk_create_extent(const char *filename, int64_t filesize, bool flat) +static int vmdk_create_extent(const char *filename, int64_t filesize, + bool flat, bool compress) { int ret, i; int fd = 0; @@ -1113,7 +1114,9 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, bool flat) magic = cpu_to_be32(VMDK4_MAGIC); memset(&header, 0, sizeof(header)); header.version = 1; - header.flags = 3; /* ?? */ + header.flags = + 3 | (compress ? VMDK4_FLAG_COMPRESS | VMDK4_FLAG_MARKER : 0); + header.compressAlgorithm = compress ? VMDK4_COMPRESSION_DEFLATE : 0; header.capacity = filesize / 512; header.granularity = 128; header.num_gtes_per_gte = 512; @@ -1143,6 +1146,7 @@ static int vmdk_create_extent(const char *filename, int64_t filesize, bool flat) header.rgd_offset = cpu_to_le64(header.rgd_offset); header.gd_offset = cpu_to_le64(header.gd_offset); header.grain_offset = cpu_to_le64(header.grain_offset); + header.compressAlgorithm = cpu_to_le16(header.compressAlgorithm); header.check_bytes[0] = 0xa; header.check_bytes[1] = 0x20; @@ -1284,7 +1288,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) const char *fmt = NULL; int flags = 0; int ret = 0; - bool flat, split; + bool flat, split, compress; char ext_desc_lines[BUF_SIZE] = ""; char path[PATH_MAX], prefix[PATH_MAX], postfix[PATH_MAX]; const int64_t split_size = 0x80000000; /* VMDK has constant split size */ @@ -1333,7 +1337,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) } else if (strcmp(fmt, "monolithicFlat") && strcmp(fmt, "monolithicSparse") && strcmp(fmt, "twoGbMaxExtentSparse") && - strcmp(fmt, "twoGbMaxExtentFlat")) { + strcmp(fmt, "twoGbMaxExtentFlat") && + strcmp(fmt, "streamOptimized")) { fprintf(stderr, "VMDK: Unknown subformat: %s\n", fmt); return -EINVAL; } @@ -1341,6 +1346,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) strcmp(fmt, "twoGbMaxExtentSparse")); flat = !(strcmp(fmt, "monolithicFlat") && strcmp(fmt, "twoGbMaxExtentFlat")); + compress = !strcmp(fmt, "streamOptimized"); if (flat) { desc_extent_line = "RW %lld FLAT \"%s\" 0\n"; } else { @@ -1395,7 +1401,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) snprintf(ext_filename, sizeof(ext_filename), "%s%s", path, desc_filename); - if (vmdk_create_extent(ext_filename, size, flat)) { + if (vmdk_create_extent(ext_filename, size, flat, compress)) { return -EINVAL; } filesize -= size; @@ -1509,7 +1515,7 @@ static QEMUOptionParameter vmdk_create_options[] = { .type = OPT_STRING, .help = "VMDK flat extent format, can be one of " - "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat} " + "{monolithicSparse (default) | monolithicFlat | twoGbMaxExtentSparse | twoGbMaxExtentFlat | streamOptimized} " }, { NULL } };