From nobody Fri Nov 14 21:04:52 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=1761693433; cv=none; d=zohomail.com; s=zohoarc; b=XJWvqZTK1l+yPBE1kziJXbuBaESJTHbJtSFjnmR+f00QsWKTzZcLhwuCS+q5n27Wvdc7paeo2d6tTHAof6fEm/RmXtxb1HI+nRsXVisjN+HlPWE4efs1JN1Ho9ZrwgWIK8iMMtHUO2UVha5Os6vNDZzv5/fYMJuZiIb4zwzQh+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761693433; 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=np7XWMeyfsJTuCib+x7NKEfDLVhTrKKEDFyAgwT/O9A=; b=DnxHzEBGAb3SRiHCeDFeJjy8JxLvGfgsCE20sH67OlXFJBBc+KWNEhknbb+qsuC+6jCGoVi2y9GkmOlH+eI7PZZ2TgnIg7xlOf183dpznV4+GJbodUudzogyYv+GUxQ6QEt65FGFiiTCoQjm7r3l5ok3yYbRPd64Q5GOuZ4r4rE= 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 1761693433234415.854292144547; Tue, 28 Oct 2025 16:17:13 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDstK-0002tA-3M; Tue, 28 Oct 2025 19:14:14 -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-0002s3-Uz 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-000150-1G for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:08 -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 433F181758; Wed, 29 Oct 2025 02:13:56 +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-HAGtewB3; Wed, 29 Oct 2025 02:13:55 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761693235; bh=np7XWMeyfsJTuCib+x7NKEfDLVhTrKKEDFyAgwT/O9A=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=0YjLBJnET45O3W5IHfuXo8l2drf2ALJNmUTy61ABRBkPHb6JpyD3JQ2xpDgMTE1NP 7nnn4rax+zlTPOMHo4TIymwHVVnodo6bKPYTnqbMh05yBjiLtp9uzeM5ugfGbVIYic jYZUojwEhKdWUzTtGU+ifXZZCKTRquRIXO/cfecE= 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 06/22] hw/scsi/spapr_vscsi: move to new migration APIs Date: Wed, 29 Oct 2025 02:13:30 +0300 Message-ID: <20251028231347.194844-7-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, T_SPF_TEMPERROR=0.01 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: 1761693435694158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/scsi/spapr_vscsi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c index f0a7dd2b88..55388454af 100644 --- a/hw/scsi/spapr_vscsi.c +++ b/hw/scsi/spapr_vscsi.c @@ -630,7 +630,7 @@ static void vscsi_save_request(QEMUFile *f, SCSIRequest= *sreq) vscsi_req *req =3D sreq->hba_private; assert(req->active); =20 - vmstate_save_state(f, &vmstate_spapr_vscsi_req, req, NULL, &error_fata= l); + vmstate_save_vmsd(f, &vmstate_spapr_vscsi_req, req, NULL, &error_fatal= ); =20 trace_spapr_vscsi_save_request(req->qtag, req->cur_desc_num, req->cur_desc_offset); @@ -641,7 +641,6 @@ static void *vscsi_load_request(QEMUFile *f, SCSIReques= t *sreq) SCSIBus *bus =3D sreq->bus; VSCSIState *s =3D VIO_SPAPR_VSCSI_DEVICE(bus->qbus.parent); vscsi_req *req; - int rc; Error *local_err =3D NULL; =20 assert(sreq->tag < VSCSI_REQ_LIMIT); @@ -649,8 +648,7 @@ static void *vscsi_load_request(QEMUFile *f, SCSIReques= t *sreq) assert(!req->active); =20 memset(req, 0, sizeof(*req)); - rc =3D vmstate_load_state(f, &vmstate_spapr_vscsi_req, req, 1, &local_= err); - if (rc) { + if (!vmstate_load_vmsd(f, &vmstate_spapr_vscsi_req, req, 1, &local_err= )) { fprintf(stderr, "VSCSI: failed loading request tag#%u\n", sreq->ta= g); error_report_err(local_err); return NULL; --=20 2.48.1