commit e80fcf590e5612c901f7f16b6907ece18e7933df
author yuchenlin <npes87184@gmail.com> Thu Jan 03 19:46:59 2019 +0800
committer Stefan Hajnoczi <stefanha@redhat.com> Fri Jan 04 11:15:09 2019 +0000
tree d0c18b6ea524641bd93252f34790d01132a246d3
parent 5ef40828baafc27dc3e52320c3125f2bd3f44886

dmg: use enumeration type instead of hard coding number

Signed-off-by: yuchenlin <npes87184@gmail.com>
Reviewed-by: Julio Faracco <jcfaracco@gmail.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20190103114700.9686-3-npes87184@gmail.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

block/dmg.c

diff --git a/block/dmg.c b/block/dmg.c
index b26ddb1..84732a6 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -267,7 +267,7 @@
 
         /* all-zeroes sector (type 2) does not need to be "uncompressed" and can
          * therefore be unbounded. */
-        if (s->types[i] != 2 && s->sectorcounts[i] > DMG_SECTORCOUNTS_MAX) {
+        if (s->types[i] != 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 @@
         /* Special case: current chunk is all zeroes. Do not perform a memcpy as
          * s->uncompressed_chunk may be too small to cover the large all-zeroes
          * section. dmg_read_chunk is called to find s->current_chunk */
-        if (s->types[s->current_chunk] == 2) { /* all zeroes block entry */
+        if (s->types[s->current_chunk] == UDIG) { /* all zeroes block entry */
             qemu_iovec_memset(qiov, i * 512, 0, 512);
             continue;
         }