[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/87] migration: fix maybe-uninitialized warning
From: |
Paolo Bonzini |
Subject: |
[PULL 34/87] migration: fix maybe-uninitialized warning |
Date: |
Wed, 18 Dec 2019 13:02:00 +0100 |
From: Marc-André Lureau <address@hidden>
../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 <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
migration/ram.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 38070f1..219e3ca 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++) {
--
1.8.3.1
- [PULL 25/87] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size", (continued)
- [PULL 25/87] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size", Paolo Bonzini, 2019/12/18
- [PULL 31/87] object: Improve documentation of interfaces, Paolo Bonzini, 2019/12/18
- [PULL 32/87] build-sys: build vhost-user-gpu only if CONFIG_TOOLS, Paolo Bonzini, 2019/12/18
- [PULL 26/87] xen: convert "-machine igd-passthru" to an accelerator property, Paolo Bonzini, 2019/12/18
- [PULL 18/87] vl: introduce object_parse_property_opt, Paolo Bonzini, 2019/12/18
- [PULL 10/87] migration-test: Rename cmd_src/dst to arch_source/arch_target, Paolo Bonzini, 2019/12/18
- [PULL 17/87] accel: compile accel/accel.c just once, Paolo Bonzini, 2019/12/18
- [PULL 19/87] vl: configure accelerators from -accel options, Paolo Bonzini, 2019/12/18
- [PULL 28/87] kvm: introduce kvm_kernel_irqchip_* functions, Paolo Bonzini, 2019/12/18
- [PULL 33/87] build-sys: do not include Windows SLIRP dependencies in $LIBS, Paolo Bonzini, 2019/12/18
- [PULL 34/87] migration: fix maybe-uninitialized warning,
Paolo Bonzini <=
- [PULL 21/87] qom: introduce object_register_sugar_prop, Paolo Bonzini, 2019/12/18
- [PULL 20/87] vl: warn for unavailable accelerators, clarify messages, Paolo Bonzini, 2019/12/18
- [PULL 24/87] tcg: convert "-accel threads" to a QOM property, Paolo Bonzini, 2019/12/18
- [PULL 30/87] Makefile: remove unused variables, Paolo Bonzini, 2019/12/18
- [PULL 27/87] kvm: convert "-machine kvm_shadow_mem" to an accelerator property, Paolo Bonzini, 2019/12/18
- [PULL 35/87] monitor: fix maybe-uninitialized, Paolo Bonzini, 2019/12/18
- [PULL 36/87] vhost-user-scsi: fix printf format warning, Paolo Bonzini, 2019/12/18
- [PULL 38/87] tests: skip block layer tests if !CONFIG_TOOLS, Paolo Bonzini, 2019/12/18
- [PULL 41/87] stubs: replace stubs with lnot if applicable, Paolo Bonzini, 2019/12/18
- [PULL 43/87] configure: simplify vhost condition with Kconfig, Paolo Bonzini, 2019/12/18