b45e13fe5c
cherry pick from qemu-kvm-ev-2.9.0-16.el7_4.11.1 https://cbs.centos.org/koji/buildinfo?buildID=21003 Tue Jun 13 2017 Miroslav Rezanina <mrezanin@redhat.com> - rhev-2.9.0-10.el7 - kvm-nbd-make-it-thread-safe-fix-qcow2-over-nbd.patch [bz#1454582] Tue Aug 15 2017 Miroslav Rezanina <mrezanin@redhat.com> - rhev-2.9.0-16.el7_4.4 - kvm-nbd-strict-nbd_wr_syncv.patch [bz#1467509] - kvm-nbd-read_sync-and-friends-return-0-on-success.patch [bz#1467509] - kvm-nbd-make-nbd_drop-public.patch [bz#1467509] - kvm-nbd-server-get-rid-of-nbd_negotiate_read-and-friends.patch [bz#1467509] Mon Oct 09 2017 Miroslav Rezanina <mrezanin@redhat.com> - rhev-2.9.0-16.el7_4.9 - kvm-nbd-client-Fix-regression-when-server-sends-garbage.patch [bz#1495474] - kvm-fix-build-failure-in-nbd_read_reply_entry.patch [bz#1495474] - kvm-nbd-client-avoid-spurious-qio_channel_yield-re-entry.patch [bz#1495474] - kvm-nbd-client-avoid-read_reply_co-entry-if-send-failed.patch [bz#1495474] - kvm-qemu-iotests-improve-nbd-fault-injector.py-startup-p.patch [bz#1495474] - kvm-qemu-iotests-test-NBD-over-UNIX-domain-sockets-in-08.patch [bz#1495474] - kvm-block-nbd-client-nbd_co_send_request-fix-return-code.patch [bz#1495474] - Resolves: bz#1495474
56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
From: Eric Blake <eblake@redhat.com>
|
||
Date: Wed, 27 Sep 2017 17:57:20 +0200
|
||
Subject: [PATCH] fix build failure in nbd_read_reply_entry()
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
RH-Author: Eric Blake <eblake@redhat.com>
|
||
Message-id: <20170927175725.20023-3-eblake@redhat.com>
|
||
Patchwork-id: 76668
|
||
O-Subject: [RHEV-7.4.z qemu-kvm-rhev PATCH 2/7] fix build failure in nbd_read_reply_entry()
|
||
Bugzilla: 1495474
|
||
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
||
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
||
From: Igor Mammedov <imammedo@redhat.com>
|
||
|
||
travis builds fail at HEAD at rc3 master with
|
||
|
||
block/nbd-client.c: In function ‘nbd_read_reply_entry’:
|
||
block/nbd-client.c:110:8: error: ‘ret’ may be used uninitialized in this function [-Werror=uninitialized]
|
||
|
||
fix it by initializing 'ret' to 0
|
||
|
||
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
|
||
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
(cherry picked from commit d0a180131c6655487b47ea72e7da0a909a479a3c)
|
||
Signed-off-by: Eric Blake <eblake@redhat.com>
|
||
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
||
Conflicts:
|
||
block/nbd-client.c - context
|
||
---
|
||
block/nbd-client.c | 2 +-
|
||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
||
diff --git a/block/nbd-client.c b/block/nbd-client.c
|
||
index 701b4ce..256dabe 100644
|
||
--- a/block/nbd-client.c
|
||
+++ b/block/nbd-client.c
|
||
@@ -69,7 +69,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)
|
||
{
|
||
NBDClientSession *s = opaque;
|
||
uint64_t i;
|
||
- int ret;
|
||
+ int ret = 0;
|
||
|
||
while (!s->quit) {
|
||
assert(s->reply.handle == 0);
|
||
--
|
||
1.8.3.1
|
||
|