From nobody Fri Nov 14 21:05:49 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=1761693367; cv=none; d=zohomail.com; s=zohoarc; b=GkCnPa5gmSk7kya+4nfJnPNd1PaorxPazxOjDHFboUu+9j6zo7qCPjv9wXU/PFTKY1AX5CazXy0nPp88OPKjKVGAGUQbzYNFM8C26Zndy6eOvA0YgksjTznxtyqEC51qwhWNEdT0nRfv1xJUXDOhfDSuYSCjikkNbMJOMZp5sac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761693367; 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=Ic5f2KC+92lrPpzC+dJc2PdflQkRqcAGO/TiRTlcmX0=; b=YMNdZ+f1kTQEAfC4YKq6P2ggdo/8VbA/FDY4uyOyFLOa2dIVO5F5dQ+2ujABE9lWnyJvdI8tyHluPCfOXdWNmhC7delz/d4F88SMTlKSv/PNIBaHqNhpu3v7hceV62IdF4z5MfVj6wzjNKF2A/PM3P0EU6YlCmhUPxO3UVPLwWc= 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 1761693367130591.4929481060549; Tue, 28 Oct 2025 16:16:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDsti-00033D-R7; Tue, 28 Oct 2025 19:14:39 -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 1vDstd-00031C-BM for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:33 -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 1vDstM-00017M-LY for qemu-devel@nongnu.org; Tue, 28 Oct 2025 19:14:31 -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 F03098175F; Wed, 29 Oct 2025 02:14:00 +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-wtiMufGJ; Wed, 29 Oct 2025 02:14:00 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1761693240; bh=Ic5f2KC+92lrPpzC+dJc2PdflQkRqcAGO/TiRTlcmX0=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=F7rwYa3YBvKa6P25Kr2JZS4imzjPEsL/q3XnXxGm3OorKtxkNXemRTVS2oari73qX pO+W8h0OCfMMsHYhuYjUmZk6xbMeU//MJ7pnrHM810Ds813TEJGgP/9io8YS/L6BXr b1QhyJAbxlNDLDumJBkmIm4xH7i13U397o+ObC9k= 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 13/22] hw/display/virtio-gpu: move to new migration APIs Date: Wed, 29 Oct 2025 02:13:37 +0300 Message-ID: <20251028231347.194844-14-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: 1761693370416158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy --- hw/display/virtio-gpu.c | 66 ++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 3a555125be..9356ef391a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1220,8 +1220,9 @@ static const VMStateDescription vmstate_virtio_gpu_sc= anouts =3D { }, }; =20 -static int virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, - const VMStateField *field, JSONWriter *vmdesc) +static bool virtio_gpu_save(QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, JSONWriter *vmdesc, + Error **errp) { VirtIOGPU *g =3D opaque; struct virtio_gpu_simple_resource *res; @@ -1248,8 +1249,7 @@ static int virtio_gpu_save(QEMUFile *f, void *opaque,= size_t size, } qemu_put_be32(f, 0); /* end of list */ =20 - return vmstate_save_state(f, &vmstate_virtio_gpu_scanouts, g, NULL, - &error_fatal); + return vmstate_save_vmsd(f, &vmstate_virtio_gpu_scanouts, g, NULL, err= p); } =20 static bool virtio_gpu_load_restore_mapping(VirtIOGPU *g, @@ -1281,11 +1281,10 @@ static bool virtio_gpu_load_restore_mapping(VirtIOG= PU *g, return true; } =20 -static int virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, - const VMStateField *field) +static bool virtio_gpu_load(QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, Error **errp) { VirtIOGPU *g =3D opaque; - Error *err =3D NULL; struct virtio_gpu_simple_resource *res; uint32_t resource_id, pformat; int i; @@ -1296,7 +1295,8 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,= size_t size, while (resource_id !=3D 0) { res =3D virtio_gpu_find_resource(g, resource_id); if (res) { - return -EINVAL; + error_setg(errp, "Failed to find resource %" PRIu32, resource_= id); + return false; } =20 res =3D g_new0(struct virtio_gpu_simple_resource, 1); @@ -1310,7 +1310,8 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque,= size_t size, pformat =3D virtio_gpu_get_pixman_format(res->format); if (!pformat) { g_free(res); - return -EINVAL; + error_setg(errp, "Unknown pixman format %" PRIu32, res->format= ); + return false; } =20 res->hostmem =3D calc_image_hostmem(pformat, res->width, res->heig= ht); @@ -1321,10 +1322,9 @@ static int virtio_gpu_load(QEMUFile *f, void *opaque= , size_t size, res->width, res->height, res->height ? res->hostmem / = res->height : 0, - &err)) { - warn_report_err(err); + errp)) { g_free(res); - return -EINVAL; + return false; } =20 res->addrs =3D g_new(uint64_t, res->iov_cnt); @@ -1341,20 +1341,20 @@ static int virtio_gpu_load(QEMUFile *f, void *opaqu= e, size_t size, if (!virtio_gpu_load_restore_mapping(g, res)) { pixman_image_unref(res->image); g_free(res); - return -EINVAL; + error_setg(errp, "Failed to load restore mapping"); + return false; } =20 resource_id =3D qemu_get_be32(f); } =20 /* load & apply scanout state */ - vmstate_load_state(f, &vmstate_virtio_gpu_scanouts, g, 1, &error_fatal= ); - - return 0; + return vmstate_load_vmsd(f, &vmstate_virtio_gpu_scanouts, g, 1, errp); } =20 -static int virtio_gpu_blob_save(QEMUFile *f, void *opaque, size_t size, - const VMStateField *field, JSONWriter *vmd= esc) +static bool virtio_gpu_blob_save(QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, JSONWriter *vm= desc, + Error **errp) { VirtIOGPU *g =3D opaque; struct virtio_gpu_simple_resource *res; @@ -1378,11 +1378,11 @@ static int virtio_gpu_blob_save(QEMUFile *f, void *= opaque, size_t size, } qemu_put_be32(f, 0); /* end of list */ =20 - return 0; + return true; } =20 -static int virtio_gpu_blob_load(QEMUFile *f, void *opaque, size_t size, - const VMStateField *field) +static bool virtio_gpu_blob_load(QEMUFile *f, void *opaque, size_t size, + const VMStateField *field, Error **errp) { VirtIOGPU *g =3D opaque; struct virtio_gpu_simple_resource *res; @@ -1422,7 +1422,7 @@ static int virtio_gpu_blob_load(QEMUFile *f, void *op= aque, size_t size, return 0; } =20 -static int virtio_gpu_post_load(void *opaque, int version_id) +static bool virtio_gpu_post_load(void *opaque, int version_id, Error **err= p) { VirtIOGPU *g =3D opaque; struct virtio_gpu_scanout *scanout; @@ -1437,7 +1437,9 @@ static int virtio_gpu_post_load(void *opaque, int ver= sion_id) =20 res =3D virtio_gpu_find_resource(g, scanout->resource_id); if (!res) { - return -EINVAL; + error_setg(errp, "Failed to find resource %" PRIu32, + scanout->resource_id); + return false; } =20 if (scanout->fb.format !=3D 0) { @@ -1450,12 +1452,14 @@ static int virtio_gpu_post_load(void *opaque, int v= ersion_id) }; =20 if (!virtio_gpu_do_set_scanout(g, i, &scanout->fb, res, &r, &e= rror)) { - return -EINVAL; + error_setg(errp, "Failed to set scanout"); + return false; } } else { /* legacy v1 migration support */ if (!res->image) { - return -EINVAL; + error_setg(errp, "No image"); + return false; } scanout->ds =3D qemu_create_displaysurface_pixman(res->image); qemu_displaysurface_set_share_handle(scanout->ds, res->share_h= andle, 0); @@ -1469,7 +1473,7 @@ static int virtio_gpu_post_load(void *opaque, int ver= sion_id) res->scanout_bitmask |=3D (1 << i); } =20 - return 0; + return true; } =20 void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) @@ -1638,8 +1642,8 @@ const VMStateDescription vmstate_virtio_gpu_blob_stat= e =3D { .name =3D "virtio-gpu/blob", .info =3D &(const VMStateInfo) { .name =3D "blob", - .get =3D virtio_gpu_blob_load, - .put =3D virtio_gpu_blob_save, + .load =3D virtio_gpu_blob_load, + .save =3D virtio_gpu_blob_save, }, .flags =3D VMS_SINGLE, } /* device */, @@ -1665,8 +1669,8 @@ static const VMStateDescription vmstate_virtio_gpu = =3D { .name =3D "virtio-gpu", .info =3D &(const VMStateInfo) { .name =3D "virtio-gpu", - .get =3D virtio_gpu_load, - .put =3D virtio_gpu_save, + .load =3D virtio_gpu_load, + .save =3D virtio_gpu_save, }, .flags =3D VMS_SINGLE, } /* device */, @@ -1676,7 +1680,7 @@ static const VMStateDescription vmstate_virtio_gpu = =3D { &vmstate_virtio_gpu_blob_state, NULL }, - .post_load =3D virtio_gpu_post_load, + .post_load_errp =3D virtio_gpu_post_load, }; =20 static const Property virtio_gpu_properties[] =3D { --=20 2.48.1