From nobody Thu Apr 2 20:15:40 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1774559228; cv=none; d=zohomail.com; s=zohoarc; b=QgAVXaHXC1bXlVckbTZ8vdmnegTSFGqpnfUEXGrdRNx4DUhDEzpsMx4/NnttmGtmadx9tr9qxBWSt7TZLxCKgJ8/96LIT9dTSr7r4LG5n3u81kLygXCsxv9XgFo3/wgncuXlmpQEU7UrCNt7EQvqw3Ac698BThUslmArM1NV37w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774559228; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5OGxsDPDL98ip8EJwQP/tMCYj51Rwd5fV8vt/33jK2E=; b=nuuGCokTkGvSXt/lmEOhNRt5YyYQ5YJxKxlvUF2ySnEJBXgkjBrjBzVM3npzfSpYAtUIqgWB6cuta75NwCwIKDcRySfh2PbodkygSDzQc6BLH3XxLU208ms1VUR0dBHGhRqEICHlNMcLYpgRSCzdtxPTrIFYN66GgH4n4GFrl7M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177455922857767.64352500747634; Thu, 26 Mar 2026 14:07:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w5rto-00049d-LW; Thu, 26 Mar 2026 17:05:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5rtl-00048P-Dp for qemu-devel@nongnu.org; Thu, 26 Mar 2026 17:05:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w5rtj-00036m-Kw for qemu-devel@nongnu.org; Thu, 26 Mar 2026 17:05:49 -0400 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-WffzlzDkOZiRrVMkbTbjsA-1; Thu, 26 Mar 2026 17:05:45 -0400 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-8cfcebeb1f3so121921485a.0 for ; Thu, 26 Mar 2026 14:05:45 -0700 (PDT) Received: from x1.com ([142.189.10.167]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8d00e4fa7d9sm353479785a.32.2026.03.26.14.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 14:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774559146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5OGxsDPDL98ip8EJwQP/tMCYj51Rwd5fV8vt/33jK2E=; b=RgPdVtFLTEa9C/mH4eo7ExHHYUWeETnQRwSm921degXGhB2FF+meTQTxetL1Bi2T5Xt4SX r8HKgSE/lboNWQoK7uH4zYYXpyVM18si0pLxazcg/dG9/G8QtxZUyLYlDmiceyv6ZxkUqF vhCKCd71ZBc2ZIFju0pXXnAfWfE0vzw= X-MC-Unique: WffzlzDkOZiRrVMkbTbjsA-1 X-Mimecast-MFC-AGG-ID: WffzlzDkOZiRrVMkbTbjsA_1774559145 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774559145; x=1775163945; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5OGxsDPDL98ip8EJwQP/tMCYj51Rwd5fV8vt/33jK2E=; b=dtLMV5R73wqbA7LIAIyKEs6DoLVUbsAwVaFe1V1VohNrTY/bzH8pTbehHV4DDH/YIZ LP+B3GKkZ75VXEsaf7G3Ov2/2w6Iz+UGkKNySU8jwa3+oOeK8U4hMY8uuoXFqj1lq/Ow YvlPhVU0/6k0Mdp2nr12DVbuvduRiXAbHAT24U4BccXRSy+hnxJj+3fBVb1jbtGkNAO3 yzFzdj5fMcjODpVUqmJYGoi9vAG+cqFJisrEPFshl1TGY4hAGwusDzdSf8CYg1csQpRa H01noR7dZ6w2CP/3BzX/sUDRY+X+tSQO9zZE2mGLRWKXLqIg9la0og+GvW6q0826i3WS uUjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774559145; x=1775163945; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5OGxsDPDL98ip8EJwQP/tMCYj51Rwd5fV8vt/33jK2E=; b=aojBiP3jVwqVCh9HpRJrdW66ubdZ8Rl4dHiCiwz9uZPlBKuPF74wCuQwcCK55pa62u TOUFwpkgiOcJKXpW7/x+T6Pe85RzyBqhzaR1DZwfdsevy8C0TSsbNvEFnraesU72iClk 0jQeTSBcFVN5DReUcffFek8XInA1llwgiIbWlAaRVWsmmGpqiFBLeDWXlNTDjfADgLlN zvbSv6Mza8YScDt7XBX565pHlqYuXoOqFjg9XyrEXYMJ7IDLi/lYZEaYp45YrxrVnK1W kpbqmvz1E0CCwwlC9dXQrkhAyvkb+EbSzCNs4uclHJZiV61D24Ja/n6ibHJAkwT49o6u Rc3Q== X-Gm-Message-State: AOJu0YxDsZ3zqB5rTijPxOChG0AwZ8QQW5g53IYt4q7h72q7R6PN9YQc Rj3CHoiaryG8cy5cjVq+XL0LAEa1oWmHTGpusSWciFNNw3slv2zzyQBbrv+vqVC4SbqNhdq2QLX TTMacH9YmgbEbZVIrjaOrBs/5UrTIplnGm5y/wKzJsrBOIV2ADpd7yJb6YsMOV8pYp9XjT7b11N BxeLrGV/1QhOMVoeckV6yGJJPOZ6fpxB/Q0BDteA== X-Gm-Gg: ATEYQzwCcO5I4NAkeWoPRRPo657U36qIaVvSY+dOyQYM4LdU81YIWW2mUNkzGPCIE6X KVPbtzGqDfPAj2oSIUkUeRIuFza7HJcsiUg8ssevM8OQpKYvbizzCMG48R2h1r4ccv0A/DIxno8 cqcTG8w4Ov8HgpvKYymbkKDhFamY6I9HIR+IlQuKWO+970A7m5djbRx0tAoyMy9sLyUMq0pcqKk zRHO52PBjMNnL8NeJ+0ya/6Xml9GwhlJGidyEZ/b/4kQaPvridc8YWuvGjqs9USUJXAWKkRtgWX E4sMaFiE1gvotJ1Q64AJN4aRL5/3kOXLT8obVx2feYJy3PNnc2/+GA6/qXC+1ALrIqhm5+yKmcF imqijNJoOncE= X-Received: by 2002:a05:620a:1a25:b0:8cd:8eb7:2c02 with SMTP id af79cd13be357-8d00107e6d6mr1258732385a.58.1774559144565; Thu, 26 Mar 2026 14:05:44 -0700 (PDT) X-Received: by 2002:a05:620a:1a25:b0:8cd:8eb7:2c02 with SMTP id af79cd13be357-8d00107e6d6mr1258726285a.58.1774559143895; Thu, 26 Mar 2026 14:05:43 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Alexander Mikhalitsyn , peterx@redhat.com, Fabiano Rosas , Juraj Marcin , Alexander Mikhalitsyn Subject: [PATCH RFC v2 06/11] vmstate: Introduce vmstate_save_field_with_vmdesc() Date: Thu, 26 Mar 2026 17:05:27 -0400 Message-ID: <20260326210532.379027-7-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260326210532.379027-1-peterx@redhat.com> References: <20260326210532.379027-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1774559230061158500 Content-Type: text/plain; charset="utf-8" Introduce a helper to do both the JSON blob generations and save vmstate. This further shrinks the function a bit. More importantly, we'll need to save two fields in one loop very soon in the future with the JSON blob. Reviewed-by: Alexander Mikhalitsyn Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas --- migration/vmstate.c | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/migration/vmstate.c b/migration/vmstate.c index 05badef42f..b274204e66 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -514,6 +514,35 @@ static bool vmstate_save_field(QEMUFile *f, void *pv, = size_t size, return true; } =20 +/* + * Save a whole VMSD field, including its JSON blob separately when @vmdesc + * is specified. + */ +static inline bool +vmstate_save_field_with_vmdesc(QEMUFile *f, void *pv, size_t size, + const VMStateDescription *vmsd, + const VMStateField *field, JSONWriter *vmde= sc, + int i, int max, Error **errp) +{ + uint64_t old_offset, written_bytes; + bool ok; + + vmsd_desc_field_start(vmsd, vmdesc, field, i, max); + + old_offset =3D qemu_file_transferred(f); + ok =3D vmstate_save_field(f, pv, size, field, vmdesc, errp); + written_bytes =3D qemu_file_transferred(f) - old_offset; + + vmsd_desc_field_end(vmsd, vmdesc, field, written_bytes); + + if (!ok) { + error_prepend(errp, "Save of field %s/%s failed: ", + vmsd->name, field->name); + } + + return ok; +} + static bool vmstate_save_vmsd_v(QEMUFile *f, const VMStateDescription *vms= d, void *opaque, JSONWriter *vmdesc, int version_id, Error **errp) @@ -542,7 +571,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMSt= ateDescription *vmsd, void *first_elem =3D opaque + field->offset; int i, n_elems =3D vmstate_n_elems(opaque, field); int size =3D vmstate_size(opaque, field); - uint64_t old_offset, written_bytes; JSONWriter *vmdesc_loop =3D vmdesc; bool is_prev_null =3D false; =20 @@ -559,7 +587,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMSt= ateDescription *vmsd, /* maximum number of elements to compress in the JSON blob= */ int max_elems =3D vmsd_can_compress(field) ? (n_elems - i)= : 1; =20 - old_offset =3D qemu_file_transferred(f); if (field->flags & VMS_ARRAY_OF_POINTER) { assert(curr_elem); curr_elem =3D *(void **)curr_elem; @@ -606,15 +633,9 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMS= tateDescription *vmsd, } } =20 - vmsd_desc_field_start(vmsd, vmdesc_loop, inner_field, - i, max_elems); - - ok =3D vmstate_save_field(f, curr_elem, size, inner_field, - vmdesc_loop, errp); - - written_bytes =3D qemu_file_transferred(f) - old_offset; - vmsd_desc_field_end(vmsd, vmdesc_loop, inner_field, - written_bytes); + ok =3D vmstate_save_field_with_vmdesc(f, curr_elem, size, = vmsd, + inner_field, vmdesc_lo= op, + i, max_elems, errp); =20 /* If we used a fake temp field.. free it now */ if (is_null) { @@ -622,8 +643,6 @@ static bool vmstate_save_vmsd_v(QEMUFile *f, const VMSt= ateDescription *vmsd, } =20 if (!ok) { - error_prepend(errp, "Save of field %s/%s failed: ", - vmsd->name, field->name); goto out; } =20 --=20 2.50.1