{"id":2227478,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2227478/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-18-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-18-farosas@suse.de>","list_archive_url":null,"date":"2026-04-23T19:19:31","name":"[PULL,17/43] migration/savevm: move to new migration APIs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7bbc1cc466d10bbbfef399bcd84d5ec867905570","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-18-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/2227478/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227478/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=J6+gqmpQ;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=4yvQQDrG;\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=J6+gqmpQ;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=4yvQQDrG;\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\tnone"],"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 4g1mHd2gRBz1y2d\n\tfor ; Fri, 24 Apr 2026 05:24:29 +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 1wFzcM-0003HC-Gd; Thu, 23 Apr 2026 15:21:42 -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 1wFzcF-0002X6-Df\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:21:37 -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 1wFzcD-00025B-7t\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:21:35 -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 DBE0B6A8A8;\n Thu, 23 Apr 2026 19:20:25 +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 D3CB1593A3;\n Thu, 23 Apr 2026 19:20:24 +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 wDe9J/hw6mlJCwAAD6G6ig\n (envelope-from ); Thu, 23 Apr 2026 19:20:24 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972025;\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=YjeGSJmCeH6X7iob4o4x+DB7RJK/iTyXeF+vFeqKpmo=;\n b=J6+gqmpQwbLzAXMnnt66q8Ki8nS1CFtjJ85JSrFZfZDqvrE/6QRgXJQoCMqLxS+yTquwt+\n rfrJgjMtMnFS9Db+CSzx1jJXjJteLGbDn4rzUaSfK3fllfo7mJhiGgLpqPMxFoRPDQo1ie\n dyGUuT8QmFY4s01IQRoA78rpaAIS5ZU=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972025;\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=YjeGSJmCeH6X7iob4o4x+DB7RJK/iTyXeF+vFeqKpmo=;\n b=4yvQQDrGa4eap6OKRxyt0Lq8kqnjoaRO1j/La5VPfnwWhrZE1ICgnhcozjcJioFil7o/wd\n Tiiy3KHipAWnVxCA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972025;\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=YjeGSJmCeH6X7iob4o4x+DB7RJK/iTyXeF+vFeqKpmo=;\n b=J6+gqmpQwbLzAXMnnt66q8Ki8nS1CFtjJ85JSrFZfZDqvrE/6QRgXJQoCMqLxS+yTquwt+\n rfrJgjMtMnFS9Db+CSzx1jJXjJteLGbDn4rzUaSfK3fllfo7mJhiGgLpqPMxFoRPDQo1ie\n dyGUuT8QmFY4s01IQRoA78rpaAIS5ZU=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972025;\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=YjeGSJmCeH6X7iob4o4x+DB7RJK/iTyXeF+vFeqKpmo=;\n b=4yvQQDrGa4eap6OKRxyt0Lq8kqnjoaRO1j/La5VPfnwWhrZE1ICgnhcozjcJioFil7o/wd\n Tiiy3KHipAWnVxCA=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Vladimir Sementsov-Ogievskiy ","Subject":"[PULL 17/43] migration/savevm: move to new migration APIs","Date":"Thu, 23 Apr 2026 16:19:31 -0300","Message-ID":"<20260423191958.1440-18-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-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 TO_DN_SOME(0.00)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,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)[3]; 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, 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\nSigned-off-by: Vladimir Sementsov-Ogievskiy \nReviewed-by: Peter Xu \nLink: https://lore.kernel.org/qemu-devel/20260304212303.667141-16-vsementsov@yandex-team.ru\nSigned-off-by: Fabiano Rosas \n---\n migration/savevm.c | 105 ++++++++++++++++++++++++---------------------\n 1 file changed, 55 insertions(+), 50 deletions(-)","diff":"diff --git a/migration/savevm.c b/migration/savevm.c\nindex 699d2c9f8b..8115203b51 100644\n--- a/migration/savevm.c\n+++ b/migration/savevm.c\n@@ -205,27 +205,28 @@ void timer_get(QEMUFile *f, QEMUTimer *ts)\n * Not in vmstate.c to not add qemu-timer.c as dependency to vmstate.c\n */\n \n-static int get_timer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_timer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n QEMUTimer *v = pv;\n timer_get(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_timer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_timer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n QEMUTimer *v = pv;\n timer_put(f, v);\n \n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_timer = {\n .name = \"timer\",\n- .get = get_timer,\n- .put = put_timer,\n+ .load = load_timer,\n+ .save = save_timer,\n };\n \n \n@@ -297,7 +298,7 @@ static uint32_t get_validatable_capabilities_count(void)\n return result;\n }\n \n-static int configuration_pre_save(void *opaque)\n+static bool configuration_pre_save(void *opaque, Error **errp)\n {\n SaveState *state = opaque;\n const char *current_name = MACHINE_GET_CLASS(current_machine)->name;\n@@ -318,7 +319,7 @@ static int configuration_pre_save(void *opaque)\n }\n state->uuid = qemu_uuid;\n \n- return 0;\n+ return true;\n }\n \n static void configuration_post_save(void *opaque)\n@@ -330,7 +331,7 @@ static void configuration_post_save(void *opaque)\n state->caps_count = 0;\n }\n \n-static int configuration_pre_load(void *opaque)\n+static bool configuration_pre_load(void *opaque, Error **errp)\n {\n SaveState *state = opaque;\n \n@@ -339,7 +340,7 @@ static int configuration_pre_load(void *opaque)\n * minimum possible value for this CPU.\n */\n state->target_page_bits = migration_legacy_page_bits();\n- return 0;\n+ return true;\n }\n \n static bool configuration_validate_capabilities(SaveState *state)\n@@ -376,28 +377,31 @@ static bool configuration_validate_capabilities(SaveState *state)\n return ret;\n }\n \n-static int configuration_post_load(void *opaque, int version_id)\n+static bool configuration_post_load(void *opaque, int version_id, Error **errp)\n {\n SaveState *state = opaque;\n const char *current_name = MACHINE_GET_CLASS(current_machine)->name;\n- int ret = 0;\n+ bool ok = true;\n \n if (strncmp(state->name, current_name, state->len) != 0) {\n- error_report(\"Machine type received is '%.*s' and local is '%s'\",\n- (int) state->len, state->name, current_name);\n- ret = -EINVAL;\n+ error_setg(errp,\n+ \"Machine type received is '%.*s' and local is '%s'\",\n+ (int) state->len, state->name, current_name);\n+ ok = false;\n goto out;\n }\n \n if (state->target_page_bits != qemu_target_page_bits()) {\n- error_report(\"Received TARGET_PAGE_BITS is %d but local is %d\",\n- state->target_page_bits, qemu_target_page_bits());\n- ret = -EINVAL;\n+ error_setg(errp,\n+ \"Received TARGET_PAGE_BITS is %d but local is %d\",\n+ state->target_page_bits, qemu_target_page_bits());\n+ ok = false;\n goto out;\n }\n \n if (!configuration_validate_capabilities(state)) {\n- ret = -EINVAL;\n+ error_setg(errp, \"Failed to validate capabilities\");\n+ ok = false;\n goto out;\n }\n \n@@ -409,11 +413,12 @@ out:\n state->capabilities = NULL;\n state->caps_count = 0;\n \n- return ret;\n+ return ok;\n }\n \n-static int get_capability(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_capability(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field,\n+ Error **errp)\n {\n MigrationCapability *capability = pv;\n char capability_str[UINT8_MAX + 1];\n@@ -426,15 +431,16 @@ static int get_capability(QEMUFile *f, void *pv, size_t size,\n for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {\n if (!strcmp(MigrationCapability_str(i), capability_str)) {\n *capability = i;\n- return 0;\n+ return true;\n }\n }\n- error_report(\"Received unknown capability %s\", capability_str);\n- return -EINVAL;\n+ error_setg(errp, \"Received unknown capability %s\", capability_str);\n+ return false;\n }\n \n-static int put_capability(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_capability(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n MigrationCapability *capability = pv;\n const char *capability_str = MigrationCapability_str(*capability);\n@@ -443,13 +449,13 @@ static int put_capability(QEMUFile *f, void *pv, size_t size,\n \n qemu_put_byte(f, len);\n qemu_put_buffer(f, (uint8_t *)capability_str, len);\n- return 0;\n+ return true;\n }\n \n static const VMStateInfo vmstate_info_capability = {\n .name = \"capability\",\n- .get = get_capability,\n- .put = put_capability,\n+ .load = load_capability,\n+ .save = save_capability,\n };\n \n /* The target-page-bits subsection is present only if the\n@@ -539,9 +545,9 @@ static const VMStateDescription vmstate_uuid = {\n static const VMStateDescription vmstate_configuration = {\n .name = \"configuration\",\n .version_id = 1,\n- .pre_load = configuration_pre_load,\n- .post_load = configuration_post_load,\n- .pre_save = configuration_pre_save,\n+ .pre_load_errp = configuration_pre_load,\n+ .post_load_errp = configuration_post_load,\n+ .pre_save_errp = configuration_pre_save,\n .post_save = configuration_post_save,\n .fields = (const VMStateField[]) {\n VMSTATE_UINT32(len, SaveState),\n@@ -969,8 +975,13 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *se, Error **errp)\n }\n return ret;\n }\n- return vmstate_load_state(f, se->vmsd, se->opaque, se->load_version_id,\n- errp);\n+\n+ if (!vmstate_load_vmsd(f, se->vmsd, se->opaque, se->load_version_id,\n+ errp)) {\n+ return -EINVAL;\n+ }\n+\n+ return 0;\n }\n \n static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se,\n@@ -1028,8 +1039,6 @@ static void save_section_footer(QEMUFile *f, SaveStateEntry *se)\n static int vmstate_save(QEMUFile *f, SaveStateEntry *se, JSONWriter *vmdesc,\n Error **errp)\n {\n- int ret;\n-\n if ((!se->ops || !se->ops->save_state) && !se->vmsd) {\n return 0;\n }\n@@ -1050,10 +1059,8 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se, JSONWriter *vmdesc,\n if (!se->vmsd) {\n vmstate_save_old_style(f, se, vmdesc);\n } else {\n- ret = vmstate_save_state(f, se->vmsd, se->opaque, vmdesc,\n- errp);\n- if (ret) {\n- return ret;\n+ if (!vmstate_save_vmsd(f, se->vmsd, se->opaque, vmdesc, errp)) {\n+ return -EINVAL;\n }\n }\n \n@@ -1311,8 +1318,8 @@ static void qemu_savevm_send_configuration(MigrationState *s, QEMUFile *f)\n json_writer_start_object(vmdesc, \"configuration\");\n }\n \n- vmstate_save_state(f, &vmstate_configuration, &savevm_state,\n- vmdesc, &local_err);\n+ vmstate_save_vmsd(f, &vmstate_configuration, &savevm_state,\n+ vmdesc, &local_err);\n if (local_err) {\n error_report_err(local_err);\n }\n@@ -2721,7 +2728,6 @@ qemu_loadvm_section_part_end(QEMUFile *f, uint8_t type, Error **errp)\n static int qemu_loadvm_state_header(QEMUFile *f, Error **errp)\n {\n unsigned int v;\n- int ret;\n \n v = qemu_get_be32(f);\n if (v != QEMU_VM_FILE_MAGIC) {\n@@ -2752,10 +2758,9 @@ static int qemu_loadvm_state_header(QEMUFile *f, Error **errp)\n return -EINVAL;\n }\n \n- ret = vmstate_load_state(f, &vmstate_configuration, &savevm_state, 0,\n- errp);\n- if (ret) {\n- return ret;\n+ if (!vmstate_load_vmsd(f, &vmstate_configuration, &savevm_state, 0,\n+ errp)) {\n+ return -EINVAL;\n }\n }\n return 0;\n","prefixes":["PULL","17/43"]}