From nobody Wed Nov 5 10:07:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15414307301921001.5648753619221; Mon, 5 Nov 2018 07:12:10 -0800 (PST) Received: from localhost ([::1]:35721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJgXq-0007r5-Cu for importer@patchew.org; Mon, 05 Nov 2018 10:12:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJgUg-0005n9-3x for qemu-devel@nongnu.org; Mon, 05 Nov 2018 10:08:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJgUe-00035V-OH for qemu-devel@nongnu.org; Mon, 05 Nov 2018 10:08:45 -0500 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:40670) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gJgUe-00030e-GG; Mon, 05 Nov 2018 10:08:44 -0500 Received: by mail-qk1-x743.google.com with SMTP id y16so13988458qki.7; Mon, 05 Nov 2018 07:08:44 -0800 (PST) Received: from localhost.localdomain ([177.45.6.151]) by smtp.gmail.com with ESMTPSA id v57sm5720501qtv.80.2018.11.05.07.08.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 07:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=h7/Szol+ROAWCt2ccsKOVzB5/cZAfQ7tIQ+od8CDv9I=; b=RcwcHWRPre4hGrKXRDERQNmANznPoYN9/5YmmQ5Xxdwbn1YEf8+RktNoKWVkLF34jT 3T0jDmMzxywAFPjUyCrllBm6Zj6UA3SkI8NR6Y4HuS3Iu11QmqdkzYrNb4BeXLICmOXC ov6UU4/y29510uQjjV/g0c1LwzvY8TSq55HNNz/p9ygUR1rg+oJcNbJOk0SSlENNBjq3 v4MqObisAN1Uo+qR03Kbow1nc1nzZXiLUrJBOHMvGYgFMjzKZEKJ51WqtZ2qQAis79Kn 2GTmZHatm19xkC57C85MmlPmstLmtWVkRnqhi7gTjl7s3xS357CKTWdEZJjQUrql1nbs uEuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=h7/Szol+ROAWCt2ccsKOVzB5/cZAfQ7tIQ+od8CDv9I=; b=ByCB3xI+E0dw9+zVU543qP4IqonqbJsymciJzSidAGuQmzFiIjHwJzKq0ELPFg7/0U 9MMfTQrmZ+DWHufy0ZUIaQvywp/gTMmz2PPIdEIYbI8oWtmJZy1abQk29i8FVjBAI3hv qXRybXpyKd1WkKcdoJSIw4w6PaqjjbsHsEkZegs8lpneThoA4VjcwV3gTWCHiihXeJUJ vw+sVhSQ/6YiZHpM9dYmchMe6xWkoA9HvhElAsyFHW97oviVBLjPOUwrg5lPpuiqww9k mGyIWQxQjIY9TNRd5P+DM7bawgEW8+UZjKxy1KS2JH5Pshxlgr33i7DGGqf5/rvUdmH0 uhaw== X-Gm-Message-State: AGRZ1gJsTnUbZww0wzurxJ3DTboCqdr5afu0EuHyoH1iqMNp3Smq6vaL P6DVg86H5huKvtH/Y6/laZ7XXHTA X-Google-Smtp-Source: AJdET5e7DKlkdIHLmDMAxXZjsR0lfz+2/6GFC2MhimTO9xCCei55/vx/UF92TY3vyccLznMfNuOQvg== X-Received: by 2002:a37:d10:: with SMTP id 16mr21047778qkn.39.1541430523642; Mon, 05 Nov 2018 07:08:43 -0800 (PST) From: Julio Faracco To: qemu-devel@nongnu.org Date: Mon, 5 Nov 2018 13:08:06 -0200 Message-Id: <20181105150806.13649-5-jcfaracco@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181105150806.13649-1-jcfaracco@gmail.com> References: <20181105150806.13649-1-jcfaracco@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 Subject: [Qemu-devel] [PATCH v3 4/4] dmg: exchanging hardcoded dmg UDIF block types to enum. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This change is better to understand what kind of block type is being handled by the code. Using a syntax similar to the DMG documentation is easier than tracking all hex values assigned to a block type. Signed-off-by: Julio Faracco --- block/dmg.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index 615f818c5a..6d055594df 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -44,6 +44,19 @@ enum { DMG_SECTORCOUNTS_MAX =3D DMG_LENGTHS_MAX / 512, }; =20 +enum { + /* DMG Block Type */ + UDZE =3D 0, /* Zeroes */ + UDRW, /* RAW type */ + UDIG, /* Ignore */ + UDCO =3D 0x80000004, + UDZO, + UDBZ, + ULFO, + UDCM =3D 0x7ffffffe, /* Comments */ + UDLE /* Last Entry */ +}; + static int dmg_probe(const uint8_t *buf, int buf_size, const char *filenam= e) { int len; @@ -108,16 +121,16 @@ static void update_max_chunk_size(BDRVDMGState *s, ui= nt32_t chunk, uint32_t uncompressed_sectors =3D 0; =20 switch (s->types[chunk]) { - case 0x80000005: /* zlib compressed */ - case 0x80000006: /* bzip2 compressed */ - case 0x80000007: /* lzfse compressed */ + case UDZO: /* zlib compressed */ + case UDBZ: /* bzip2 compressed */ + case ULFO: /* lzfse compressed */ compressed_size =3D s->lengths[chunk]; uncompressed_sectors =3D s->sectorcounts[chunk]; break; - case 1: /* copy */ + case UDRW: /* copy */ uncompressed_sectors =3D DIV_ROUND_UP(s->lengths[chunk], 512); break; - case 2: /* zero */ + case UDIG: /* zero */ /* as the all-zeroes block may be large, it is treated specially: = the * sector is not copied from a large buffer, a simple memset is us= ed * instead. Therefore uncompressed_sectors does not need to be set= . */ @@ -186,13 +199,13 @@ typedef struct DmgHeaderState { static bool dmg_is_known_block_type(uint32_t entry_type) { switch (entry_type) { - case 0x00000001: /* uncompressed */ - case 0x00000002: /* zeroes */ - case 0x80000005: /* zlib */ + case UDRW: /* uncompressed */ + case UDIG: /* zeroes */ + case UDZO: /* zlib */ return true; - case 0x80000006: /* bzip2 */ + case UDBZ: /* bzip2 */ return !!dmg_uncompress_bz2; - case 0x80000007: /* lzfse */ + case ULFO: /* lzfse */ return !!dmg_uncompress_lzfse; default: return false; @@ -592,7 +605,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) =20 s->current_chunk =3D s->n_chunks; switch (s->types[chunk]) { /* block entry type */ - case 0x80000005: { /* zlib compressed */ + case UDZO: { /* zlib compressed */ /* we need to buffer, because only the chunk as whole can be * inflated. */ ret =3D bdrv_pread(bs->file, s->offsets[chunk], @@ -615,7 +628,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) return -1; } break; } - case 0x80000006: /* bzip2 compressed */ + case UDBZ: /* bzip2 compressed */ if (!dmg_uncompress_bz2) { break; } @@ -636,7 +649,7 @@ static inline int dmg_read_chunk(BlockDriverState *bs, = uint64_t sector_num) return ret; } break; - case 0x80000007: + case ULFO: if (!dmg_uncompress_lzfse) { break; } @@ -657,14 +670,14 @@ static inline int dmg_read_chunk(BlockDriverState *bs= , uint64_t sector_num) return ret; } break; - case 1: /* copy */ + case UDRW: /* copy */ ret =3D bdrv_pread(bs->file, s->offsets[chunk], s->uncompressed_chunk, s->lengths[chunk]); if (ret !=3D s->lengths[chunk]) { return -1; } break; - case 2: /* zero */ + case UDIG: /* zero */ /* see dmg_read, it is treated specially. No buffer needs to be * pre-filled, the zeroes can be set directly. */ break; --=20 2.17.1