From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 24E53CA0FE7 for ; Mon, 25 Aug 2025 20:48:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uqe6o-0008Q2-7j; Mon, 25 Aug 2025 16:48:06 -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 1uqe6k-0008PL-Pj for qemu-arm@nongnu.org; Mon, 25 Aug 2025 16:48:02 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uqe6e-00056G-9F for qemu-arm@nongnu.org; Mon, 25 Aug 2025 16:48:02 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id CCA471F787; Mon, 25 Aug 2025 20:47:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1756154870; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3udukYF9uZ1elvzMO7ag3VMD5eFSEBGcXQo3E1TTuTo=; b=dh8B+Phsl73/fDz8YpbpsAcS+n518nYnyiWVRtuGdP7lBwgEAWsk5Ua6YJb0q3fdErZm1G 34j9OU5mcEDgMYET56qPl16WJCJqgsuXnA9GIs3Wh8WCq5rSIEIsCwkVF0xIx11MpHeKKn +X4rpgqtbomsnnb8kFk7BDlDw5Ehxgs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1756154870; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3udukYF9uZ1elvzMO7ag3VMD5eFSEBGcXQo3E1TTuTo=; b=SNYctE2mERWHmrIhAZKJhjT7Vz9DKvNkreUnNpyfmRxs2LnDTJcITEVnhmD/DEUY5x4PhT YKm0agXgXXKz3kAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1756154870; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3udukYF9uZ1elvzMO7ag3VMD5eFSEBGcXQo3E1TTuTo=; b=dh8B+Phsl73/fDz8YpbpsAcS+n518nYnyiWVRtuGdP7lBwgEAWsk5Ua6YJb0q3fdErZm1G 34j9OU5mcEDgMYET56qPl16WJCJqgsuXnA9GIs3Wh8WCq5rSIEIsCwkVF0xIx11MpHeKKn +X4rpgqtbomsnnb8kFk7BDlDw5Ehxgs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1756154870; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3udukYF9uZ1elvzMO7ag3VMD5eFSEBGcXQo3E1TTuTo=; b=SNYctE2mERWHmrIhAZKJhjT7Vz9DKvNkreUnNpyfmRxs2LnDTJcITEVnhmD/DEUY5x4PhT YKm0agXgXXKz3kAw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 00D85136DB; Mon, 25 Aug 2025 20:47:49 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id UdN8O/XLrGieIAAAD6G6ig (envelope-from ); Mon, 25 Aug 2025 20:47:49 +0000 From: Fabiano Rosas To: Arun Menon , qemu-devel@nongnu.org Cc: Peter Xu , Alex =?utf-8?Q?Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Halil Pasic , Eric Farman , Thomas Huth , Christian Borntraeger , Matthew Rosato , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Nicholas Piggin , Harsh Prateek Bora , Paolo Bonzini , Fam Zheng , Alex Williamson , =?utf-8?Q?C=C3=A9dric?= Le Goater , Steve Sistare , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Hailiang Zhang , Stefan Berger , Peter Maydell , qemu-arm@nongnu.org, Arun Menon Subject: Re: [PATCH v12 02/27] migration: push Error **errp into vmstate_load_state() In-Reply-To: <20250821-propagate_tpm_error-v12-2-72b803e707dc@redhat.com> References: <20250821-propagate_tpm_error-v12-0-72b803e707dc@redhat.com> <20250821-propagate_tpm_error-v12-2-72b803e707dc@redhat.com> Date: Mon, 25 Aug 2025 17:47:47 -0300 Message-ID: <871pozcemk.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; SUSPICIOUS_RECIPS(1.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[32]; TAGGED_RCPT(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RL96jwb13nk98k7j3ws9zhxhn8)]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[redhat.com,linaro.org,rsg.ci.i.u-tokyo.ac.jp,collabora.com,gmail.com,linux.ibm.com,euphon.net,oracle.com,nongnu.org,xfusion.com,linux.vnet.ibm.com]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo] Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Arun Menon writes: > This is an incremental step in converting vmstate loading > code to report error via Error objects instead of directly > printing it to console/monitor. > It is ensured that vmstate_load_state() must report an error > in errp, in case of failure. > > The errors are temporarily reported using warn_report_err(). > This is removed in the subsequent patches in this series, > when we are actually able to propagate the error to the calling > function using errp. Whereas, if we want the function to exit on > error, then error_fatal is passed. > > Reviewed-by: Marc-Andr=C3=A9 Lureau > Signed-off-by: Arun Menon > --- > hw/display/virtio-gpu.c | 2 +- > hw/pci/pci.c | 3 ++- > hw/s390x/virtio-ccw.c | 2 +- > hw/scsi/spapr_vscsi.c | 4 ++- > hw/vfio/pci.c | 5 +++- > hw/virtio/virtio-mmio.c | 3 ++- > hw/virtio/virtio-pci.c | 2 +- > hw/virtio/virtio.c | 7 +++-- > include/migration/vmstate.h | 2 +- > migration/cpr.c | 3 +-- > migration/savevm.c | 8 ++++-- > migration/vmstate-types.c | 22 +++++++++++---- > migration/vmstate.c | 65 +++++++++++++++++++++++++++++++--------= ------ > tests/unit/test-vmstate.c | 63 ++++++++++++++++++++++++++++++++++++---= ---- > ui/vdagent.c | 5 +++- > 15 files changed, 147 insertions(+), 49 deletions(-) > > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > index 0a1a625b0ea6cf26cb0d799171a57ed3d3ab2442..5dc31bc6bfb0272e29a4364ab= 10de2595a4bedf7 100644 > --- a/hw/display/virtio-gpu.c > +++ b/hw/display/virtio-gpu.c > @@ -1343,7 +1343,7 @@ static int virtio_gpu_load(QEMUFile *f, void *opaqu= e, size_t size, > } >=20=20 > /* load & apply scanout state */ > - vmstate_load_state(f, &vmstate_virtio_gpu_scanouts, g, 1); > + vmstate_load_state(f, &vmstate_virtio_gpu_scanouts, g, 1, &error_fat= al); >=20=20 > return 0; > } > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index c70b5ceebaf1f2b10768bd030526cbb518da2b8d..6be932d3bb67ff0c4808707db= 2a7b6378a90e82b 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -934,7 +934,8 @@ void pci_device_save(PCIDevice *s, QEMUFile *f) > int pci_device_load(PCIDevice *s, QEMUFile *f) > { > int ret; > - ret =3D vmstate_load_state(f, &vmstate_pci_device, s, s->version_id); > + ret =3D vmstate_load_state(f, &vmstate_pci_device, s, s->version_id, > + &error_fatal); > /* Restore the interrupt status bit. */ > pci_update_irq_status(s); > return ret; > diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c > index d2f85b39f30f7fc82e0c600144c0a958e1269b2c..6a9641a03d5d3a38a4de7ceb9= deffc0cc303bcff 100644 > --- a/hw/s390x/virtio-ccw.c > +++ b/hw/s390x/virtio-ccw.c > @@ -1136,7 +1136,7 @@ static void virtio_ccw_save_config(DeviceState *d, = QEMUFile *f) > 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); > + return vmstate_load_state(f, &vmstate_virtio_ccw_dev, dev, 1, &error= _fatal); > } >=20=20 > static void virtio_ccw_pre_plugged(DeviceState *d, Error **errp) > diff --git a/hw/scsi/spapr_vscsi.c b/hw/scsi/spapr_vscsi.c > index 20f70fb2729de78b9636a6b8c869695dab4f8902..8622419497db650523d51bcb4= 1557bbca254eaa3 100644 > --- a/hw/scsi/spapr_vscsi.c > +++ b/hw/scsi/spapr_vscsi.c > @@ -642,15 +642,17 @@ static void *vscsi_load_request(QEMUFile *f, SCSIRe= quest *sreq) > VSCSIState *s =3D VIO_SPAPR_VSCSI_DEVICE(bus->qbus.parent); > vscsi_req *req; > int rc; > + Error *local_err =3D NULL; >=20=20 > assert(sreq->tag < VSCSI_REQ_LIMIT); > req =3D &s->reqs[sreq->tag]; > assert(!req->active); >=20=20 > memset(req, 0, sizeof(*req)); > - rc =3D vmstate_load_state(f, &vmstate_spapr_vscsi_req, req, 1); > + rc =3D vmstate_load_state(f, &vmstate_spapr_vscsi_req, req, 1, &loca= l_err); > if (rc) { > fprintf(stderr, "VSCSI: failed loading request tag#%u\n", sreq->= tag); > + warn_report_err(local_err); > return NULL; > } > assert(req->active); > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 4fa692c1a32bcfa4e4939e5fcb64f2bf19905b3b..a65e34b6979eadfa0851666ae= ae7cf731a00fa40 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -2790,13 +2790,16 @@ static int vfio_pci_load_config(VFIODevice *vbase= dev, QEMUFile *f) > PCIDevice *pdev =3D &vdev->pdev; > pcibus_t old_addr[PCI_NUM_REGIONS - 1]; > int bar, ret; > + Error *local_err =3D NULL; >=20=20 > for (bar =3D 0; bar < PCI_ROM_SLOT; bar++) { > old_addr[bar] =3D pdev->io_regions[bar].addr; > } >=20=20 > - ret =3D vmstate_load_state(f, &vmstate_vfio_pci_config, vdev, 1); > + ret =3D vmstate_load_state(f, &vmstate_vfio_pci_config, vdev, 1, > + &local_err); > if (ret) { > + warn_report_err(local_err); > return ret; > } >=20=20 > diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c > index 532c67107ba1d2978a76cf49f9cdc1de1dea3e11..0a688909fc606a3c9fde93366= 7ae8c309ab527d0 100644 > --- a/hw/virtio/virtio-mmio.c > +++ b/hw/virtio/virtio-mmio.c > @@ -34,6 +34,7 @@ > #include "qemu/error-report.h" > #include "qemu/log.h" > #include "trace.h" > +#include "qapi/error.h" >=20=20 > static bool virtio_mmio_ioeventfd_enabled(DeviceState *d) > { > @@ -619,7 +620,7 @@ static int virtio_mmio_load_extra_state(DeviceState *= opaque, QEMUFile *f) > { > VirtIOMMIOProxy *proxy =3D VIRTIO_MMIO(opaque); >=20=20 > - return vmstate_load_state(f, &vmstate_virtio_mmio, proxy, 1); > + return vmstate_load_state(f, &vmstate_virtio_mmio, proxy, 1, &error_= fatal); > } >=20=20 > static bool virtio_mmio_has_extra_state(DeviceState *opaque) > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 767216d795998708f5716a23ae16c79cd90ff489..b04faa1e5c91b5cef40e54ec4= 1d92422d16bfc13 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -161,7 +161,7 @@ static int virtio_pci_load_extra_state(DeviceState *d= , QEMUFile *f) > { > VirtIOPCIProxy *proxy =3D to_virtio_pci_proxy(d); >=20=20 > - return vmstate_load_state(f, &vmstate_virtio_pci, proxy, 1); > + return vmstate_load_state(f, &vmstate_virtio_pci, proxy, 1, &error_f= atal); > } >=20=20 > static void virtio_pci_save_queue(DeviceState *d, int n, QEMUFile *f) > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 9a81ad912e013fc254899c4e55cff1f76a6112a4..419f3516c9f0a3df43831eebc= 77aa1e6dfcd0f41 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -3235,6 +3235,7 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int ve= rsion_id) > BusState *qbus =3D qdev_get_parent_bus(DEVICE(vdev)); > VirtioBusClass *k =3D VIRTIO_BUS_GET_CLASS(qbus); > VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_GET_CLASS(vdev); > + Error *local_err =3D NULL; >=20=20 > /* > * We poison the endianness to ensure it does not get used before > @@ -3327,15 +3328,17 @@ virtio_load(VirtIODevice *vdev, QEMUFile *f, int = version_id) > } >=20=20 > if (vdc->vmsd) { > - ret =3D vmstate_load_state(f, vdc->vmsd, vdev, version_id); > + ret =3D vmstate_load_state(f, vdc->vmsd, vdev, version_id, &loca= l_err); > if (ret) { > + warn_report_err(local_err); > return ret; > } > } >=20=20 > /* Subsections */ > - ret =3D vmstate_load_state(f, &vmstate_virtio, vdev, 1); > + ret =3D vmstate_load_state(f, &vmstate_virtio, vdev, 1, &local_err); > if (ret) { > + warn_report_err(local_err); > return ret; > } >=20=20 > diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h > index 1ff7bd9ac425ba67cd5ca7ad97bcf570f9e19abe..056781b1c21e737583f081594= d9f88b32adfd674 100644 > --- a/include/migration/vmstate.h > +++ b/include/migration/vmstate.h > @@ -1196,7 +1196,7 @@ extern const VMStateInfo vmstate_info_qlist; > } >=20=20 > int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, > - void *opaque, int version_id); > + void *opaque, int version_id, Error **errp); > int vmstate_save_state(QEMUFile *f, const VMStateDescription *vmsd, > void *opaque, JSONWriter *vmdesc); > int vmstate_save_state_with_err(QEMUFile *f, const VMStateDescription *v= msd, > diff --git a/migration/cpr.c b/migration/cpr.c > index 42ad0b0d500e5de57faf0c6517e216b2d1c0cacf..8abb6db76d2474157f804ece4= c35ebfc8c22d21a 100644 > --- a/migration/cpr.c > +++ b/migration/cpr.c > @@ -233,9 +233,8 @@ int cpr_state_load(MigrationChannel *channel, Error *= *errp) > return -ENOTSUP; > } >=20=20 > - ret =3D vmstate_load_state(f, &vmstate_cpr_state, &cpr_state, 1); > + ret =3D vmstate_load_state(f, &vmstate_cpr_state, &cpr_state, 1, err= p); > if (ret) { > - error_setg(errp, "vmstate_load_state error %d", ret); > qemu_fclose(f); > return ret; > } > diff --git a/migration/savevm.c b/migration/savevm.c > index fabbeb296ae987d0c06ba6dafda63720205fecfd..464e8b778404a642bf60f3682= 05f5e6fa59118ba 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -969,7 +969,8 @@ static int vmstate_load(QEMUFile *f, SaveStateEntry *= se) > if (!se->vmsd) { /* Old style */ > return se->ops->load_state(f, se->opaque, se->load_version_id); > } > - return vmstate_load_state(f, se->vmsd, se->opaque, se->load_version_= id); > + return vmstate_load_state(f, se->vmsd, se->opaque, se->load_version_= id, > + &error_fatal); > } >=20=20 > static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se, > @@ -2817,6 +2818,7 @@ static int qemu_loadvm_state_header(QEMUFile *f) > { > unsigned int v; > int ret; > + Error *local_err =3D NULL; >=20=20 > v =3D qemu_get_be32(f); > if (v !=3D QEMU_VM_FILE_MAGIC) { > @@ -2839,9 +2841,11 @@ static int qemu_loadvm_state_header(QEMUFile *f) > error_report("Configuration section missing"); > return -EINVAL; > } > - ret =3D vmstate_load_state(f, &vmstate_configuration, &savevm_st= ate, 0); > + ret =3D vmstate_load_state(f, &vmstate_configuration, &savevm_st= ate, 0, > + &local_err); >=20=20 > if (ret) { > + warn_report_err(local_err); > return ret; > } > } > diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c > index 741a588b7e18c6d37724b08a0101edc8bc74a0a5..f41670cc853c5b41ccc8def35= 4886a8e5c1451fd 100644 > --- a/migration/vmstate-types.c > +++ b/migration/vmstate-types.c > @@ -19,6 +19,7 @@ > #include "qemu/error-report.h" > #include "qemu/queue.h" > #include "trace.h" > +#include "qapi/error.h" >=20=20 > /* bool */ >=20=20 > @@ -543,13 +544,17 @@ static int get_tmp(QEMUFile *f, void *pv, size_t si= ze, > const VMStateField *field) > { > int ret; > + Error *local_err =3D NULL; > const VMStateDescription *vmsd =3D field->vmsd; > int version_id =3D field->version_id; > void *tmp =3D g_malloc(size); >=20=20 > /* Writes the parent field which is at the start of the tmp */ > *(void **)tmp =3D pv; > - ret =3D vmstate_load_state(f, vmsd, tmp, version_id); > + ret =3D vmstate_load_state(f, vmsd, tmp, version_id, &local_err); > + if (ret < 0) { > + warn_report_err(local_err); > + } > g_free(tmp); > return ret; > } > @@ -626,6 +631,7 @@ static int get_qtailq(QEMUFile *f, void *pv, size_t u= nused_size, > const VMStateField *field) > { > int ret =3D 0; > + Error *local_err =3D NULL; > const VMStateDescription *vmsd =3D field->vmsd; > /* size of a QTAILQ element */ > size_t size =3D field->size; > @@ -649,8 +655,9 @@ static int get_qtailq(QEMUFile *f, void *pv, size_t u= nused_size, >=20=20 > while (qemu_get_byte(f)) { > elm =3D g_malloc(size); > - ret =3D vmstate_load_state(f, vmsd, elm, version_id); > + ret =3D vmstate_load_state(f, vmsd, elm, version_id, &local_err); > if (ret) { > + warn_report_err(local_err); > return ret; > } > QTAILQ_RAW_INSERT_TAIL(pv, elm, entry_offset); > @@ -772,6 +779,7 @@ static int get_gtree(QEMUFile *f, void *pv, size_t un= used_size, > GTree *tree =3D *pval; > void *key, *val; > int ret =3D 0; > + Error *local_err =3D NULL; >=20=20 > /* in case of direct key, the key vmsd can be {}, ie. check fields */ > if (!direct_key && version_id > key_vmsd->version_id) { > @@ -803,18 +811,20 @@ static int get_gtree(QEMUFile *f, void *pv, size_t = unused_size, > key =3D (void *)(uintptr_t)qemu_get_be64(f); > } else { > key =3D g_malloc0(key_size); > - ret =3D vmstate_load_state(f, key_vmsd, key, version_id); > + ret =3D vmstate_load_state(f, key_vmsd, key, version_id, &lo= cal_err); > if (ret) { > error_report("%s : failed to load %s (%d)", > field->name, key_vmsd->name, ret); > + warn_report_err(local_err); > goto key_error; > } > } > val =3D g_malloc0(val_size); > - ret =3D vmstate_load_state(f, val_vmsd, val, version_id); > + ret =3D vmstate_load_state(f, val_vmsd, val, version_id, &local_= err); > if (ret) { > error_report("%s : failed to load %s (%d)", > field->name, val_vmsd->name, ret); > + warn_report_err(local_err); > goto val_error; > } > g_tree_insert(tree, key, val); > @@ -872,6 +882,7 @@ static int get_qlist(QEMUFile *f, void *pv, size_t un= used_size, > const VMStateField *field) > { > int ret =3D 0; > + Error *local_err =3D NULL; > const VMStateDescription *vmsd =3D field->vmsd; > /* size of a QLIST element */ > size_t size =3D field->size; > @@ -892,10 +903,11 @@ static int get_qlist(QEMUFile *f, void *pv, size_t = unused_size, >=20=20 > while (qemu_get_byte(f)) { > elm =3D g_malloc(size); > - ret =3D vmstate_load_state(f, vmsd, elm, version_id); > + ret =3D vmstate_load_state(f, vmsd, elm, version_id, &local_err); > if (ret) { > error_report("%s: failed to load %s (%d)", field->name, > vmsd->name, ret); > + warn_report_err(local_err); > g_free(elm); > return ret; > } > diff --git a/migration/vmstate.c b/migration/vmstate.c > index 3d9f284700368e2fd573d5d77b7f7ab88008cc91..6324e5b17addcd1b4f2fcdddb= d47c3e4befc1d50 100644 > --- a/migration/vmstate.c > +++ b/migration/vmstate.c > @@ -132,30 +132,34 @@ static void vmstate_handle_alloc(void *ptr, const V= MStateField *field, > } >=20=20 > int vmstate_load_state(QEMUFile *f, const VMStateDescription *vmsd, > - void *opaque, int version_id) > + void *opaque, int version_id, Error **errp) > { > + ERRP_GUARD(); > const VMStateField *field =3D vmsd->fields; > int ret =3D 0; > - Error *local_err =3D NULL; >=20=20 > trace_vmstate_load_state(vmsd->name, version_id); > if (version_id > vmsd->version_id) { > - error_report("%s: incoming version_id %d is too new " > - "for local version_id %d", > - vmsd->name, version_id, vmsd->version_id); > + error_setg(errp, "%s: incoming version_id %d is too new " > + "for local version_id %d", > + vmsd->name, version_id, vmsd->version_id); > trace_vmstate_load_state_end(vmsd->name, "too new", -EINVAL); > return -EINVAL; > } > if (version_id < vmsd->minimum_version_id) { > - error_report("%s: incoming version_id %d is too old " > - "for local minimum version_id %d", > - vmsd->name, version_id, vmsd->minimum_version_id); > + error_setg(errp, "%s: incoming version_id %d is too old " > + "for local minimum version_id %d", > + vmsd->name, version_id, vmsd->minimum_version_id); > trace_vmstate_load_state_end(vmsd->name, "too old", -EINVAL); > return -EINVAL; > } > if (vmsd->pre_load) { > ret =3D vmsd->pre_load(opaque); > if (ret) { > + error_setg(errp, "pre load hook failed for: '%s', " > + "version_id: %d, minimum version_id: %d, ret: %d", > + vmsd->name, vmsd->version_id, vmsd->minimum_versi= on_id, > + ret); > return ret; > } > } > @@ -193,13 +197,21 @@ int vmstate_load_state(QEMUFile *f, const VMStateDe= scription *vmsd, >=20=20 > if (inner_field->flags & VMS_STRUCT) { > ret =3D vmstate_load_state(f, inner_field->vmsd, cur= r_elem, > - inner_field->vmsd->version_= id); > + inner_field->vmsd->version_= id, > + errp); > } else if (inner_field->flags & VMS_VSTRUCT) { > ret =3D vmstate_load_state(f, inner_field->vmsd, cur= r_elem, > - inner_field->struct_version= _id); > + inner_field->struct_version= _id, > + errp); > } else { > ret =3D inner_field->info->get(f, curr_elem, size, > inner_field); > + if (ret < 0) { > + error_setg(errp, > + "Failed to load element of type %s fo= r %s: " > + "%d", inner_field->info->name, > + inner_field->name, ret); > + } > } >=20=20 > /* If we used a fake temp field.. free it now */ > @@ -209,31 +221,43 @@ int vmstate_load_state(QEMUFile *f, const VMStateDe= scription *vmsd, >=20=20 > if (ret >=3D 0) { > ret =3D qemu_file_get_error(f); > + if (ret < 0) { > + error_setg(errp, > + "Failed to load %s state: stream erro= r: %d", > + vmsd->name, ret); > + } > } > if (ret < 0) { > qemu_file_set_error(f, ret); > - error_report("Failed to load %s:%s", vmsd->name, > - field->name); > + error_prepend(errp, > + "Failed to load %s/%s version_id: %d: = ", > + vmsd->name, field->name, vmsd->version= _id); This could have been dropped, but fine. If you need to respin the series, leave it out. For now: Reviewed-by: Fabiano Rosas