From nobody Fri Nov 7 03:51:42 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 154651617575327.20603731984727; Thu, 3 Jan 2019 03:49:35 -0800 (PST) Received: from localhost ([127.0.0.1]:52794 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf1VG-000204-IO for importer@patchew.org; Thu, 03 Jan 2019 06:49:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:53102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gf1TT-0000e1-EM for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:47:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gf1TQ-0003VO-Aj for qemu-devel@nongnu.org; Thu, 03 Jan 2019 06:47:43 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:38834) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gf1TQ-0003VC-5C; Thu, 03 Jan 2019 06:47:40 -0500 Received: by mail-pf1-x444.google.com with SMTP id q1so16588328pfi.5; Thu, 03 Jan 2019 03:47:40 -0800 (PST) Received: from localhost.localdomain (223-137-100-47.emome-ip.hinet.net. [223.137.100.47]) by smtp.gmail.com with ESMTPSA id t67sm103011808pfd.90.2019.01.03.03.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Jan 2019 03:47:38 -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=gWVFu9fUEmfepDQxhrrY+x7XCltFAktAN40YlpHKl3Y=; b=StOirCH1YcQrz6HCBiwknoIPFieNnxszAybcCj0Dtul2jOGtUbBdGa4OtVGRVRVjcg WbOMkXzTlAooszGsH2tcEqdgaEdONzsTkJBuxvB2/vGrTa8/ypgKV+kJdDF0mOTj22yK SEyyK0InvaQuwRJNfinCTKl9xFJ5kyGzRJoNbZ2mtFU85SpftXs7JIopFc8aq+/+FUE7 kgaxTU4XDu4eivQlb77qwZuOYp9iOz4/k1ntbC8ik0ekg+2MufkK8EpuMRqrsDNLLFIL C7k2TEBhIEvolpFvtKHtSGPabjs7LDQmrv3s9e4q7ZciCIQNrqyFXOlJXPt3DCI1GtJR azDA== 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=gWVFu9fUEmfepDQxhrrY+x7XCltFAktAN40YlpHKl3Y=; b=r3vT2mtBt4nZ5YxH8GnOvOGFBRIGavSPisabh6BPtQplWelHeBbwaK5559eiclC/i8 8HqeFPmGFH9HPbV2SFyEV8EjZm8NclagcDROCG7c+Rvdrui0kEndDtaqCp0PKE65leH9 UBmC25LcEiM7Sdh/tuxgDJ9Axe5U1BLFD4RcKi6WhBMkbD91iWfD+kINaawJjZkvwahE bnxMY45T1Myyv9TFzYwLA+PZAiYmIJBO7yscwF32MC69SfRYwQl9IGbdrg+bqoGOULKr qP3KxdbtQhOQasNOCKceeqG0jBsSH7vGjSu1yhG7PSaUzD8BdHmFBg7EBSOBN5b0tIVc 5XzQ== X-Gm-Message-State: AJcUukfKNCCYEg2Z3hqWHy0y2qmnx4NfNb+V+j2QpsTn8c5CHlsg5Q9k QvpuBsR3+N1RaEsROl8E61O3Qpzmtqw= X-Google-Smtp-Source: ALg8bN4d+ko5YK6UZVg2cMrwmuedbW7z4DZLyHruJcTwPTlI02hp5YiL7uvv54cgRn7JBJo+jgJjDw== X-Received: by 2002:a63:f844:: with SMTP id v4mr16603431pgj.82.1546516058877; Thu, 03 Jan 2019 03:47:38 -0800 (PST) From: yuchenlin To: qemu-devel@nongnu.org Date: Thu, 3 Jan 2019 19:46:59 +0800 Message-Id: <20190103114700.9686-3-npes87184@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190103114700.9686-1-npes87184@gmail.com> References: <20190103114700.9686-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::444 Subject: [Qemu-devel] [PATCH v3 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 65a0140487..9758482131 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); @@ -710,7 +710,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