{"id":2227469,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2227469/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260423191958.1440-30-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-30-farosas@suse.de>","list_archive_url":null,"date":"2026-04-23T19:19:43","name":"[PULL,29/43] vmstate: Introduce vmstate_save_field_with_vmdesc()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7a6c5061a88ed85561e9309ab42c43b5243267ac","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-30-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/2227469/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2227469/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=rNAXuRoB;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=iez0f+7P;\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=rNAXuRoB;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=iez0f+7P;\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=rNAXuRoB;\n dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=iez0f+7P"],"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 4g1mHB4M5sz1y2d\n\tfor ; Fri, 24 Apr 2026 05:24:06 +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 1wFzdR-0007Iw-Ln; Thu, 23 Apr 2026 15:22:51 -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-0004b9-BB\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:22:02 -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-0002Hm-KR\n for qemu-devel@nongnu.org; Thu, 23 Apr 2026 15:22:01 -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 9E8596A895;\n Thu, 23 Apr 2026 19:20:45 +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 68639593A3;\n Thu, 23 Apr 2026 19:20:44 +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 ALqNDQxx6mlJCwAAD6G6ig\n (envelope-from ); Thu, 23 Apr 2026 19:20:44 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972045;\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=QtD9R39osz5Yw6zLx6fAJZEvdDrA61iRI14Z4AjFJ4o=;\n b=rNAXuRoBklZ+75BBhEHndV6JLBQ33xVsBJ2ZG36875NFaFlHSGurFn/UyRFK8T6kOynCWn\n C2+fSxuKmG/zCWH8Sjovp2LJbdNp9TIwwb/8kBoVfPF9C1f0tBfqC2K+oo0fdcV3OLlg6Y\n PzckwjO1027/W2QFtbtuvIoR/ZGuw9s=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972045;\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=QtD9R39osz5Yw6zLx6fAJZEvdDrA61iRI14Z4AjFJ4o=;\n b=iez0f+7PgTF3m3LxR7WmCa429+RAVQZvNLj6tOJv63l+othUuzRl/KLoE3ePswLKVZThid\n ez8mv0AyLXWqMsBA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1776972045;\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=QtD9R39osz5Yw6zLx6fAJZEvdDrA61iRI14Z4AjFJ4o=;\n b=rNAXuRoBklZ+75BBhEHndV6JLBQ33xVsBJ2ZG36875NFaFlHSGurFn/UyRFK8T6kOynCWn\n C2+fSxuKmG/zCWH8Sjovp2LJbdNp9TIwwb/8kBoVfPF9C1f0tBfqC2K+oo0fdcV3OLlg6Y\n PzckwjO1027/W2QFtbtuvIoR/ZGuw9s=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1776972045;\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=QtD9R39osz5Yw6zLx6fAJZEvdDrA61iRI14Z4AjFJ4o=;\n b=iez0f+7PgTF3m3LxR7WmCa429+RAVQZvNLj6tOJv63l+othUuzRl/KLoE3ePswLKVZThid\n ez8mv0AyLXWqMsBA=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu ,\n Alexander Mikhalitsyn ,\n Juraj Marcin ","Subject":"[PULL 29/43] vmstate: Introduce vmstate_save_field_with_vmdesc()","Date":"Thu, 23 Apr 2026 16:19:43 -0300","Message-ID":"<20260423191958.1440-30-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)[imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns,suse.de:dkim,suse.de:mid,suse.de:email];\n RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n RCPT_COUNT_THREE(0.00)[4];\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":"9E8596A895","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: Peter Xu \n\nIntroduce a helper to do both the JSON blob generations and save vmstate.\nThis further shrinks the function a bit. More importantly, we'll need to\nsave two fields in one loop very soon in the future with the JSON blob.\n\nReviewed-by: Alexander Mikhalitsyn \nReviewed-by: Fabiano Rosas \nSigned-off-by: Peter Xu \nReviewed-by: Juraj Marcin \nLink: https://lore.kernel.org/qemu-devel/20260401202844.673494-7-peterx@redhat.com\nSigned-off-by: Fabiano Rosas \n---\n migration/vmstate.c | 45 ++++++++++++++++++++++++++++++++-------------\n 1 file changed, 32 insertions(+), 13 deletions(-)","diff":"diff --git a/migration/vmstate.c b/migration/vmstate.c\nindex 05badef42f..b274204e66 100644\n--- a/migration/vmstate.c\n+++ b/migration/vmstate.c\n@@ -514,6 +514,35 @@ static bool vmstate_save_field(QEMUFile *f, void *pv, size_t size,\n return true;\n }\n \n+/*\n+ * Save a whole VMSD field, including its JSON blob separately when @vmdesc\n+ * is specified.\n+ */\n+static inline bool\n+vmstate_save_field_with_vmdesc(QEMUFile *f, void *pv, size_t size,\n+ const VMStateDescription *vmsd,\n+ const VMStateField *field, JSONWriter *vmdesc,\n+ int i, int max, Error **errp)\n+{\n+ uint64_t old_offset, written_bytes;\n+ bool ok;\n+\n+ vmsd_desc_field_start(vmsd, vmdesc, field, i, max);\n+\n+ old_offset = qemu_file_transferred(f);\n+ ok = vmstate_save_field(f, pv, size, field, vmdesc, errp);\n+ written_bytes = qemu_file_transferred(f) - old_offset;\n+\n+ vmsd_desc_field_end(vmsd, vmdesc, field, written_bytes);\n+\n+ if (!ok) {\n+ error_prepend(errp, \"Save of field %s/%s failed: \",\n+ vmsd->name, field->name);\n+ }\n+\n+ return ok;\n+}\n+\n static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n void *opaque, JSONWriter *vmdesc,\n int version_id, Error **errp)\n@@ -542,7 +571,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n void *first_elem = opaque + field->offset;\n int i, n_elems = vmstate_n_elems(opaque, field);\n int size = vmstate_size(opaque, field);\n- uint64_t old_offset, written_bytes;\n JSONWriter *vmdesc_loop = vmdesc;\n bool is_prev_null = false;\n \n@@ -559,7 +587,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n /* maximum number of elements to compress in the JSON blob */\n int max_elems = vmsd_can_compress(field) ? (n_elems - i) : 1;\n \n- old_offset = qemu_file_transferred(f);\n if (field->flags & VMS_ARRAY_OF_POINTER) {\n assert(curr_elem);\n curr_elem = *(void **)curr_elem;\n@@ -606,15 +633,9 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n }\n }\n \n- vmsd_desc_field_start(vmsd, vmdesc_loop, inner_field,\n- i, max_elems);\n-\n- ok = vmstate_save_field(f, curr_elem, size, inner_field,\n- vmdesc_loop, errp);\n-\n- written_bytes = qemu_file_transferred(f) - old_offset;\n- vmsd_desc_field_end(vmsd, vmdesc_loop, inner_field,\n- written_bytes);\n+ ok = vmstate_save_field_with_vmdesc(f, curr_elem, size, vmsd,\n+ inner_field, vmdesc_loop,\n+ i, max_elems, errp);\n \n /* If we used a fake temp field.. free it now */\n if (is_null) {\n@@ -622,8 +643,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vmsd,\n }\n \n if (!ok) {\n- error_prepend(errp, \"Save of field %s/%s failed: \",\n- vmsd->name, field->name);\n goto out;\n }\n \n","prefixes":["PULL","29/43"]}