{"id":2227455,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2227455/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-8-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-8-farosas@suse.de>","list_archive_url":null,"date":"2026-04-23T19:19:21","name":"[PULL,07/43] migration: vmstate_save/load_state(): refactor tracing errors","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a23264fed19b81aa20d2b3eed49c440e84fd50f6","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-8-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/2227455/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227455/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=lxywY9JU;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=oatIl6uB;\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=BuuP4Vqp;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=Px0krCV9;\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-out1.suse.de;\n dkim=pass header.d=suse.de header.s=susede2_rsa header.b=BuuP4Vqp;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Px0krCV9"],"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 4g1mDQ1NSXz1y2d\n\tfor ; Fri, 24 Apr 2026 05:21:42 +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 1wFzbE-0001r2-84; Thu, 23 Apr 2026 15:20:32 -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 1wFzbC-0001ql-ST\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:30 -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 1wFzbB-0001mx-1T\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:30 -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-out1.suse.de (Postfix) with ESMTPS id BEE326A895;\n Thu, 23 Apr 2026 19:20:11 +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 B8B61593A3;\n Thu, 23 Apr 2026 19:20:10 +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 sLkzIepw6mlJCwAAD6G6ig\n (envelope-from ); Thu, 23 Apr 2026 19:20:10 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972013;\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=6JKcEOnO7xBPxJ/X7f5K350z+JIenmi31J54e57taoM=;\n b=lxywY9JUDE72cjl4oX3pFLZapl/uFpefOKORVaAd8ykWSUpdrG8C0hSHBHU0OxBvPptVBh\n iwAz2NXCldl0Rs2Co3Xb+W3t3PjIx9L68s/Z/Ht4ornoJLxaPqHFP8G8N2XWY9fTyQrOOE\n of/hg8f5vv1VDBwCPP+PBZ07zposk7M=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972013;\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=6JKcEOnO7xBPxJ/X7f5K350z+JIenmi31J54e57taoM=;\n b=oatIl6uBesPAcpFUw53Lec7cCwFoW8sMiSBlmkmdPhBWPBmcGIvzDREL7kIgQr17MXTw9i\n ucVYjSPQ5RzwpiCA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972011;\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=6JKcEOnO7xBPxJ/X7f5K350z+JIenmi31J54e57taoM=;\n b=BuuP4VqpTzs1ENm5Gfsej0DxXk6NFAb54sduzRF4XrDgThr9hCkC2qPYKfJthWC8HgORwq\n OdT08X5+7cpTQF2zftbQ9mROPEkQmHSnixlvM6S/fLEu2zYKR9hjEHPcd/KR0GlssU9XW7\n t+htG3oUkWQAmhwYoOqUdVrpJncCags=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972011;\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=6JKcEOnO7xBPxJ/X7f5K350z+JIenmi31J54e57taoM=;\n b=Px0krCV9EoR80vTQef3UU43ZxbjCQcvFt+KcS3uxA20+JHOY2wgqfl4qxhiV7LBzW/WYXb\n S9M92aN1UXQXdjBw=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Vladimir Sementsov-Ogievskiy ","Subject":"[PULL 07/43] migration: vmstate_save/load_state(): refactor tracing\n errors","Date":"Thu, 23 Apr 2026 16:19:21 -0300","Message-ID":"<20260423191958.1440-8-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":"BEE326A895","X-Spam-Score":"-3.01","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, 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\nTo simplify further changes (convertion to bool+errp APIs),\nlet's rework some error paths:\n\n- get rid of int ret in traces, as we are moving to bool+errp APIs\n- split traces to _fail / _success (seems better than add boolean\n result to the message).\n- prefer short error paths (return immediately on error)\n- around trace_vmstate_load_field_error(), do not call\n qemu_file_set_error(), if the erroc comes from qemu_file_get_error()\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nReviewed-by: Peter Xu \nLink: https://lore.kernel.org/qemu-devel/20260304212303.667141-6-vsementsov@yandex-team.ru\nSigned-off-by: Fabiano Rosas \n---\n migration/trace-events | 6 ++++--\n migration/vmstate.c | 25 +++++++++++++++----------\n 2 files changed, 19 insertions(+), 12 deletions(-)","diff":"diff --git a/migration/trace-events b/migration/trace-events\nindex 60e5087e38..27459dfb78 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -56,13 +56,15 @@ postcopy_page_req_sync(void *host_addr) \"sync page req %p\"\n # vmstate.c\n vmstate_load_field_error(const char *field, int ret) \"field \\\"%s\\\" load failed, ret = %d\"\n vmstate_load_state(const char *name, int version_id) \"%s v%d\"\n-vmstate_load_state_end(const char *name, const char *reason, int val) \"%s %s/%d\"\n+vmstate_load_state_fail(const char *name, const char *reason) \"%s %s\"\n+vmstate_load_state_success(const char *name) \"%s\"\n vmstate_load_state_field(const char *name, const char *field, bool exists) \"%s:%s exists=%d\"\n vmstate_n_elems(const char *name, int n_elems) \"%s: %d\"\n vmstate_subsection_load(const char *parent) \"%s\"\n vmstate_subsection_load_bad(const char *parent, const char *sub, const char *sub2) \"%s: %s/%s\"\n vmstate_subsection_load_good(const char *parent) \"%s\"\n-vmstate_save_state_pre_save_res(const char *name, int res) \"%s/%d\"\n+vmstate_save_state_pre_save_fail(const char *name) \"%s\"\n+vmstate_save_state_pre_save_success(const char *name) \"%s\"\n vmstate_save_state_loop(const char *name, const char *field, int n_elems) \"%s/%s[%d]\"\n vmstate_save_state_top(const char *idstr) \"%s\"\n vmstate_subsection_save_loop(const char *name, const char *sub) \"%s/%s\"\ndiff --git a/migration/vmstate.c b/migration/vmstate.c\nindex dd7cd27993..87e1f04959 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -144,7 +144,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n error_setg(errp, \"%s: incoming version_id %d is too new \"\n \"for local version_id %d\",\n vmsd->name, version_id, vmsd->version_id);\n- trace_vmstate_load_state_end(vmsd->name, \"too new\", -EINVAL);\n+ trace_vmstate_load_state_fail(vmsd->name, \"too new\");\n return -EINVAL;\n }\n \n@@ -152,7 +152,7 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n error_setg(errp, \"%s: incoming version_id %d is too old \"\n \"for local minimum version_id %d\",\n vmsd->name, version_id, vmsd->minimum_version_id);\n- trace_vmstate_load_state_end(vmsd->name, \"too old\", -EINVAL);\n+ trace_vmstate_load_state_fail(vmsd->name, \"too old\");\n return -EINVAL;\n }\n \n@@ -240,10 +240,10 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n error_setg(errp,\n \"Failed to load %s state: stream error: %d\",\n vmsd->name, ret);\n+ trace_vmstate_load_field_error(field->name, ret);\n+ return ret;\n }\n- }\n-\n- if (ret < 0) {\n+ } else {\n qemu_file_set_error(f, ret);\n trace_vmstate_load_field_error(field->name, ret);\n return ret;\n@@ -269,7 +269,8 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n error_prepend(errp, \"post load hook failed for: %s, version_id: \"\n \"%d, minimum_version: %d: \", vmsd->name,\n vmsd->version_id, vmsd->minimum_version_id);\n- ret = -EINVAL;\n+ trace_vmstate_load_state_fail(vmsd->name, \"post-load\");\n+ return -EINVAL;\n }\n } else if (vmsd->post_load) {\n ret = vmsd->post_load(opaque, version_id);\n@@ -279,12 +280,14 @@ int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd,\n \"minimum_version: %d, ret: %d\",\n vmsd->name, vmsd->version_id, vmsd->minimum_version_id,\n ret);\n+ trace_vmstate_load_state_fail(vmsd->name, \"post-load\");\n+ return ret;\n }\n }\n \n- trace_vmstate_load_state_end(vmsd->name, \"end\", ret);\n+ trace_vmstate_load_state_success(vmsd->name);\n \n- return ret;\n+ return 0;\n }\n \n static int vmfield_name_num(const VMStateField *start,\n@@ -444,20 +447,22 @@ static int vmstate_save_state_v(QEMUFile *f, const VMStateDescription *vmsd,\n \n if (vmsd->pre_save_errp) {\n ret = vmsd->pre_save_errp(opaque, errp) ? 0 : -EINVAL;\n- trace_vmstate_save_state_pre_save_res(vmsd->name, ret);\n if (ret < 0) {\n error_prepend(errp, \"pre-save for %s failed: \", vmsd->name);\n+ trace_vmstate_save_state_pre_save_fail(vmsd->name);\n return ret;\n }\n } else if (vmsd->pre_save) {\n ret = vmsd->pre_save(opaque);\n- trace_vmstate_save_state_pre_save_res(vmsd->name, ret);\n if (ret) {\n error_setg(errp, \"pre-save failed: %s\", vmsd->name);\n+ trace_vmstate_save_state_pre_save_fail(vmsd->name);\n return ret;\n }\n }\n \n+ trace_vmstate_save_state_pre_save_success(vmsd->name);\n+\n if (vmdesc) {\n json_writer_str(vmdesc, \"vmsd_name\", vmsd->name);\n json_writer_int64(vmdesc, \"version\", version_id);\n","prefixes":["PULL","07/43"]}