diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-10-04 15:12:09 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:32:47 +0100 |
| commit | e4f1bea2a8d021b35c5f83035f9af89f5e5bfeef (patch) | |
| tree | 5063c996dd20fb26fcfe70c65a30f66e13ffbad7 | |
| parent | b965e8c538b30116a637d64da6e2bd6d54e50171 (diff) | |
| download | focaccia-qemu-e4f1bea2a8d021b35c5f83035f9af89f5e5bfeef.tar.gz focaccia-qemu-e4f1bea2a8d021b35c5f83035f9af89f5e5bfeef.zip | |
migration: fix maybe-uninitialized warning
../migration/ram.c: In function ‘multifd_recv_thread’:
/home/elmarco/src/qq/include/qapi/error.h:165:5: error: ‘block’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
165 | error_setg_internal((errp), __FILE__, __LINE__, __func__, \
| ^~~~~~~~~~~~~~~~~~~
../migration/ram.c:818:15: note: ‘block’ was declared here
818 | RAMBlock *block;
| ^~~~~
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | migration/ram.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/migration/ram.c b/migration/ram.c index 38070f1bb2..219e3caa03 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -863,15 +863,17 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) p->next_packet_size = be32_to_cpu(packet->next_packet_size); p->packet_num = be64_to_cpu(packet->packet_num); - if (p->pages->used) { - /* make sure that ramblock is 0 terminated */ - packet->ramblock[255] = 0; - block = qemu_ram_block_by_name(packet->ramblock); - if (!block) { - error_setg(errp, "multifd: unknown ram block %s", - packet->ramblock); - return -1; - } + if (p->pages->used == 0) { + return 0; + } + + /* make sure that ramblock is 0 terminated */ + packet->ramblock[255] = 0; + block = qemu_ram_block_by_name(packet->ramblock); + if (!block) { + error_setg(errp, "multifd: unknown ram block %s", + packet->ramblock); + return -1; } for (i = 0; i < p->pages->used; i++) { |