From nobody Fri Nov 7 04:04:22 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 1545534209071501.5833383801647; Sat, 22 Dec 2018 19:03:29 -0800 (PST) Received: from localhost ([::1]:55552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gau35-0005vD-O9 for importer@patchew.org; Sat, 22 Dec 2018 22:03:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gau0w-0004zb-Jb for qemu-devel@nongnu.org; Sat, 22 Dec 2018 22:01:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gau0u-0005ij-Jv for qemu-devel@nongnu.org; Sat, 22 Dec 2018 22:01:14 -0500 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:44727) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gau0u-0005eb-9W; Sat, 22 Dec 2018 22:01:12 -0500 Received: by mail-pl1-x641.google.com with SMTP id e11so4239356plt.11; Sat, 22 Dec 2018 19:01:08 -0800 (PST) Received: from localhost.localdomain (114-136-27-106.emome-ip.hinet.net. [114.136.27.106]) by smtp.gmail.com with ESMTPSA id g190sm32610180pgc.28.2018.12.22.19.01.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Dec 2018 19:01:06 -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=tCQ7M75vIzt+9JWvC8gbxrEs7r7SdiaDpSBrZK87RdM=; b=YK8olPpHpKtJ4z0hR1V1O7Xr+n6Ek9rn0qXPfv6iNR/kQhzuRmhG1g337OVcPRlA0H DU8i5ismbAmskzJXNUd3Oy3Adhcev8jrlCu2yw8+qVdkzx0Rrz00cQ81uHwv3oyfsDNL KmhjvVB3y8TwhTk/cpwQb0TEAxyIzTvjmOMO6uBOySXGBC58OZRm/PgTu3b/zdMKeHsx F8PS+bvBkNPgCPSIfV46M9jAP9BVIX9ABMSPORHuDyKdv90mTDpN4pNP+crkYEraOZJp 6x7e9jAHkbrlbXpIEpF0ZU9ctQFqyeQXok4FMw3+RhytOtu6iXFCnYGfexLNWXTM+Ztr 7A2g== 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=tCQ7M75vIzt+9JWvC8gbxrEs7r7SdiaDpSBrZK87RdM=; b=Nv/XQp7fbjE6Qx+BWdc3N1G6OYYG5+u6MqHX4nuy922VbYz8ZD6yU+OKpwKuFp1E4+ SoP72SmsoLGoD5MplZABfOPedzp1Hbc6ChZ8DZ6RBHObY0j3+Kh+B22KmOgOiMli5YMa 56SxNgFVgYsWFC7SH4Stda0YquORHJZbvzo4W6seq8jrxlHQjGf66hx5jHWMClQ6sOti +eycCIGm1gfLmRftXCXndTztZnPxCO5/UEqmnks2PMm+WFSeyIh5G4/Xg6awbNN2BRSj 5wwNPKabaxOZEy+YBPc+INcHH+jMH/CD7aAgyE2nQjhZi7OYftW50wL9aVXiUEwdOFEz Q/HQ== X-Gm-Message-State: AJcUukfDb0uL6mA0XaXTgUJ3Fevmd0RRj81sBYd3TTdxVcdupTcW6j/a t44ZI2V4hYWpjmN2/veGrAE3G8C0iu4= X-Google-Smtp-Source: ALg8bN75Fy4hqWj+8xlaAxD9brzL3+7Juk5gg8Q69B8sGSqZ1FSQvjHp/Bxp2MShbpqnN7L2+ITZNA== X-Received: by 2002:a17:902:4225:: with SMTP id g34mr8637921pld.152.1545534067145; Sat, 22 Dec 2018 19:01:07 -0800 (PST) From: yuchenlin To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2018 10:59:38 +0800 Message-Id: <20181223025939.15775-3-npes87184@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181223025939.15775-1-npes87184@gmail.com> References: <20181223025939.15775-1-npes87184@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 Subject: [Qemu-devel] [PATCH v2 2/3] dmg: use enumeration type instead of hard coding number 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: yuchenlin , qemu-block@nongnu.org, stefanha@redhat.com 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" Signed-off-by: yuchenlin Reviewed-by: Julio Faracco Reviewed-by: Stefan Hajnoczi --- block/dmg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/dmg.c b/block/dmg.c index 0e05702f5d..6b0a057bf8 100644 --- a/block/dmg.c +++ b/block/dmg.c @@ -267,7 +267,7 @@ static int dmg_read_mish_block(BDRVDMGState *s, DmgHead= erState *ds, =20 /* all-zeroes sector (type 2) does not need to be "uncompressed" a= nd can * therefore be unbounded. */ - if (s->types[i] !=3D 2 && s->sectorcounts[i] > DMG_SECTORCOUNTS_MA= X) { + if (s->types[i] !=3D UDIG && s->sectorcounts[i] > DMG_SECTORCOUNTS= _MAX) { error_report("sector count %" PRIu64 " for chunk %" PRIu32 " is larger than max (%u)", s->sectorcounts[i], i, DMG_SECTORCOUNTS_MAX); @@ -706,7 +706,7 @@ dmg_co_preadv(BlockDriverState *bs, uint64_t offset, ui= nt64_t bytes, /* Special case: current chunk is all zeroes. Do not perform a mem= cpy as * s->uncompressed_chunk may be too small to cover the large all-z= eroes * section. dmg_read_chunk is called to find s->current_chunk */ - if (s->types[s->current_chunk] =3D=3D 2) { /* all zeroes block ent= ry */ + if (s->types[s->current_chunk] =3D=3D UDIG) { /* all zeroes block = entry */ qemu_iovec_memset(qiov, i * 512, 0, 512); continue; } --=20 2.17.1