From nobody Fri Nov 14 21:05:55 2025 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=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1761693431; cv=none; d=zohomail.com; s=zohoarc; b=ZPLZxpip0YX8DnzMBRkoK60SJpVQXhZloWIDeyKCjsnOuJaWqXaIquRSwVPOfLfdvx+mLDKrw+JWdCItpZVLUF0m8XEu2dvqjH1pewp3BbNPWZNisbp+XLBQZrhGIZT/yOfL5mXx6mbfxcQZWWNLBeuFsFeg3ObEJobygW/RcTc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761693431; 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=EZgFRHRD0OzlmlPv1yQVuHzPOzY9kMBfHCFRUSxoT20=; b=a1u/RdPHpkm7E/GwuLG0r9FH+caLMe5DPVrxduVMHDzb3MFfPEFCdA7ojTkOxgO4xlv8Da/87pTow9DXnnlxBfSvMWrbHAZvOogxjupvk1tinp0mz0AIt9Q2z9W0rpD1MWiWQiyYERk1neFInDbhXCxDoG7dhhFD0OOgCim6Pyc= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1761693431957558.770417081897; Tue, 28 Oct 2025 16:17:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDstI-0002sN-AG; Tue, 28 Oct 2025 19:14:13 -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 1vDstG-0002s5-Sp for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:10 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDst7-00014V-7x for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:10 -0400 Received: from mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net [IPv6:2a02:6b8:c10:49f:0:640:b99a:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 095A08174E; Wed, 29 Oct 2025 02:13:55 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:582::1:19]) by mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id oDnXpg2bCW20-SDlcWWZH; Wed, 29 Oct 2025 02:13:54 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761693234; bh=EZgFRHRD0OzlmlPv1yQVuHzPOzY9kMBfHCFRUSxoT20=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=y+lJEsuJYbbI9AxRUrFp94119eKIgC4UaADH/VWc1rijssSLwwI4savdwXSve89aJ GLRu+V6tI2oEfehr77FsClOfz48wRdbRjpEDUOaJ9+XsBXFHSvMPK2hKKLnNbY9aaZ caHc1fl8JunphcT0XwTGDmNvcdM4xT6qa1g49ucc= Authentication-Results: mail-nwsmtp-smtp-corp-canary-81.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: peterx@redhat.com Cc: armbru@redhat.com, vsementsov@yandex-team.ru, qemu-devel@nongnu.org Subject: [RFC 04/22] ui/vdagent: move to new migration APIs Date: Wed, 29 Oct 2025 02:13:28 +0300 Message-ID: <20251028231347.194844-5-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251028231347.194844-1-vsementsov@yandex-team.ru> References: <20251028231347.194844-1-vsementsov@yandex-team.ru> 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=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=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: 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 @yandex-team.ru) X-ZM-MESSAGEID: 1761693435733158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- ui/vdagent.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/ui/vdagent.c b/ui/vdagent.c index ddb91e75c6..4388e90c0b 100644 --- a/ui/vdagent.c +++ b/ui/vdagent.c @@ -923,7 +923,7 @@ static void vdagent_chr_class_init(ObjectClass *oc, con= st void *data) cc->chr_accept_input =3D vdagent_chr_accept_input; } =20 -static int post_load(void *opaque, int version_id) +static bool post_load(void *opaque, int version_id, Error **errp) { VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(opaque); =20 @@ -935,7 +935,7 @@ static int post_load(void *opaque, int version_id) vdagent_clipboard_peer_register(vd); } =20 - return 0; + return true; } =20 static const VMStateDescription vmstate_chunk =3D { @@ -975,15 +975,16 @@ static const VMStateDescription vmstate_cbinfo_array = =3D { } }; =20 -static int put_cbinfo(QEMUFile *f, void *pv, size_t size, - const VMStateField *field, JSONWriter *vmdesc) +static bool save_cbinfo(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, JSONWriter *vmdesc, + Error **errp) { VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(pv); struct CBInfoArray cbinfo =3D {}; int i; =20 if (!have_clipboard(vd)) { - return 0; + return true; } =20 for (i =3D 0; i < QEMU_CLIPBOARD_SELECTION__COUNT; i++) { @@ -992,29 +993,24 @@ static int put_cbinfo(QEMUFile *f, void *pv, size_t s= ize, } } =20 - return vmstate_save_state(f, &vmstate_cbinfo_array, &cbinfo, vmdesc, - &error_fatal); + return vmstate_save_vmsd(f, &vmstate_cbinfo_array, &cbinfo, vmdesc, er= rp); } =20 -static int get_cbinfo(QEMUFile *f, void *pv, size_t size, - const VMStateField *field) +static bool load_cbinfo(QEMUFile *f, void *pv, size_t size, + const VMStateField *field, Error **errp) { VDAgentChardev *vd =3D QEMU_VDAGENT_CHARDEV(pv); struct CBInfoArray cbinfo =3D {}; - int i, ret; - Error *local_err =3D NULL; + int i; =20 if (!have_clipboard(vd)) { - return 0; + return true; } =20 vdagent_clipboard_peer_register(vd); =20 - ret =3D vmstate_load_state(f, &vmstate_cbinfo_array, &cbinfo, 0, - &local_err); - if (ret) { - error_report_err(local_err); - return ret; + if (!vmstate_load_vmsd(f, &vmstate_cbinfo_array, &cbinfo, 0, errp)) { + return false; } =20 for (i =3D 0; i < cbinfo.n; i++) { @@ -1025,20 +1021,20 @@ static int get_cbinfo(QEMUFile *f, void *pv, size_t= size, qemu_clipboard_update(info); } =20 - return 0; + return true; } =20 static const VMStateInfo vmstate_cbinfos =3D { .name =3D "vdagent/cbinfos", - .get =3D get_cbinfo, - .put =3D put_cbinfo, + .load =3D load_cbinfo, + .save =3D save_cbinfo, }; =20 static const VMStateDescription vmstate_vdagent =3D { .name =3D "vdagent", .version_id =3D 0, .minimum_version_id =3D 0, - .post_load =3D post_load, + .post_load_errp =3D post_load, .fields =3D (const VMStateField[]) { VMSTATE_BOOL(connected, VDAgentChardev), VMSTATE_UINT32(caps, VDAgentChardev), --=20 2.48.1