{"id":2215601,"url":"http://patchwork.ozlabs.org/api/patches/2215601/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324194333.30004-17-farosas@suse.de/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260324194333.30004-17-farosas@suse.de>","list_archive_url":null,"date":"2026-03-24T19:43:31","name":"[RFC,v1,16/17] vmstate: Declare variables at the top","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ffa9484d39681fa9d7bfff3c90b5c4033af4d5ba","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/people/85343/?format=json","name":"Fabiano Rosas","email":"farosas@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324194333.30004-17-farosas@suse.de/mbox/","series":[{"id":497339,"url":"http://patchwork.ozlabs.org/api/series/497339/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=497339","date":"2026-03-24T19:43:16","name":"migration: vmstate_save|load changes for peterx","version":1,"mbox":"http://patchwork.ozlabs.org/series/497339/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215601/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215601/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=aQBAOvKj;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=TJqyYFyv;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=aQBAOvKj;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=TJqyYFyv;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","smtp-out1.suse.de;\n\tnone"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgL9x5Xhnz1y1G\n\tfor ; Wed, 25 Mar 2026 06:45:41 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1w57g4-0003aM-4l; Tue, 24 Mar 2026 15:44:36 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1w57g3-0003a4-7M\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 15:44:35 -0400","from smtp-out1.suse.de ([195.135.223.130])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1w57g1-0008JA-Pv\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 15:44:34 -0400","from imap1.dmz-prg2.suse.org (unknown [10.150.64.97])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-out1.suse.de (Postfix) with ESMTPS id A476B4D30E;\n Tue, 24 Mar 2026 19:44:01 +0000 (UTC)","from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 7D09443FE4;\n Tue, 24 Mar 2026 19:44:00 +0000 (UTC)","from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n by imap1.dmz-prg2.suse.org with ESMTPSA id uMgqE4DpwmlkMQAAD6G6ig\n (envelope-from ); Tue, 24 Mar 2026 19:44:00 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1774381441;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=JiI2v6n7yX90Xe5eMuiBRbc0Lf65FwJ+s8Qc9S+1YdA=;\n b=aQBAOvKjhjcmNpSfF/FNVrnSOf6CqDAqRLUqD7VezzH9OSHjIpCmieF4QWJaMuh2MHdyuz\n T18vAM0LzcF8oILFnv4k55Y1MrPuIlxAA0sZbKE3Vcz6Nqb5dvJlvpIhW1HZDIDDpJkpBR\n qX5NNb8AtqxinDqgt9TeZtji4qcROcs=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1774381441;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=JiI2v6n7yX90Xe5eMuiBRbc0Lf65FwJ+s8Qc9S+1YdA=;\n b=TJqyYFyvfgTTQ0mk/gDJg/+f3y9/VGfGRiPm48/jnQLYQdEzTI9Bw5Ugl3i3aIwmad6ydp\n 7uipzJQr+HYUEfBg==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1774381441;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=JiI2v6n7yX90Xe5eMuiBRbc0Lf65FwJ+s8Qc9S+1YdA=;\n b=aQBAOvKjhjcmNpSfF/FNVrnSOf6CqDAqRLUqD7VezzH9OSHjIpCmieF4QWJaMuh2MHdyuz\n T18vAM0LzcF8oILFnv4k55Y1MrPuIlxAA0sZbKE3Vcz6Nqb5dvJlvpIhW1HZDIDDpJkpBR\n qX5NNb8AtqxinDqgt9TeZtji4qcROcs=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1774381441;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=JiI2v6n7yX90Xe5eMuiBRbc0Lf65FwJ+s8Qc9S+1YdA=;\n b=TJqyYFyvfgTTQ0mk/gDJg/+f3y9/VGfGRiPm48/jnQLYQdEzTI9Bw5Ugl3i3aIwmad6ydp\n 7uipzJQr+HYUEfBg=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Alexander Mikhalitsyn ,\n Juraj Marcin ","Subject":"[RFC PATCH v1 16/17] vmstate: Declare variables at the top","Date":"Tue, 24 Mar 2026 16:43:31 -0300","Message-ID":"<20260324194333.30004-17-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":"8bit","X-Spam-Score":"-2.80","X-Spamd-Result":"default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[];\n R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000];\n MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+];\n R_RATELIMIT(0.00)[to_ip_from(RLuo5zndapfjusa9yqdunguuf8)];\n TO_DN_SOME(0.00)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email];\n RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]","Received-SPF":"pass client-ip=195.135.223.130; envelope-from=farosas@suse.de;\n helo=smtp-out1.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Move the variables declaration at the top so we can reduce the number\nof lines in the function by grouping some declarations.\n\nSigned-off-by: Fabiano Rosas \n---\n migration/vmstate.c | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/migration/vmstate.c b/migration/vmstate.c\nindex 1862198c70..054e642ec9 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -292,6 +292,8 @@ bool vmstate_load_vmsd(QEMUFile *f, const VMStateDescription *vmsd,\n \n while (field->name) {\n bool exists;\n+ void *head;\n+ int i, n_elems, size;\n \n ok = vmstate_field_exists(vmsd, field, opaque, version_id, &exists,\n errp);\n@@ -305,9 +307,8 @@ bool vmstate_load_vmsd(QEMUFile *f, const VMStateDescription *vmsd,\n field++;\n continue;\n } else {\n- void *head;\n- int i, n_elems = vmstate_n_elems(opaque, field);\n- int size = vmstate_size(opaque, field);\n+ n_elems = vmstate_n_elems(opaque, field);\n+ size = vmstate_size(opaque, field);\n \n head = vmstate_first(opaque, field, size, n_elems,\n !(field->flags & VMS_ARRAY_OF_POINTER));\n@@ -649,7 +650,9 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n }\n \n while (field->name) {\n- bool exists;\n+ bool exists, is_null_prev = false, use_vmdesc = true;\n+ void *head;\n+ int i, n_elems, size;\n \n ok = vmstate_field_exists(vmsd, field, opaque, version_id, &exists,\n errp);\n@@ -661,11 +664,8 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n field++;\n continue;\n } else {\n- void *head;\n- int i, n_elems = vmstate_n_elems(opaque, field);\n- int size = vmstate_size(opaque, field);\n- bool is_null_prev = false;\n- bool use_vmdesc = true;\n+ n_elems = vmstate_n_elems(opaque, field);\n+ size = vmstate_size(opaque, field);\n \n trace_vmstate_save_state_loop(vmsd->name, field->name, n_elems);\n head = vmstate_first(opaque, field, size, n_elems, false);\n","prefixes":["RFC","v1","16/17"]}