From nobody Fri Nov 14 21:05: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=1761693374; cv=none; d=zohomail.com; s=zohoarc; b=d3W9qDIvPdUvP/q+SVhdDGL6Byyu/DSPiIwYZG6eVuc6y6c+l90H/XsD4GcduyAFQTvAcfddZi5MO9IX1odPU9RK8Bp1T88JbG23REvkLFkHVKpBilo+/frnnKeUjC8jz+cg9LB6NFRQhI5srTVy6WjYM5oA6tx6Y3z9yI5u0xU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761693374; 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=1/MGi/tsP2KZAQxhpYMWKHlovow3Rr/el/C7tdrzP30=; b=YLACtFliGZO9WtKT6hbidl+rT5I2xbgiQ/Tt2cjeJXChkPnErYFlyt+W6HC+ZL/Zey3UGwuIyhXE1QRrK8j93z9aB7mPB2FHxgclirSokwXfdu33lMHu2FqN7ekAv5HL2d8HSIKcOSpYoWyMzKVQajjAtTRiqb6A1uUztUW6fJ4= 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 17616933747971001.3701549751445; Tue, 28 Oct 2025 16:16:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDstM-0002uB-UH; Tue, 28 Oct 2025 19:14:16 -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 1vDstK-0002tY-TQ for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:15 -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 1vDst9-00014g-1N for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:14 -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 ACB9F81756; 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-kSdLoIY9; 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=1/MGi/tsP2KZAQxhpYMWKHlovow3Rr/el/C7tdrzP30=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=fJNleDlJvqjIlqmTUqR4UYjOUfRCj11H+nGYeudRI9z7zHQx3E524LxWoNy/tmfxi f9OyJRHpDYYtVlZPlNsFY/QJVdgY4USpqT3T1C0NyZle/3qvFUmNKAwAdZ3bsMRqys LAnR7IKPrpOKobR0yMjyd7PfmXmL5nRPCWU7qfbQ= 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 05/22] hw/s390x/virtio-ccw.c: move to new migration APIs Date: Wed, 29 Oct 2025 02:13:29 +0300 Message-ID: <20251028231347.194844-6-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: 1761693377916154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/s390x/virtio-ccw.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 4cb1ced001..f456856d42 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -38,7 +38,7 @@ =20 bool have_virtio_ccw =3D true; =20 -static int virtio_ccw_dev_post_load(void *opaque, int version_id) +static bool virtio_ccw_dev_post_load(void *opaque, int version_id, Error *= *errp) { VirtioCcwDevice *dev =3D VIRTIO_CCW_DEVICE(opaque); CcwDevice *ccw_dev =3D CCW_DEVICE(dev); @@ -54,7 +54,7 @@ static int virtio_ccw_dev_post_load(void *opaque, int ver= sion_id) if (ck->refill_ids) { ck->refill_ids(ccw_dev); } - return 0; + return true; } =20 typedef struct VirtioCcwDeviceTmp { @@ -62,7 +62,7 @@ typedef struct VirtioCcwDeviceTmp { uint16_t config_vector; } VirtioCcwDeviceTmp; =20 -static int virtio_ccw_dev_tmp_pre_save(void *opaque) +static bool virtio_ccw_dev_tmp_pre_save(void *opaque, Error **errp) { VirtioCcwDeviceTmp *tmp =3D opaque; VirtioCcwDevice *dev =3D tmp->parent; @@ -70,23 +70,24 @@ static int virtio_ccw_dev_tmp_pre_save(void *opaque) =20 tmp->config_vector =3D vdev->config_vector; =20 - return 0; + return true; } =20 -static int virtio_ccw_dev_tmp_post_load(void *opaque, int version_id) +static bool virtio_ccw_dev_tmp_post_load(void *opaque, int version_id, + Error **errp) { VirtioCcwDeviceTmp *tmp =3D opaque; VirtioCcwDevice *dev =3D tmp->parent; VirtIODevice *vdev =3D virtio_bus_get_device(&dev->bus); =20 vdev->config_vector =3D tmp->config_vector; - return 0; + return true; } =20 const VMStateDescription vmstate_virtio_ccw_dev_tmp =3D { .name =3D "s390_virtio_ccw_dev_tmp", - .pre_save =3D virtio_ccw_dev_tmp_pre_save, - .post_load =3D virtio_ccw_dev_tmp_post_load, + .pre_save_errp =3D virtio_ccw_dev_tmp_pre_save, + .post_load_errp =3D virtio_ccw_dev_tmp_post_load, .fields =3D (const VMStateField[]) { VMSTATE_UINT16(config_vector, VirtioCcwDeviceTmp), VMSTATE_END_OF_LIST() @@ -97,7 +98,7 @@ const VMStateDescription vmstate_virtio_ccw_dev =3D { .name =3D "s390_virtio_ccw_dev", .version_id =3D 1, .minimum_version_id =3D 1, - .post_load =3D virtio_ccw_dev_post_load, + .post_load_errp =3D virtio_ccw_dev_post_load, .fields =3D (const VMStateField[]) { VMSTATE_CCW_DEVICE(parent_obj, VirtioCcwDevice), VMSTATE_PTR_TO_IND_ADDR(indicators, VirtioCcwDevice), @@ -105,7 +106,7 @@ const VMStateDescription vmstate_virtio_ccw_dev =3D { VMSTATE_PTR_TO_IND_ADDR(summary_indicator, VirtioCcwDevice), /* * Ugly hack because VirtIODevice does not migrate itself. - * This also makes legacy via vmstate_save_state possible. + * This also makes legacy via vmstate_save_vmsd possible. */ VMSTATE_WITH_TMP(VirtioCcwDevice, VirtioCcwDeviceTmp, vmstate_virtio_ccw_dev_tmp), @@ -1130,13 +1131,13 @@ static int virtio_ccw_load_queue(DeviceState *d, in= t n, QEMUFile *f) static void virtio_ccw_save_config(DeviceState *d, QEMUFile *f) { VirtioCcwDevice *dev =3D VIRTIO_CCW_DEVICE(d); - vmstate_save_state(f, &vmstate_virtio_ccw_dev, dev, NULL, &error_fatal= ); + vmstate_save_vmsd(f, &vmstate_virtio_ccw_dev, dev, NULL, &error_fatal); } =20 static int virtio_ccw_load_config(DeviceState *d, QEMUFile *f) { VirtioCcwDevice *dev =3D VIRTIO_CCW_DEVICE(d); - return vmstate_load_state(f, &vmstate_virtio_ccw_dev, dev, 1, &error_f= atal); + return vmstate_load_vmsd(f, &vmstate_virtio_ccw_dev, dev, 1, &error_fa= tal); } =20 static void virtio_ccw_pre_plugged(DeviceState *d, Error **errp) --=20 2.48.1