From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 34/62] migration: fix maybe-uninitialized warning
Date: Mon, 16 Dec 2019 17:28:18 +0100 [thread overview]
Message-ID: <1576513726-53700-35-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1576513726-53700-1-git-send-email-pbonzini@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
../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>
---
migration/ram.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 5078f94..7dd7f81 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -864,15 +864,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
next prev parent reply other threads:[~2019-12-16 16:53 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 16:27 [PULL 00/62] Misc patches for 2019-12-16 Paolo Bonzini
2019-12-16 16:27 ` [PULL 01/62] kvm: Reallocate dirty_bmap when we change a slot Paolo Bonzini
2019-12-16 16:27 ` [PULL 02/62] migration-test: Create cmd_soure and cmd_target Paolo Bonzini
2019-12-16 16:27 ` [PULL 03/62] migration-test: Move hide_stderr to common commandline Paolo Bonzini
2019-12-16 16:27 ` [PULL 04/62] migration-test: Move -machine " Paolo Bonzini
2019-12-16 16:27 ` [PULL 05/62] migration-test: Move memory size " Paolo Bonzini
2019-12-16 16:27 ` [PULL 06/62] migration-test: Move shmem handling " Paolo Bonzini
2019-12-16 16:27 ` [PULL 07/62] migration-test: Move -name " Paolo Bonzini
2019-12-16 16:27 ` [PULL 08/62] migration-test: Move -serial " Paolo Bonzini
2019-12-16 16:27 ` [PULL 09/62] migration-test: Move -incomming " Paolo Bonzini
2019-12-16 16:27 ` [PULL 10/62] migration-test: Rename cmd_src/dst to arch_source/arch_target Paolo Bonzini
2019-12-16 16:27 ` [PULL 11/62] migration-test: Use a struct for test_migrate_start parameters Paolo Bonzini
2019-12-16 16:27 ` [PULL 12/62] memory: do not look at current_machine->accel Paolo Bonzini
2019-12-16 16:27 ` [PULL 13/62] vl: move icount configuration earlier Paolo Bonzini
2019-12-16 16:27 ` [PULL 14/62] tcg: move qemu_tcg_configure to accel/tcg/tcg-all.c Paolo Bonzini
2019-12-16 16:27 ` [PULL 15/62] vl: extract accelerator option processing to a separate function Paolo Bonzini
2019-12-16 16:28 ` [PULL 16/62] vl: merge -accel processing into configure_accelerators Paolo Bonzini
2019-12-16 16:28 ` [PULL 17/62] accel: compile accel/accel.c just once Paolo Bonzini
2019-12-16 16:28 ` [PULL 18/62] vl: introduce object_parse_property_opt Paolo Bonzini
2019-12-16 16:28 ` [PULL 19/62] vl: configure accelerators from -accel options Paolo Bonzini
2019-12-16 16:28 ` [PULL 20/62] vl: warn for unavailable accelerators, clarify messages Paolo Bonzini
2019-12-16 16:28 ` [PULL 21/62] qom: introduce object_register_sugar_prop Paolo Bonzini
2019-12-16 16:28 ` [PULL 22/62] qom: add object_new_with_class Paolo Bonzini
2019-12-16 16:28 ` [PULL 23/62] accel: pass object to accel_init_machine Paolo Bonzini
2019-12-16 16:28 ` [PULL 24/62] tcg: convert "-accel threads" to a QOM property Paolo Bonzini
2019-12-16 16:28 ` [PULL 25/62] tcg: add "-accel tcg,tb-size" and deprecate "-tb-size" Paolo Bonzini
2019-12-16 16:28 ` [PULL 26/62] xen: convert "-machine igd-passthru" to an accelerator property Paolo Bonzini
2019-12-16 16:28 ` [PULL 27/62] kvm: convert "-machine kvm_shadow_mem" " Paolo Bonzini
2019-12-16 16:28 ` [PULL 28/62] kvm: introduce kvm_kernel_irqchip_* functions Paolo Bonzini
2019-12-16 16:28 ` [PULL 29/62] kvm: convert "-machine kernel_irqchip" to an accelerator property Paolo Bonzini
2019-12-16 16:28 ` [PULL 30/62] Makefile: remove unused variables Paolo Bonzini
2019-12-16 16:28 ` [PULL 31/62] object: Improve documentation of interfaces Paolo Bonzini
2019-12-16 16:28 ` [PULL 32/62] build-sys: build vhost-user-gpu only if CONFIG_TOOLS Paolo Bonzini
2019-12-16 16:28 ` [PULL 33/62] build-sys: do not include Windows SLIRP dependencies in $LIBS Paolo Bonzini
2019-12-16 16:28 ` Paolo Bonzini [this message]
2019-12-16 16:28 ` [PULL 35/62] monitor: fix maybe-uninitialized Paolo Bonzini
2019-12-16 16:28 ` [PULL 36/62] vhost-user-scsi: fix printf format warning Paolo Bonzini
2019-12-16 16:28 ` [PULL 37/62] os-posix: simplify os_find_datadir Paolo Bonzini
2019-12-16 16:28 ` [PULL 38/62] tests: skip block layer tests if !CONFIG_TOOLS Paolo Bonzini
2019-12-16 16:28 ` [PULL 39/62] libvixl: remove per-target compiler flags Paolo Bonzini
2019-12-16 16:28 ` [PULL 40/62] crypto: move common bits for all emulators to libqemuutil Paolo Bonzini
2019-12-16 16:28 ` [PULL 41/62] stubs: replace stubs with lnot if applicable Paolo Bonzini
2019-12-16 16:28 ` [PULL 42/62] configure: set $PYTHON to a full path Paolo Bonzini
2019-12-16 16:28 ` [PULL 43/62] configure: simplify vhost condition with Kconfig Paolo Bonzini
2019-12-16 16:28 ` [PULL 44/62] i386: conditionally compile more files Paolo Bonzini
2019-12-16 16:28 ` [PULL 45/62] fw_cfg: allow building without other devices Paolo Bonzini
2019-12-16 16:28 ` [PULL 46/62] hw: replace hw/i386/pc.h with a header just for the i8259 Paolo Bonzini
2019-12-16 16:28 ` [PULL 47/62] pci-stub: add more MSI functions Paolo Bonzini
2019-12-16 16:28 ` [PULL 48/62] x86: move SMM property to X86MachineState Paolo Bonzini
2019-12-16 16:28 ` [PULL 49/62] hw/i386/pc: Convert DPRINTF() to trace events Paolo Bonzini
2019-12-16 16:28 ` [PULL 50/62] x86: move more x86-generic functions out of PC files Paolo Bonzini
2019-12-16 16:28 ` [PULL 51/62] acpi: move PC stubs out of stubs/ Paolo Bonzini
2019-12-16 16:28 ` [PULL 52/62] pc: stubify x86 iommu Paolo Bonzini
2019-12-16 16:28 ` [PULL 53/62] hw/i386: De-duplicate gsi_handler() to remove kvm_pc_gsi_handler() Paolo Bonzini
2019-12-16 16:28 ` [PULL 54/62] hw/i386: Simplify ioapic_init_gsi() Paolo Bonzini
2019-12-16 16:28 ` [PULL 55/62] hw/isa/isa-bus: cleanup irq functions Paolo Bonzini
2019-12-16 16:28 ` [PULL 56/62] hw/i386/pc: Use TYPE_PORT92 instead of hardcoded string Paolo Bonzini
2019-12-16 16:28 ` [PULL 57/62] hw/i386/pc: Inline port92_init() Paolo Bonzini
2019-12-16 16:28 ` [PULL 58/62] hw/i386/pc: Extract the port92 device Paolo Bonzini
2019-12-16 16:28 ` [PULL 59/62] hyperv: Use auto rcu_read macros Paolo Bonzini
2019-12-16 16:28 ` [PULL 60/62] qsp: Use WITH_RCU_READ_LOCK_GUARD Paolo Bonzini
2019-12-16 16:28 ` [PULL 61/62] memory: use RCU_READ_LOCK_GUARD Paolo Bonzini
2019-12-16 16:28 ` [PULL 62/62] colo: fix return without releasing RCU Paolo Bonzini
2019-12-17 10:56 ` [PULL 00/62] Misc patches for 2019-12-16 Peter Maydell
2019-12-17 11:22 ` Dr. David Alan Gilbert
2019-12-18 8:54 ` Juan Quintela
2019-12-18 11:53 ` Paolo Bonzini
2019-12-19 9:52 ` Juan Quintela
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1576513726-53700-35-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).