From nobody Fri Apr 3 13:31:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1774381531; cv=none; d=zohomail.com; s=zohoarc; b=U7Dyb5E4w0Z+BFhaKpl7gh1I7ksh9+oc3D6imIyFE74GoFmC+RDN40oqYIqvAkDFenIHeFn2xvy12uclQ01dgp2JWmzoGGkFHZcG1PMoFIFYnwzpbWkOmGOS6xH6O+3n8q1NyQi4n9TCoPGUIAfGnPFdK+TYrxSptiqcsgGF5s8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774381531; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Y1stviN/raIeGwfKRJGzfc+zY9+icZReG+c5s58fsdo=; b=cDTJ9SY9j0R9AdFp+DKOO0Wff1Gkn5Umlr/aghmn0+EKoAdN+zWJoLjlre4cvhJzQZMAVKSUzlZGMiAdIcvJn1GE+Eg8SDHw9zZYdlrNbBw9af/wMFU5P56WPgWww6XO4TNlU+D9Wqb8FZBn5BaQokuCVhdKSDlv/VWwX35RjWo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774381531925516.1162726320409; Tue, 24 Mar 2026 12:45:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w57g0-0003YK-AH; Tue, 24 Mar 2026 15:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w57fz-0003WF-0h for qemu-devel@nongnu.org; Tue, 24 Mar 2026 15:44:31 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w57fx-0008IL-4B for qemu-devel@nongnu.org; Tue, 24 Mar 2026 15:44:30 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 37EC85BE1C; Tue, 24 Mar 2026 19:44:03 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 0F97743FE4; Tue, 24 Mar 2026 19:44:01 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id eHwnNIHpwmlkMQAAD6G6ig (envelope-from ); Tue, 24 Mar 2026 19:44:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774381443; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y1stviN/raIeGwfKRJGzfc+zY9+icZReG+c5s58fsdo=; b=VXdP7x+urG6oRbRSv+cO2dKT8gYkMbhvwFXO3lrBM27R+gmNnqpkn1snxKyJsCdAaH608I FYhYfGCvnNtuBLUpvebB28BnjsXKdeLJHR05qyniDVDzfEdKwIibeDa56nCCJtYpglrZeY bapb9I9SoDXf16W5x3xqWHtF2iUqoGc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774381443; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y1stviN/raIeGwfKRJGzfc+zY9+icZReG+c5s58fsdo=; b=cskHf+ukmCAfaP7umTs3ZqsGRjG8mCalhhU0tCCuBqWvQuKYXJUvspNk4yLU4KcllUjfm8 oMVl4BiwHtdBNrBg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1774381443; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y1stviN/raIeGwfKRJGzfc+zY9+icZReG+c5s58fsdo=; b=VXdP7x+urG6oRbRSv+cO2dKT8gYkMbhvwFXO3lrBM27R+gmNnqpkn1snxKyJsCdAaH608I FYhYfGCvnNtuBLUpvebB28BnjsXKdeLJHR05qyniDVDzfEdKwIibeDa56nCCJtYpglrZeY bapb9I9SoDXf16W5x3xqWHtF2iUqoGc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1774381443; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y1stviN/raIeGwfKRJGzfc+zY9+icZReG+c5s58fsdo=; b=cskHf+ukmCAfaP7umTs3ZqsGRjG8mCalhhU0tCCuBqWvQuKYXJUvspNk4yLU4KcllUjfm8 oMVl4BiwHtdBNrBg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Mikhalitsyn , Juraj Marcin Subject: [RFC PATCH v1 17/17] vmstate: Reduce indentation levels Date: Tue, 24 Mar 2026 16:43:32 -0300 Message-ID: <20260324194333.30004-18-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260324194333.30004-1-farosas@suse.de> References: <20260324194333.30004-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCPT_COUNT_THREE(0.00)[4]; TO_DN_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; R_RATELIMIT(0.00)[to_ip_from(RLuo5zndapfjusa9yqdunguuf8)]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email] Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1774381532761158500 Content-Type: text/plain; charset="utf-8" Simply move the code out of the else branch. Signed-off-by: Fabiano Rosas --- migration/vmstate.c | 193 ++++++++++++++++++++++---------------------- 1 file changed, 96 insertions(+), 97 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index 054e642ec9..22f8758960 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -306,46 +306,46 @@ bool vmstate_load_vmsd(QEMUFile *f, const VMStateDesc= ription *vmsd, if (!exists) { field++; continue; - } else { - n_elems =3D vmstate_n_elems(opaque, field); - size =3D vmstate_size(opaque, field); + } =20 - head =3D vmstate_first(opaque, field, size, n_elems, - !(field->flags & VMS_ARRAY_OF_POINTER)); + n_elems =3D vmstate_n_elems(opaque, field); + size =3D vmstate_size(opaque, field); =20 - for (i =3D 0; i < n_elems; i++) { - /* If we will process the load of field? */ - bool load_field =3D true; - void *curr_elem; + head =3D vmstate_first(opaque, field, size, n_elems, + !(field->flags & VMS_ARRAY_OF_POINTER)); =20 - if (field->flags & VMS_ARRAY_OF_POINTER) { - /* Peek a possible pointer marker instead of VMSD firs= t */ - ok =3D vmstate_ptr_marker_load(f, &load_field); - } + for (i =3D 0; i < n_elems; i++) { + /* If we will process the load of field? */ + bool load_field =3D true; + void *curr_elem; =20 - curr_elem =3D vmstate_next(head, field, size, i, - load_field && ok); + if (field->flags & VMS_ARRAY_OF_POINTER) { + /* Peek a possible pointer marker instead of VMSD first */ + ok =3D vmstate_ptr_marker_load(f, &load_field); + } =20 - if (load_field) { - ok =3D vmstate_load_field(f, curr_elem, size, field, e= rrp); - } + curr_elem =3D vmstate_next(head, field, size, i, load_field &&= ok); =20 - if (ok) { - int ret =3D qemu_file_get_error(f); - if (ret < 0) { - error_setg(errp, - "Failed to load %s state: stream error:= %d", - vmsd->name, ret); - trace_vmstate_load_field_error(field->name, ret); - return false; - } - } else { - qemu_file_set_error(f, -EINVAL); - trace_vmstate_load_field_error(field->name, -EINVAL); + if (load_field) { + ok =3D vmstate_load_field(f, curr_elem, size, field, errp); + } + + if (ok) { + int ret =3D qemu_file_get_error(f); + if (ret < 0) { + error_setg(errp, + "Failed to load %s state: stream error: %d", + vmsd->name, ret); + trace_vmstate_load_field_error(field->name, ret); return false; } + } else { + qemu_file_set_error(f, -EINVAL); + trace_vmstate_load_field_error(field->name, -EINVAL); + return false; } } + field++; } assert(field->flags =3D=3D VMS_END); @@ -663,93 +663,92 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VM= StateDescription *vmsd, if (!exists) { field++; continue; - } else { - n_elems =3D vmstate_n_elems(opaque, field); - size =3D vmstate_size(opaque, field); + } =20 - trace_vmstate_save_state_loop(vmsd->name, field->name, n_elems= ); - head =3D vmstate_first(opaque, field, size, n_elems, false); + n_elems =3D vmstate_n_elems(opaque, field); + size =3D vmstate_size(opaque, field); =20 - for (i =3D 0; i < n_elems; i++) { - bool save_field =3D true; - void *curr_elem =3D vmstate_next(head, field, size, i, fal= se); - int max_elems =3D n_elems - i; + trace_vmstate_save_state_loop(vmsd->name, field->name, n_elems); + head =3D vmstate_first(opaque, field, size, n_elems, false); =20 - if (field->flags & VMS_ARRAY_OF_POINTER) { - bool use_marker_field, is_null, use_dynamic_array; + for (i =3D 0; i < n_elems; i++) { + bool save_field =3D true; + void *curr_elem =3D vmstate_next(head, field, size, i, false); + int max_elems =3D n_elems - i; =20 - is_null =3D !curr_elem; + if (field->flags & VMS_ARRAY_OF_POINTER) { + bool use_marker_field, is_null, use_dynamic_array; =20 + is_null =3D !curr_elem; + + /* + * When this is enabled, it means we will always push a ptr + * marker first for each element saying if it's populated. + */ + use_dynamic_array =3D + field->flags & VMS_ARRAY_OF_POINTER && + field->flags & VMS_ALLOC; + + use_marker_field =3D use_dynamic_array || is_null; + + if (vmdesc && vmsd_can_compress(field)) { /* - * When this is enabled, it means we will always push = a ptr - * marker first for each element saying if it's popula= ted. + * This logic only matters when dumping VM + * Desc, and only when the VMSD field can be + * compressed. + * + * Due to the fake nullptr handling above, if + * there's mixed null/non-null data, it + * doesn't make sense to emit a compressed + * array representation spanning the entire + * array because the field types will be + * different (e.g. struct vs. nullptr). Search + * ahead for the next null/non-null element + * and start a new compressed array if found. */ - use_dynamic_array =3D - field->flags & VMS_ARRAY_OF_POINTER && - field->flags & VMS_ALLOC; - - use_marker_field =3D use_dynamic_array || is_null; - - if (vmdesc && vmsd_can_compress(field)) { - /* - * This logic only matters when dumping VM - * Desc, and only when the VMSD field can be - * compressed. - * - * Due to the fake nullptr handling above, if - * there's mixed null/non-null data, it - * doesn't make sense to emit a compressed - * array representation spanning the entire - * array because the field types will be - * different (e.g. struct vs. nullptr). Search - * ahead for the next null/non-null element - * and start a new compressed array if found. - */ - if (is_null !=3D is_null_prev) { - is_null_prev =3D is_null; - use_vmdesc =3D true; - - for (int j =3D i + 1; j < n_elems; j++) { - void *elem =3D vmstate_next(head, field, s= ize, j, - false); - bool elem_is_null =3D !elem; - - if (is_null !=3D elem_is_null) { - max_elems =3D j - i; - break; - } - } - } - } - - if (use_dynamic_array) { + if (is_null !=3D is_null_prev) { + is_null_prev =3D is_null; use_vmdesc =3D true; - } =20 - if (use_marker_field) { - ok =3D vmstate_ptr_marker_save(f, curr_elem, vmsd,= field, - use_vmdesc ? vmdesc := NULL, - i, max_elems, errp); - if (!ok) { - goto out; + for (int j =3D i + 1; j < n_elems; j++) { + void *elem =3D vmstate_next(head, field, size,= j, + false); + bool elem_is_null =3D !elem; + + if (is_null !=3D elem_is_null) { + max_elems =3D j - i; + break; + } } - - save_field =3D !!curr_elem; } } =20 - if (save_field) { - ok =3D vmstate_save_field_with_vmdesc( - f, curr_elem, size, vmsd, field, - use_vmdesc ? vmdesc : NULL, i, max_elems, errp); + if (use_dynamic_array) { + use_vmdesc =3D true; + } =20 + if (use_marker_field) { + ok =3D vmstate_ptr_marker_save(f, curr_elem, vmsd, fie= ld, + use_vmdesc ? vmdesc : NUL= L, + i, max_elems, errp); if (!ok) { goto out; } + + save_field =3D !!curr_elem; } + } =20 - use_vmdesc =3D false; + if (save_field) { + ok =3D vmstate_save_field_with_vmdesc(f, curr_elem, size, = vmsd, + field, + use_vmdesc ? vmdesc : = NULL, + i, max_elems, errp); + if (!ok) { + goto out; + } } + use_vmdesc =3D false; } field++; } --=20 2.51.0