{"id":2227451,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2227451/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-12-farosas@suse.de/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<20260423191958.1440-12-farosas@suse.de>","list_archive_url":null,"date":"2026-04-23T19:19:25","name":"[PULL,11/43] migration: factor out vmstate_load_field() from vmstate_load_state()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6dcf6419171b321316293b20185a38006eefc1fb","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/1.2/people/85343/?format=json","name":"Fabiano Rosas","email":"farosas@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-12-farosas@suse.de/mbox/","series":[{"id":501236,"url":"http://patchwork.ozlabs.org/api/1.2/series/501236/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501236","date":"2026-04-23T19:19:14","name":"[PULL,01/43] checkpatch: Allow spaces after all coroutine annotations","version":1,"mbox":"http://patchwork.ozlabs.org/series/501236/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2227451/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227451/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=xP5kueji;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=9LoG355O;\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=xP5kueji;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=9LoG355O;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","smtp-out2.suse.de;\n dkim=pass header.d=suse.de header.s=susede2_rsa header.b=xP5kueji;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=9LoG355O"],"Received":["from lists1p.gnu.org (lists1p.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 4g1mD06GqFz1y2d\n\tfor ; Fri, 24 Apr 2026 05:21:20 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFzb9-0001qK-2A; Thu, 23 Apr 2026 15:20:27 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wFzb7-0001px-Lo\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:25 -0400","from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wFzb5-0001mT-Pz\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:25 -0400","from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org\n [IPv6:2a07:de40:b281:104: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-out2.suse.de (Postfix) with ESMTPS id 688B15BD72;\n Thu, 23 Apr 2026 19:20:17 +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 61D19593A3;\n Thu, 23 Apr 2026 19:20:16 +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 sJj7C/Bw6mlJCwAAD6G6ig\n (envelope-from ); Thu, 23 Apr 2026 19:20:16 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972017;\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=gLrq5vYRQzUEjpc8nDFyc527zDnf568anUwnKtbHDA4=;\n b=xP5kueji0NMII7sLVqVg+mW2PfP1GRf4lagwzZAB3UjeKsS8yVpDN2BuEkJrvJDSGaG6tY\n +83FQq7e+g+33FcUJzpJ670+ZOcANtGqLvucIJRn2xD9Cwx/Ca2+q+UfarqT4uQ1zCW5CM\n qUj+dJQMJDmpFXdQd9R5BuTueLPqyJ0=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972017;\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=gLrq5vYRQzUEjpc8nDFyc527zDnf568anUwnKtbHDA4=;\n b=9LoG355OTy97v8LDlec9/k6vCdXvAKTL4pnpnXGNV5/3DIZiWAZ/KVwB8tJtT1DhmdxOS/\n 2U2kHwAT3iVGfQCA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972017;\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=gLrq5vYRQzUEjpc8nDFyc527zDnf568anUwnKtbHDA4=;\n b=xP5kueji0NMII7sLVqVg+mW2PfP1GRf4lagwzZAB3UjeKsS8yVpDN2BuEkJrvJDSGaG6tY\n +83FQq7e+g+33FcUJzpJ670+ZOcANtGqLvucIJRn2xD9Cwx/Ca2+q+UfarqT4uQ1zCW5CM\n qUj+dJQMJDmpFXdQd9R5BuTueLPqyJ0=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972017;\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=gLrq5vYRQzUEjpc8nDFyc527zDnf568anUwnKtbHDA4=;\n b=9LoG355OTy97v8LDlec9/k6vCdXvAKTL4pnpnXGNV5/3DIZiWAZ/KVwB8tJtT1DhmdxOS/\n 2U2kHwAT3iVGfQCA=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Vladimir Sementsov-Ogievskiy ","Subject":"[PULL 11/43] migration: factor out vmstate_load_field() from\n vmstate_load_state()","Date":"Thu, 23 Apr 2026 16:19:25 -0300","Message-ID":"<20260423191958.1440-12-farosas@suse.de>","X-Mailer":"git-send-email 2.51.0","In-Reply-To":"<20260423191958.1440-1-farosas@suse.de>","References":"<20260423191958.1440-1-farosas@suse.de>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Rspamd-Action":"no action","X-Rspamd-Server":"rspamd2.dmz-prg2.suse.org","X-Spamd-Result":"default: False [-3.01 / 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)[];\n R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain];\n MX_GOOD(-0.01)[]; ARC_NA(0.00)[];\n FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_TWO(0.00)[2];\n MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[];\n SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from];\n TO_DN_SOME(0.00)[];\n RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from];\n RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received];\n FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns];\n RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n RCPT_COUNT_THREE(0.00)[3];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n DKIM_TRACE(0.00)[suse.de:+]","X-Rspamd-Queue-Id":"688B15BD72","X-Spam-Score":"-3.01","Received-SPF":"pass client-ip=2a07:de40:b251:101:10:150:64:2;\n envelope-from=farosas@suse.de; helo=smtp-out2.suse.de","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 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, 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":"From: Vladimir Sementsov-Ogievskiy \n\nSimplify vmstate_load_state() which is rather big, and simplify further\nrefactoring.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nReviewed-by: Peter Xu \nLink: https://lore.kernel.org/qemu-devel/20260304212303.667141-10-vsementsov@yandex-team.ru\nSigned-off-by: Fabiano Rosas \n---\n migration/vmstate.c | 41 +++++++++++++++++++++++------------------\n 1 file changed, 23 insertions(+), 18 deletions(-)","diff":"diff --git a/migration/vmstate.c b/migration/vmstate.c\nindex 35dbe1550e..32944c0444 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -161,6 +161,27 @@ static bool vmstate_pre_load(const VMStateDescription *vmsd, void *opaque,\n return true;\n }\n \n+static bool vmstate_load_field(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n+{\n+ if (field->flags & VMS_STRUCT) {\n+ return vmstate_load_state(f, field->vmsd, pv, field->vmsd->version_id,\n+ errp) >= 0;\n+ } else if (field->flags & VMS_VSTRUCT) {\n+ return vmstate_load_state(f, field->vmsd, pv, field->struct_version_id,\n+ errp) >= 0;\n+ }\n+\n+ if (field->info->get(f, pv, size, field) < 0) {\n+ error_setg(errp,\n+ \"Failed to load element of type %s for %s\",\n+ field->info->name, field->name);\n+ return false;\n+ }\n+\n+ return true;\n+}\n+\n int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n void *opaque, int version_id, Error **errp)\n {\n@@ -225,24 +246,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n inner_field = field;\n }\n \n- if (inner_field->flags & VMS_STRUCT) {\n- ret = vmstate_load_state(f, inner_field->vmsd, curr_elem,\n- inner_field->vmsd->version_id,\n- errp);\n- } else if (inner_field->flags & VMS_VSTRUCT) {\n- ret = vmstate_load_state(f, inner_field->vmsd, curr_elem,\n- inner_field->struct_version_id,\n- errp);\n- } else {\n- ret = inner_field->info->get(f, curr_elem, size,\n- inner_field);\n- if (ret < 0) {\n- error_setg(errp,\n- \"Failed to load element of type %s for %s: \"\n- \"%d\", inner_field->info->name,\n- inner_field->name, ret);\n- }\n- }\n+ ret = vmstate_load_field(f, curr_elem, size, inner_field,\n+ errp) ? 0 : -EINVAL;\n \n /* If we used a fake temp field.. free it now */\n if (inner_field != field) {\n","prefixes":["PULL","11/43"]}