Re: [Qemu-devel] [PATCH] Remove dead-code (else-block) from block-qcow.c

["Marc Bevand" <m.bevand@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

On Tue, Jun 3, 2008 at 9:57 AM, Anthony Liguori <anthony@codemonkey.ws> wrote:
>
> Please send the patch as an attachment or inlined.

Here it is. (I originally wanted to inline it but I am currently stuck
with MUAs that cannot be configured to NOT wrap text lines.)

To answer Vegard's question, It's gmane that corrupted my email.

-- 
Marc Bevand

[-- Attachment #2: qemu-remove-dead-code.patch --]
[-- Type: application/octet-stream, Size: 3204 bytes --]

[PATCH] Remove dead-code (else-block) from block-qcow.c

"if (allocate == 1)" is always true because the value of "allocate" is
checked a few lines above.

Patch made against SVN's rev 4622.


Signed-off-by: Marc Bevand <m.bevand <at> gmail.com>

Index: block-qcow.c
===================================================================
--- block-qcow.c	(revision 4622)
+++ block-qcow.c	(working copy)
@@ -339,33 +339,28 @@
                 return -1;
         } else {
             cluster_offset = bdrv_getlength(s->hd);
-            if (allocate == 1) {
-                /* round to cluster size */
-                cluster_offset = (cluster_offset + s->cluster_size - 1) &
-                    ~(s->cluster_size - 1);
-                bdrv_truncate(s->hd, cluster_offset + s->cluster_size);
-                /* if encrypted, we must initialize the cluster
-                   content which won't be written */
-                if (s->crypt_method &&
-                    (n_end - n_start) < s->cluster_sectors) {
-                    uint64_t start_sect;
-                    start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
-                    memset(s->cluster_data + 512, 0x00, 512);
-                    for(i = 0; i < s->cluster_sectors; i++) {
-                        if (i < n_start || i >= n_end) {
-                            encrypt_sectors(s, start_sect + i,
-                                            s->cluster_data,
-                                            s->cluster_data + 512, 1, 1,
-                                            &s->aes_encrypt_key);
-                            if (bdrv_pwrite(s->hd, cluster_offset + i * 512,
-                                            s->cluster_data, 512) != 512)
-                                return -1;
-                        }
+            /* round to cluster size */
+            cluster_offset = (cluster_offset + s->cluster_size - 1) &
+                ~(s->cluster_size - 1);
+            bdrv_truncate(s->hd, cluster_offset + s->cluster_size);
+            /* if encrypted, we must initialize the cluster
+               content which won't be written */
+            if (s->crypt_method &&
+                (n_end - n_start) < s->cluster_sectors) {
+                uint64_t start_sect;
+                start_sect = (offset & ~(s->cluster_size - 1)) >> 9;
+                memset(s->cluster_data + 512, 0x00, 512);
+                for(i = 0; i < s->cluster_sectors; i++) {
+                    if (i < n_start || i >= n_end) {
+                        encrypt_sectors(s, start_sect + i,
+                                        s->cluster_data,
+                                        s->cluster_data + 512, 1, 1,
+                                        &s->aes_encrypt_key);
+                        if (bdrv_pwrite(s->hd, cluster_offset + i * 512,
+                                        s->cluster_data, 512) != 512)
+                            return -1;
                     }
                 }
-            } else {
-                cluster_offset |= QCOW_OFLAG_COMPRESSED |
-                    (uint64_t)compressed_size << (63 - s->cluster_bits);
             }
         }
         /* update L2 table */