]>
Commit | Line | Data |
---|---|---|
9cd4d906 AD |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Eric Blake <eblake@redhat.com> | |
3 | Date: Wed, 27 Sep 2017 17:57:20 +0200 | |
4 | Subject: [PATCH] fix build failure in nbd_read_reply_entry() | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | RH-Author: Eric Blake <eblake@redhat.com> | |
10 | Message-id: <20170927175725.20023-3-eblake@redhat.com> | |
11 | Patchwork-id: 76668 | |
12 | O-Subject: [RHEV-7.4.z qemu-kvm-rhev PATCH 2/7] fix build failure in nbd_read_reply_entry() | |
13 | Bugzilla: 1495474 | |
14 | RH-Acked-by: Max Reitz <mreitz@redhat.com> | |
15 | RH-Acked-by: Jeffrey Cody <jcody@redhat.com> | |
16 | RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com> | |
17 | ||
18 | From: Igor Mammedov <imammedo@redhat.com> | |
19 | ||
20 | travis builds fail at HEAD at rc3 master with | |
21 | ||
22 | block/nbd-client.c: In function ‘nbd_read_reply_entry’: | |
23 | block/nbd-client.c:110:8: error: ‘ret’ may be used uninitialized in this function [-Werror=uninitialized] | |
24 | ||
25 | fix it by initializing 'ret' to 0 | |
26 | ||
27 | Signed-off-by: Igor Mammedov <imammedo@redhat.com> | |
28 | Reviewed-by: Eric Blake <eblake@redhat.com> | |
29 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | |
30 | (cherry picked from commit d0a180131c6655487b47ea72e7da0a909a479a3c) | |
31 | Signed-off-by: Eric Blake <eblake@redhat.com> | |
32 | Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> | |
33 | ||
34 | Conflicts: | |
35 | block/nbd-client.c - context | |
36 | --- | |
37 | block/nbd-client.c | 2 +- | |
38 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
39 | ||
40 | diff --git a/block/nbd-client.c b/block/nbd-client.c | |
2b940535 | 41 | index 701b4ce2eb..256dabeeef 100644 |
9cd4d906 AD |
42 | --- a/block/nbd-client.c |
43 | +++ b/block/nbd-client.c | |
44 | @@ -69,7 +69,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque) | |
45 | { | |
46 | NBDClientSession *s = opaque; | |
47 | uint64_t i; | |
48 | - int ret; | |
49 | + int ret = 0; | |
50 | ||
51 | while (!s->quit) { | |
52 | assert(s->reply.handle == 0); | |
53 | -- | |
2b940535 | 54 | 2.11.0 |
9cd4d906 | 55 |