From: Wei Yang <richardw.yang@linux.intel.com>
Date: Wed, 11 Sep 2019 13:28:38 +0000 (+0000)
Subject: migration/qemu-file: remove check on writev_buffer in qemu_put_compression_data
X-Git-Tag: v4.2.0-rc0~110^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89fe04b4585c97fda7c173bee97bbacb32f64e80;p=thirdparty%2Fqemu.git

migration/qemu-file: remove check on writev_buffer in qemu_put_compression_data

The check of writev_buffer is in qemu_fflush, which means it is not
harmful if it is NULL.

And removing it will make the code consistent since all other
add_to_iovec() is called without the check.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190911132839.23336-2-richard.weiyang@gmail.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 075faf03c36..66627088d4f 100644
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -760,9 +760,7 @@ ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
     }
 
     qemu_put_be32(f, blen);
-    if (f->ops->writev_buffer) {
-        add_to_iovec(f, f->buf + f->buf_index, blen, false);
-    }
+    add_to_iovec(f, f->buf + f->buf_index, blen, false);
     f->buf_index += blen;
     if (f->buf_index == IO_BUF_SIZE) {
         qemu_fflush(f);