{"id":2227457,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2227457/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-21-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-21-farosas@suse.de>","list_archive_url":null,"date":"2026-04-23T19:19:34","name":"[PULL,20/43] migration/vmstate-types: move to new migration APIs","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6e50432a41eca0620d4f348b0e6e7e4726b7560f","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-21-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/2227457/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227457/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=ehlTngYP;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=FL2/1vsC;\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=snKioVjW;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=9EtWJ9h2;\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\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 4g1mDc1mSzz1y2d\n\tfor ; Fri, 24 Apr 2026 05:21:52 +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 1wFzcD-0002Pl-W6; Thu, 23 Apr 2026 15:21:34 -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 1wFzbT-0001wF-Ee\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:50 -0400","from smtp-out2.suse.de ([195.135.223.131])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wFzbN-0001rK-8j\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:20:45 -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-out2.suse.de (Postfix) with ESMTPS id E44615BD72;\n Thu, 23 Apr 2026 19:20:30 +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 AF1A4593A3;\n Thu, 23 Apr 2026 19:20:29 +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 +DXWHv1w6mlJCwAAD6G6ig\n (envelope-from ); Thu, 23 Apr 2026 19:20:29 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972031;\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=pcCcuTbEOlR9w8pwI9GDj+DpaZHeIUQXxMTqcYKhQvI=;\n b=ehlTngYPnDkhzCt+wCbDTipcef4yFYJTpaf5Pyc2XXaH1PwI3vqlwdbVWABhV6lylbToND\n 5gNnJipcUJZkHcn9+whQ8iC220Th/MfDP9f4YztvHZezPc3t0D3YcNs/B9YGGoupqYI5XH\n KCOdOHbMRVgfqaaqejo3Ie0xorVtENk=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972031;\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=pcCcuTbEOlR9w8pwI9GDj+DpaZHeIUQXxMTqcYKhQvI=;\n b=FL2/1vsCI0+1wGE2QtNDFZYH9RePWkZjJ1wtVZvbpbw8Ui+VljEZp5J1fZGZAa1EVIEHNX\n 8Ke0cTBURRnUajAA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972030;\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=pcCcuTbEOlR9w8pwI9GDj+DpaZHeIUQXxMTqcYKhQvI=;\n b=snKioVjWETJV4nM7OTMP01r8fIiAfwgYVy0SSDKGtiQ/gEEpr2QM3mHHTxKD4dQQ1M48AV\n /B2cM0fwqyDkqrItuiGenEzDg1XkglBacfI6KsnJn2q8zp3fUXC8CxcA/D03NW2CFdA8gz\n huJCvMh65feCu8gRVXwweg80j7lb9Vc=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972030;\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=pcCcuTbEOlR9w8pwI9GDj+DpaZHeIUQXxMTqcYKhQvI=;\n b=9EtWJ9h2/YHPnhrP9YD5FYulOpSd1+hlc1lZtOL/pjBx61/BnVI+53dm7toKgc0QHJFQaA\n yYXwVuuCtg60IRBg=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Vladimir Sementsov-Ogievskiy ","Subject":"[PULL 20/43] migration/vmstate-types: move to new migration APIs","Date":"Thu, 23 Apr 2026 16:19:34 -0300","Message-ID":"<20260423191958.1440-21-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-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)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo];\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)[]","X-Spam-Score":"-2.80","Received-SPF":"pass client-ip=195.135.223.131; envelope-from=farosas@suse.de;\n 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,\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-19-vsementsov@yandex-team.ru\nSigned-off-by: Fabiano Rosas \n---\n migration/trace-events | 24 +-\n migration/vmstate-types.c | 627 +++++++++++++++++++-------------------\n 2 files changed, 327 insertions(+), 324 deletions(-)","diff":"diff --git a/migration/trace-events b/migration/trace-events\nindex 27459dfb78..34143b14b4 100644\n--- a/migration/trace-events\n+++ b/migration/trace-events\n@@ -72,20 +72,20 @@ vmstate_subsection_save_top(const char *idstr) \"%s\"\n vmstate_field_exists(const char *vmsd, const char *name, int field_version, int version, int result) \"%s:%s field_version %d version %d result %d\"\n \n # vmstate-types.c\n-get_qtailq(const char *name, int version_id) \"%s v%d\"\n-get_qtailq_end(const char *name, const char *reason, int val) \"%s %s/%d\"\n-put_qtailq(const char *name, int version_id) \"%s v%d\"\n-put_qtailq_end(const char *name, const char *reason) \"%s %s\"\n+load_qtailq(const char *name, int version_id) \"%s v%d\"\n+load_qtailq_end(const char *name) \"%s\"\n+save_qtailq(const char *name, int version_id) \"%s v%d\"\n+save_qtailq_end(const char *name) \"%s\"\n \n-get_gtree(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, uint32_t nnodes) \"%s(%s/%s) nnodes=%d\"\n-get_gtree_end(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, int ret) \"%s(%s/%s) %d\"\n-put_gtree(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, uint32_t nnodes) \"%s(%s/%s) nnodes=%d\"\n-put_gtree_end(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, int ret) \"%s(%s/%s) %d\"\n+load_gtree(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, uint32_t nnodes) \"%s(%s/%s) nnodes=%d\"\n+load_gtree_end(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name) \"%s(%s/%s)\"\n+save_gtree(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name, uint32_t nnodes) \"%s(%s/%s) nnodes=%d\"\n+save_gtree_end(const char *field_name, const char *key_vmsd_name, const char *val_vmsd_name) \"%s(%s/%s)\"\n \n-get_qlist(const char *field_name, const char *vmsd_name, int version_id) \"%s(%s v%d)\"\n-get_qlist_end(const char *field_name, const char *vmsd_name) \"%s(%s)\"\n-put_qlist(const char *field_name, const char *vmsd_name, int version_id) \"%s(%s v%d)\"\n-put_qlist_end(const char *field_name, const char *vmsd_name) \"%s(%s)\"\n+load_qlist(const char *field_name, const char *vmsd_name, int version_id) \"%s(%s v%d)\"\n+load_qlist_end(const char *field_name, const char *vmsd_name) \"%s(%s)\"\n+save_qlist(const char *field_name, const char *vmsd_name, int version_id) \"%s(%s v%d)\"\n+save_qlist_end(const char *field_name, const char *vmsd_name) \"%s(%s)\"\n \n # qemu-file.c\n qemu_file_fclose(void) \"\"\ndiff --git a/migration/vmstate-types.c b/migration/vmstate-types.c\nindex 033a2685c8..23f3433696 100644\n--- a/migration/vmstate-types.c\n+++ b/migration/vmstate-types.c\n@@ -23,129 +23,135 @@\n \n /* bool */\n \n-static int get_bool(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_bool(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n bool *v = pv;\n *v = qemu_get_byte(f);\n- return 0;\n+ return true;\n }\n \n-static int put_bool(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_bool(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n bool *v = pv;\n qemu_put_byte(f, *v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_bool = {\n .name = \"bool\",\n- .get = get_bool,\n- .put = put_bool,\n+ .load = load_bool,\n+ .save = save_bool,\n };\n \n /* 8 bit int */\n \n-static int get_int8(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int8(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int8_t *v = pv;\n qemu_get_s8s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_int8(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_int8(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n int8_t *v = pv;\n qemu_put_s8s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_int8 = {\n .name = \"int8\",\n- .get = get_int8,\n- .put = put_int8,\n+ .load = load_int8,\n+ .save = save_int8,\n };\n \n /* 16 bit int */\n \n-static int get_int16(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int16(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int16_t *v = pv;\n qemu_get_sbe16s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_int16(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_int16(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n int16_t *v = pv;\n qemu_put_sbe16s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_int16 = {\n .name = \"int16\",\n- .get = get_int16,\n- .put = put_int16,\n+ .load = load_int16,\n+ .save = save_int16,\n };\n \n /* 32 bit int */\n \n-static int get_int32(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int32(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int32_t *v = pv;\n qemu_get_sbe32s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_int32(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_int32(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n int32_t *v = pv;\n qemu_put_sbe32s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_int32 = {\n .name = \"int32\",\n- .get = get_int32,\n- .put = put_int32,\n+ .load = load_int32,\n+ .save = save_int32,\n };\n \n /* 32 bit int. See that the received value is the same than the one\n in the field */\n \n-static int get_int32_equal(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int32_equal(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n+ ERRP_GUARD();\n int32_t *v = pv;\n int32_t v2;\n qemu_get_sbe32s(f, &v2);\n \n if (*v == v2) {\n- return 0;\n+ return true;\n }\n- error_report(\"%\" PRIx32 \" != %\" PRIx32, *v, v2);\n- return -EINVAL;\n+\n+ error_setg(errp, \"%\" PRIx32 \" != %\" PRIx32, *v, v2);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_int32_equal = {\n .name = \"int32 equal\",\n- .get = get_int32_equal,\n- .put = put_int32,\n+ .load = load_int32_equal,\n+ .save = save_int32,\n };\n \n /* 32 bit int. Check that the received value is non-negative\n * and less than or equal to the one in the field.\n */\n \n-static int get_int32_le(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int32_le(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int32_t *cur = pv;\n int32_t loaded;\n@@ -153,348 +159,373 @@ static int get_int32_le(QEMUFile *f, void *pv, size_t size,\n \n if (loaded >= 0 && loaded <= *cur) {\n *cur = loaded;\n- return 0;\n+ return true;\n }\n- error_report(\"Invalid value %\" PRId32\n- \" expecting positive value <= %\" PRId32,\n- loaded, *cur);\n- return -EINVAL;\n+\n+ error_setg(errp, \"Invalid value %\" PRId32\n+ \" expecting positive value <= %\" PRId32,\n+ loaded, *cur);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_int32_le = {\n .name = \"int32 le\",\n- .get = get_int32_le,\n- .put = put_int32,\n+ .load = load_int32_le,\n+ .save = save_int32,\n };\n \n /* 64 bit int */\n \n-static int get_int64(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_int64(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int64_t *v = pv;\n qemu_get_sbe64s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_int64(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_int64(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n int64_t *v = pv;\n qemu_put_sbe64s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_int64 = {\n .name = \"int64\",\n- .get = get_int64,\n- .put = put_int64,\n+ .load = load_int64,\n+ .save = save_int64,\n };\n \n /* 8 bit unsigned int */\n \n-static int get_uint8(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint8(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint8_t *v = pv;\n qemu_get_8s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_uint8(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_uint8(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n uint8_t *v = pv;\n qemu_put_8s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_uint8 = {\n .name = \"uint8\",\n- .get = get_uint8,\n- .put = put_uint8,\n+ .load = load_uint8,\n+ .save = save_uint8,\n };\n \n /* 16 bit unsigned int */\n \n-static int get_uint16(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint16(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint16_t *v = pv;\n qemu_get_be16s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_uint16(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_uint16(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n uint16_t *v = pv;\n qemu_put_be16s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_uint16 = {\n .name = \"uint16\",\n- .get = get_uint16,\n- .put = put_uint16,\n+ .load = load_uint16,\n+ .save = save_uint16,\n };\n \n /* 32 bit unsigned int */\n \n-static int get_uint32(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint32(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint32_t *v = pv;\n qemu_get_be32s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_uint32(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_uint32(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n uint32_t *v = pv;\n qemu_put_be32s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_uint32 = {\n .name = \"uint32\",\n- .get = get_uint32,\n- .put = put_uint32,\n+ .load = load_uint32,\n+ .save = save_uint32,\n };\n \n /* 32 bit uint. See that the received value is the same than the one\n in the field */\n \n-static int get_uint32_equal(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint32_equal(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n+ ERRP_GUARD();\n uint32_t *v = pv;\n uint32_t v2;\n qemu_get_be32s(f, &v2);\n \n if (*v == v2) {\n- return 0;\n+ return true;\n }\n- error_report(\"%\" PRIx32 \" != %\" PRIx32, *v, v2);\n- return -EINVAL;\n+\n+ error_setg(errp, \"%\" PRIx32 \" != %\" PRIx32, *v, v2);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_uint32_equal = {\n .name = \"uint32 equal\",\n- .get = get_uint32_equal,\n- .put = put_uint32,\n+ .load = load_uint32_equal,\n+ .save = save_uint32,\n };\n \n /* 64 bit unsigned int */\n \n-static int get_uint64(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint64(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint64_t *v = pv;\n qemu_get_be64s(f, v);\n- return 0;\n+ return true;\n }\n \n-static int put_uint64(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_uint64(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n uint64_t *v = pv;\n qemu_put_be64s(f, v);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_uint64 = {\n .name = \"uint64\",\n- .get = get_uint64,\n- .put = put_uint64,\n+ .load = load_uint64,\n+ .save = save_uint64,\n };\n \n /* File descriptor communicated via SCM_RIGHTS */\n \n-static int get_fd(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_fd(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n int32_t *v = pv;\n \n if (migrate_mode() == MIG_MODE_CPR_EXEC) {\n qemu_get_sbe32s(f, v);\n- return 0;\n+ return true;\n }\n \n- return qemu_file_get_fd(f, v);\n+ return qemu_file_get_fd(f, v) >= 0;\n }\n \n-static int put_fd(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_fd(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n int32_t *v = pv;\n+\n if (migrate_mode() == MIG_MODE_CPR_EXEC) {\n qemu_put_sbe32s(f, v);\n- return 0;\n+ return true;\n }\n- return qemu_file_put_fd(f, *v);\n+\n+ return qemu_file_put_fd(f, *v) >= 0;\n }\n \n const VMStateInfo vmstate_info_fd = {\n .name = \"fd\",\n- .get = get_fd,\n- .put = put_fd,\n+ .load = load_fd,\n+ .save = save_fd,\n };\n \n-static int get_nullptr(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_nullptr(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n \n {\n if (qemu_get_byte(f) == VMS_NULLPTR_MARKER) {\n- return 0;\n+ return true;\n }\n- error_report(\"vmstate: get_nullptr expected VMS_NULLPTR_MARKER\");\n- return -EINVAL;\n+\n+ error_setg(errp, \"vmstate: load_nullptr expected VMS_NULLPTR_MARKER\");\n+ return false;\n }\n \n-static int put_nullptr(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_nullptr(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n \n {\n if (pv == NULL) {\n qemu_put_byte(f, VMS_NULLPTR_MARKER);\n- return 0;\n+ return true;\n }\n- error_report(\"vmstate: put_nullptr must be called with pv == NULL\");\n- return -EINVAL;\n+\n+ error_setg(errp, \"vmstate: save_nullptr must be called with pv == NULL\");\n+ return false;\n }\n \n const VMStateInfo vmstate_info_nullptr = {\n .name = \"nullptr\",\n- .get = get_nullptr,\n- .put = put_nullptr,\n+ .load = load_nullptr,\n+ .save = save_nullptr,\n };\n \n /* 64 bit unsigned int. See that the received value is the same than the one\n in the field */\n \n-static int get_uint64_equal(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint64_equal(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n+ ERRP_GUARD();\n uint64_t *v = pv;\n uint64_t v2;\n+\n qemu_get_be64s(f, &v2);\n \n if (*v == v2) {\n- return 0;\n+ return true;\n }\n- error_report(\"%\" PRIx64 \" != %\" PRIx64, *v, v2);\n- return -EINVAL;\n+\n+ error_setg(errp, \"%\" PRIx64 \" != %\" PRIx64, *v, v2);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_uint64_equal = {\n .name = \"int64 equal\",\n- .get = get_uint64_equal,\n- .put = put_uint64,\n+ .load = load_uint64_equal,\n+ .save = save_uint64,\n };\n \n /* 8 bit int. See that the received value is the same than the one\n in the field */\n \n-static int get_uint8_equal(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint8_equal(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n+ ERRP_GUARD();\n uint8_t *v = pv;\n uint8_t v2;\n+\n qemu_get_8s(f, &v2);\n \n if (*v == v2) {\n- return 0;\n+ return true;\n }\n- error_report(\"%x != %x\", *v, v2);\n- return -EINVAL;\n+\n+ error_setg(errp, \"%x != %x\", *v, v2);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_uint8_equal = {\n .name = \"uint8 equal\",\n- .get = get_uint8_equal,\n- .put = put_uint8,\n+ .load = load_uint8_equal,\n+ .save = save_uint8,\n };\n \n /* 16 bit unsigned int int. See that the received value is the same than the one\n in the field */\n \n-static int get_uint16_equal(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_uint16_equal(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n+ ERRP_GUARD();\n uint16_t *v = pv;\n uint16_t v2;\n+\n qemu_get_be16s(f, &v2);\n \n if (*v == v2) {\n- return 0;\n+ return true;\n }\n- error_report(\"%x != %x\", *v, v2);\n- return -EINVAL;\n+\n+ error_setg(errp, \"%x != %x\", *v, v2);\n+ return false;\n }\n \n const VMStateInfo vmstate_info_uint16_equal = {\n .name = \"uint16 equal\",\n- .get = get_uint16_equal,\n- .put = put_uint16,\n+ .load = load_uint16_equal,\n+ .save = save_uint16,\n };\n \n /* CPU_DoubleU type */\n \n-static int get_cpudouble(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_cpudouble(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n CPU_DoubleU *v = pv;\n qemu_get_be32s(f, &v->l.upper);\n qemu_get_be32s(f, &v->l.lower);\n- return 0;\n+ return true;\n }\n \n-static int put_cpudouble(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_cpudouble(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n CPU_DoubleU *v = pv;\n qemu_put_be32s(f, &v->l.upper);\n qemu_put_be32s(f, &v->l.lower);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_cpudouble = {\n .name = \"CPU_Double_U\",\n- .get = get_cpudouble,\n- .put = put_cpudouble,\n+ .load = load_cpudouble,\n+ .save = save_cpudouble,\n };\n \n /* uint8_t buffers */\n \n-static int get_buffer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_buffer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint8_t *v = pv;\n qemu_get_buffer(f, v, size);\n- return 0;\n+ return true;\n }\n \n-static int put_buffer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_buffer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n uint8_t *v = pv;\n qemu_put_buffer(f, v, size);\n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_buffer = {\n .name = \"buffer\",\n- .get = get_buffer,\n- .put = put_buffer,\n+ .load = load_buffer,\n+ .save = save_buffer,\n };\n \n /* unused buffers: space that was used for some fields that are\n not useful anymore */\n \n-static int get_unused_buffer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_unused_buffer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n uint8_t buf[1024];\n int block_len;\n@@ -504,11 +535,13 @@ static int get_unused_buffer(QEMUFile *f, void *pv, size_t size,\n size -= block_len;\n qemu_get_buffer(f, buf, block_len);\n }\n- return 0;\n+\n+ return true;\n }\n \n-static int put_unused_buffer(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_unused_buffer(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n static const uint8_t buf[1024];\n int block_len;\n@@ -519,13 +552,13 @@ static int put_unused_buffer(QEMUFile *f, void *pv, size_t size,\n qemu_put_buffer(f, buf, block_len);\n }\n \n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_unused_buffer = {\n .name = \"unused_buffer\",\n- .get = get_unused_buffer,\n- .put = put_unused_buffer,\n+ .load = load_unused_buffer,\n+ .save = save_unused_buffer,\n };\n \n /* vmstate_info_tmp, see VMSTATE_WITH_TMP, the idea is that we allocate\n@@ -534,48 +567,34 @@ const VMStateInfo vmstate_info_unused_buffer = {\n * in fields that don't really exist in the parent but need to be in the\n * stream.\n */\n-static int get_tmp(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_tmp(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n- int ret;\n- Error *local_err = NULL;\n const VMStateDescription *vmsd = field->vmsd;\n int version_id = field->version_id;\n- void *tmp = g_malloc(size);\n+ g_autofree void *tmp = g_malloc(size);\n \n /* Writes the parent field which is at the start of the tmp */\n *(void **)tmp = pv;\n- ret = vmstate_load_state(f, vmsd, tmp, version_id, &local_err);\n- if (ret < 0) {\n- error_report_err(local_err);\n- }\n- g_free(tmp);\n- return ret;\n+ return vmstate_load_vmsd(f, vmsd, tmp, version_id, errp);\n }\n \n-static int put_tmp(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_tmp(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n const VMStateDescription *vmsd = field->vmsd;\n- void *tmp = g_malloc(size);\n- int ret;\n- Error *local_err = NULL;\n+ g_autofree void *tmp = g_malloc(size);\n \n /* Writes the parent field which is at the start of the tmp */\n *(void **)tmp = pv;\n- ret = vmstate_save_state(f, vmsd, tmp, vmdesc, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- }\n- g_free(tmp);\n-\n- return ret;\n+ return vmstate_save_vmsd(f, vmsd, tmp, vmdesc, errp);\n }\n \n const VMStateInfo vmstate_info_tmp = {\n .name = \"tmp\",\n- .get = get_tmp,\n- .put = put_tmp,\n+ .load = load_tmp,\n+ .save = save_tmp,\n };\n \n /* bitmaps (as defined by bitmap.h). Note that size here is the size\n@@ -585,11 +604,12 @@ const VMStateInfo vmstate_info_tmp = {\n */\n /* This is the number of 64 bit words sent over the wire */\n #define BITS_TO_U64S(nr) DIV_ROUND_UP(nr, 64)\n-static int get_bitmap(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field)\n+static bool load_bitmap(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, Error **errp)\n {\n unsigned long *bmp = pv;\n int i, idx = 0;\n+\n for (i = 0; i < BITS_TO_U64S(size); i++) {\n uint64_t w = qemu_get_be64(f);\n bmp[idx++] = w;\n@@ -597,14 +617,17 @@ static int get_bitmap(QEMUFile *f, void *pv, size_t size,\n bmp[idx++] = w >> 32;\n }\n }\n- return 0;\n+\n+ return true;\n }\n \n-static int put_bitmap(QEMUFile *f, void *pv, size_t size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_bitmap(QEMUFile *f, void *pv, size_t size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n unsigned long *bmp = pv;\n int i, idx = 0;\n+\n for (i = 0; i < BITS_TO_U64S(size); i++) {\n uint64_t w = bmp[idx++];\n if (sizeof(unsigned long) == 4 && idx < BITS_TO_LONGS(size)) {\n@@ -613,23 +636,21 @@ static int put_bitmap(QEMUFile *f, void *pv, size_t size,\n qemu_put_be64(f, w);\n }\n \n- return 0;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_bitmap = {\n .name = \"bitmap\",\n- .get = get_bitmap,\n- .put = put_bitmap,\n+ .load = load_bitmap,\n+ .save = save_bitmap,\n };\n \n /* get for QTAILQ\n * meta data about the QTAILQ is encoded in a VMStateField structure\n */\n-static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field)\n+static bool load_qtailq(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, Error **errp)\n {\n- int ret = 0;\n- Error *local_err = NULL;\n const VMStateDescription *vmsd = field->vmsd;\n /* size of a QTAILQ element */\n size_t size = field->size;\n@@ -638,80 +659,76 @@ static int get_qtailq(QEMUFile *f, void *pv, size_t unused_size,\n int version_id = field->version_id;\n void *elm;\n \n- trace_get_qtailq(vmsd->name, version_id);\n+ trace_load_qtailq(vmsd->name, version_id);\n if (version_id > vmsd->version_id) {\n- error_report(\"%s %s\", vmsd->name, \"too new\");\n- trace_get_qtailq_end(vmsd->name, \"too new\", -EINVAL);\n-\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", vmsd->name, \"too new\");\n+ return false;\n }\n if (version_id < vmsd->minimum_version_id) {\n- error_report(\"%s %s\", vmsd->name, \"too old\");\n- trace_get_qtailq_end(vmsd->name, \"too old\", -EINVAL);\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", vmsd->name, \"too old\");\n+ return false;\n }\n \n while (qemu_get_byte(f)) {\n elm = g_malloc(size);\n- ret = vmstate_load_state(f, vmsd, elm, version_id, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- return ret;\n+ if (!vmstate_load_vmsd(f, vmsd, elm, version_id, errp)) {\n+ g_free(elm);\n+ return false;\n }\n QTAILQ_RAW_INSERT_TAIL(pv, elm, entry_offset);\n }\n \n- trace_get_qtailq_end(vmsd->name, \"end\", ret);\n- return ret;\n+ trace_load_qtailq_end(vmsd->name);\n+ return true;\n }\n \n-/* put for QTAILQ */\n-static int put_qtailq(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+/* save for QTAILQ */\n+static bool save_qtailq(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n const VMStateDescription *vmsd = field->vmsd;\n /* offset of the QTAILQ entry in a QTAILQ element*/\n size_t entry_offset = field->start;\n void *elm;\n- int ret;\n- Error *local_err = NULL;\n \n- trace_put_qtailq(vmsd->name, vmsd->version_id);\n+ trace_save_qtailq(vmsd->name, vmsd->version_id);\n \n QTAILQ_RAW_FOREACH(elm, pv, entry_offset) {\n qemu_put_byte(f, true);\n- ret = vmstate_save_state(f, vmsd, elm, vmdesc, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- return ret;\n+ if (!vmstate_save_vmsd(f, vmsd, elm, vmdesc, errp)) {\n+ return false;\n }\n }\n qemu_put_byte(f, false);\n \n- trace_put_qtailq_end(vmsd->name, \"end\");\n+ trace_save_qtailq_end(vmsd->name);\n \n- return 0;\n+ return true;\n }\n const VMStateInfo vmstate_info_qtailq = {\n .name = \"qtailq\",\n- .get = get_qtailq,\n- .put = put_qtailq,\n+ .load = load_qtailq,\n+ .save = save_qtailq,\n };\n \n-struct put_gtree_data {\n+struct save_gtree_data {\n QEMUFile *f;\n const VMStateDescription *key_vmsd;\n const VMStateDescription *val_vmsd;\n JSONWriter *vmdesc;\n- int ret;\n+ Error **errp;\n+ bool failed;\n };\n \n-static gboolean put_gtree_elem(gpointer key, gpointer value, gpointer data)\n+/*\n+ * save_gtree_elem - func for g_tree_foreach, return true to stop\n+ * iteration.\n+ */\n+static gboolean save_gtree_elem(gpointer key, gpointer value, gpointer data)\n {\n- struct put_gtree_data *capsule = (struct put_gtree_data *)data;\n+ struct save_gtree_data *capsule = (struct save_gtree_data *)data;\n QEMUFile *f = capsule->f;\n- int ret;\n- Error *local_err = NULL;\n \n qemu_put_byte(f, true);\n \n@@ -719,58 +736,56 @@ static gboolean put_gtree_elem(gpointer key, gpointer value, gpointer data)\n if (!capsule->key_vmsd) {\n qemu_put_be64(f, (uint64_t)(uintptr_t)(key)); /* direct key */\n } else {\n- ret = vmstate_save_state(f, capsule->key_vmsd, key, capsule->vmdesc,\n- &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- capsule->ret = ret;\n+ if (!vmstate_save_vmsd(f, capsule->key_vmsd, key, capsule->vmdesc,\n+ capsule->errp)) {\n+ capsule->failed = true;\n return true;\n }\n }\n \n /* put the data */\n- ret = vmstate_save_state(f, capsule->val_vmsd, value, capsule->vmdesc,\n- &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- capsule->ret = ret;\n+ if (!vmstate_save_vmsd(f, capsule->val_vmsd, value, capsule->vmdesc,\n+ capsule->errp)) {\n+ capsule->failed = true;\n return true;\n }\n return false;\n }\n \n-static int put_gtree(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_gtree(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n bool direct_key = (!field->start);\n const VMStateDescription *key_vmsd = direct_key ? NULL : &field->vmsd[1];\n const VMStateDescription *val_vmsd = &field->vmsd[0];\n const char *key_vmsd_name = direct_key ? \"direct\" : key_vmsd->name;\n- struct put_gtree_data capsule = {\n+ struct save_gtree_data capsule = {\n .f = f,\n .key_vmsd = key_vmsd,\n .val_vmsd = val_vmsd,\n .vmdesc = vmdesc,\n- .ret = 0};\n+ .errp = errp,\n+ .failed = false};\n GTree **pval = pv;\n GTree *tree = *pval;\n uint32_t nnodes = g_tree_nnodes(tree);\n- int ret;\n \n- trace_put_gtree(field->name, key_vmsd_name, val_vmsd->name, nnodes);\n+ trace_save_gtree(field->name, key_vmsd_name, val_vmsd->name, nnodes);\n qemu_put_be32(f, nnodes);\n- g_tree_foreach(tree, put_gtree_elem, (gpointer)&capsule);\n+ g_tree_foreach(tree, save_gtree_elem, (gpointer)&capsule);\n qemu_put_byte(f, false);\n- ret = capsule.ret;\n- if (ret) {\n- error_report(\"%s : failed to save gtree (%d)\", field->name, ret);\n+ if (capsule.failed) {\n+ trace_save_gtree_end(field->name, key_vmsd_name, val_vmsd->name);\n+ return false;\n }\n- trace_put_gtree_end(field->name, key_vmsd_name, val_vmsd->name, ret);\n- return ret;\n+\n+ trace_save_gtree_end(field->name, key_vmsd_name, val_vmsd->name);\n+ return true;\n }\n \n-static int get_gtree(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field)\n+static bool load_gtree(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, Error **errp)\n {\n bool direct_key = (!field->start);\n const VMStateDescription *key_vmsd = direct_key ? NULL : &field->vmsd[1];\n@@ -783,107 +798,97 @@ static int get_gtree(QEMUFile *f, void *pv, size_t unused_size,\n GTree **pval = pv;\n GTree *tree = *pval;\n void *key, *val;\n- int ret = 0;\n- Error *local_err = NULL;\n \n /* in case of direct key, the key vmsd can be {}, ie. check fields */\n if (!direct_key && version_id > key_vmsd->version_id) {\n- error_report(\"%s %s\", key_vmsd->name, \"too new\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", key_vmsd->name, \"too new\");\n+ return false;\n }\n if (!direct_key && version_id < key_vmsd->minimum_version_id) {\n- error_report(\"%s %s\", key_vmsd->name, \"too old\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", key_vmsd->name, \"too old\");\n+ return false;\n }\n if (version_id > val_vmsd->version_id) {\n- error_report(\"%s %s\", val_vmsd->name, \"too new\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", val_vmsd->name, \"too new\");\n+ return false;\n }\n if (version_id < val_vmsd->minimum_version_id) {\n- error_report(\"%s %s\", val_vmsd->name, \"too old\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", val_vmsd->name, \"too old\");\n+ return false;\n }\n \n nnodes = qemu_get_be32(f);\n- trace_get_gtree(field->name, key_vmsd_name, val_vmsd->name, nnodes);\n+ trace_load_gtree(field->name, key_vmsd_name, val_vmsd->name, nnodes);\n \n while (qemu_get_byte(f)) {\n if ((++count) > nnodes) {\n- ret = -EINVAL;\n break;\n }\n if (direct_key) {\n key = (void *)(uintptr_t)qemu_get_be64(f);\n } else {\n key = g_malloc0(key_size);\n- ret = vmstate_load_state(f, key_vmsd, key, version_id, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n+ if (!vmstate_load_vmsd(f, key_vmsd, key, version_id, errp)) {\n goto key_error;\n }\n }\n val = g_malloc0(val_size);\n- ret = vmstate_load_state(f, val_vmsd, val, version_id, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n+ if (!vmstate_load_vmsd(f, val_vmsd, val, version_id, errp)) {\n goto val_error;\n }\n g_tree_insert(tree, key, val);\n }\n if (count != nnodes) {\n- error_report(\"%s inconsistent stream when loading the gtree\",\n- field->name);\n- return -EINVAL;\n+ error_setg(errp, \"%s inconsistent stream when loading the gtree\",\n+ field->name);\n+ return false;\n }\n- trace_get_gtree_end(field->name, key_vmsd_name, val_vmsd->name, ret);\n- return ret;\n+\n+ trace_load_gtree_end(field->name, key_vmsd_name, val_vmsd->name);\n+ return true;\n+\n val_error:\n g_free(val);\n+\n key_error:\n if (!direct_key) {\n g_free(key);\n }\n- trace_get_gtree_end(field->name, key_vmsd_name, val_vmsd->name, ret);\n- return ret;\n+ return false;\n }\n \n \n const VMStateInfo vmstate_info_gtree = {\n .name = \"gtree\",\n- .get = get_gtree,\n- .put = put_gtree,\n+ .load = load_gtree,\n+ .save = save_gtree,\n };\n \n-static int put_qlist(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field, JSONWriter *vmdesc)\n+static bool save_qlist(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ Error **errp)\n {\n const VMStateDescription *vmsd = field->vmsd;\n /* offset of the QTAILQ entry in a QTAILQ element*/\n size_t entry_offset = field->start;\n void *elm;\n- int ret;\n- Error *local_err = NULL;\n \n- trace_put_qlist(field->name, vmsd->name, vmsd->version_id);\n+ trace_save_qlist(field->name, vmsd->name, vmsd->version_id);\n QLIST_RAW_FOREACH(elm, pv, entry_offset) {\n qemu_put_byte(f, true);\n- ret = vmstate_save_state(f, vmsd, elm, vmdesc, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n- return ret;\n+ if (!vmstate_save_vmsd(f, vmsd, elm, vmdesc, errp)) {\n+ return false;\n }\n }\n qemu_put_byte(f, false);\n- trace_put_qlist_end(field->name, vmsd->name);\n+ trace_save_qlist_end(field->name, vmsd->name);\n \n- return 0;\n+ return true;\n }\n \n-static int get_qlist(QEMUFile *f, void *pv, size_t unused_size,\n- const VMStateField *field)\n+static bool load_qlist(QEMUFile *f, void *pv, size_t unused_size,\n+ const VMStateField *field, Error **errp)\n {\n- int ret = 0;\n- Error *local_err = NULL;\n const VMStateDescription *vmsd = field->vmsd;\n /* size of a QLIST element */\n size_t size = field->size;\n@@ -892,23 +897,21 @@ static int get_qlist(QEMUFile *f, void *pv, size_t unused_size,\n int version_id = field->version_id;\n void *elm, *prev = NULL;\n \n- trace_get_qlist(field->name, vmsd->name, vmsd->version_id);\n+ trace_load_qlist(field->name, vmsd->name, vmsd->version_id);\n if (version_id > vmsd->version_id) {\n- error_report(\"%s %s\", vmsd->name, \"too new\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", vmsd->name, \"too new\");\n+ return false;\n }\n if (version_id < vmsd->minimum_version_id) {\n- error_report(\"%s %s\", vmsd->name, \"too old\");\n- return -EINVAL;\n+ error_setg(errp, \"%s %s\", vmsd->name, \"too old\");\n+ return false;\n }\n \n while (qemu_get_byte(f)) {\n elm = g_malloc(size);\n- ret = vmstate_load_state(f, vmsd, elm, version_id, &local_err);\n- if (ret) {\n- error_report_err(local_err);\n+ if (!vmstate_load_vmsd(f, vmsd, elm, version_id, errp)) {\n g_free(elm);\n- return ret;\n+ return false;\n }\n if (!prev) {\n QLIST_RAW_INSERT_HEAD(pv, elm, entry_offset);\n@@ -917,13 +920,13 @@ static int get_qlist(QEMUFile *f, void *pv, size_t unused_size,\n }\n prev = elm;\n }\n- trace_get_qlist_end(field->name, vmsd->name);\n+ trace_load_qlist_end(field->name, vmsd->name);\n \n- return ret;\n+ return true;\n }\n \n const VMStateInfo vmstate_info_qlist = {\n .name = \"qlist\",\n- .get = get_qlist,\n- .put = put_qlist,\n+ .load = load_qlist,\n+ .save = save_qlist,\n };\n","prefixes":["PULL","20/43"]}