From: "Cédric Le Goater" <clg@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>
Subject: [PATCH 06/14] vfio: Add Error** argument to vfio_devices_dma_logging_start()
Date: Wed, 7 Feb 2024 14:33:39 +0100 [thread overview]
Message-ID: <20240207133347.1115903-7-clg@redhat.com> (raw)
In-Reply-To: <20240207133347.1115903-1-clg@redhat.com>
This allows to update the Error argument of the VFIO log_global_start()
handler. Errors detected when device level logging is started will be
propagated up to qemu_savevm_state_setup() when the ram save_setup()
handler is executed.
The vfio_set_migration_error() call becomes redudant. Remove it.
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
hw/vfio/common.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 03f2059d903eca335b02f633b07cd35ef3dd6237..a5d53e67efaa921e89ad918390a22506c7b1ed66 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -1036,7 +1036,8 @@ static void vfio_device_feature_dma_logging_start_destroy(
g_free(feature);
}
-static int vfio_devices_dma_logging_start(VFIOContainerBase *bcontainer)
+static int vfio_devices_dma_logging_start(VFIOContainerBase *bcontainer,
+ Error **errp)
{
struct vfio_device_feature *feature;
VFIODirtyRanges ranges;
@@ -1058,8 +1059,8 @@ static int vfio_devices_dma_logging_start(VFIOContainerBase *bcontainer)
ret = ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature);
if (ret) {
ret = -errno;
- error_report("%s: Failed to start DMA logging, err %d (%s)",
- vbasedev->name, ret, strerror(errno));
+ error_setg(errp, "%s: Failed to start DMA logging, err %d (%s)",
+ vbasedev->name, ret, strerror(errno));
goto out;
}
vbasedev->dirty_tracking = true;
@@ -1083,15 +1084,13 @@ static void vfio_listener_log_global_start(MemoryListener *listener,
int ret;
if (vfio_devices_all_device_dirty_tracking(bcontainer)) {
- ret = vfio_devices_dma_logging_start(bcontainer);
+ ret = vfio_devices_dma_logging_start(bcontainer, errp);
} else {
- ret = vfio_container_set_dirty_page_tracking(bcontainer, true, NULL);
+ ret = vfio_container_set_dirty_page_tracking(bcontainer, true, errp);
}
if (ret) {
- error_report("vfio: Could not start dirty page tracking, err: %d (%s)",
- ret, strerror(-ret));
- vfio_set_migration_error(ret);
+ error_prepend(errp, "vfio: Could not start dirty page tracking - ");
}
}
@@ -1105,13 +1104,11 @@ static void vfio_listener_log_global_stop(MemoryListener *listener,
if (vfio_devices_all_device_dirty_tracking(bcontainer)) {
vfio_devices_dma_logging_stop(bcontainer);
} else {
- ret = vfio_container_set_dirty_page_tracking(bcontainer, false, NULL);
+ ret = vfio_container_set_dirty_page_tracking(bcontainer, false, errp);
}
if (ret) {
- error_report("vfio: Could not stop dirty page tracking, err: %d (%s)",
- ret, strerror(-ret));
- vfio_set_migration_error(ret);
+ error_prepend(errp, "vfio: Could not stop dirty page tracking - ");
}
}
--
2.43.0
next prev parent reply other threads:[~2024-02-07 13:35 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-07 13:33 [PATCH 00/14] migration: Improve error reporting Cédric Le Goater
2024-02-07 13:33 ` [PATCH 01/14] migration: Add Error** argument to .save_setup() handler Cédric Le Goater
2024-02-07 20:11 ` Philippe Mathieu-Daudé
2024-02-08 13:27 ` Cédric Le Goater
2024-02-08 4:26 ` Peter Xu
2024-02-12 8:36 ` Avihai Horon
2024-02-12 14:49 ` Cédric Le Goater
2024-02-12 15:57 ` Avihai Horon
2024-02-07 13:33 ` [PATCH 02/14] migration: Add Error** argument to .load_setup() handler Cédric Le Goater
2024-02-07 20:12 ` Philippe Mathieu-Daudé
2024-02-08 4:30 ` Peter Xu
2024-02-09 9:35 ` Cédric Le Goater
2024-02-07 13:33 ` [PATCH 03/14] memory: Add Error** argument to .log_global*() handlers Cédric Le Goater
2024-02-08 5:48 ` Peter Xu
2024-02-09 10:14 ` Cédric Le Goater
2024-02-12 8:43 ` Avihai Horon
2024-02-12 16:36 ` Cédric Le Goater
2024-02-08 15:59 ` Philippe Mathieu-Daudé
2024-02-07 13:33 ` [PATCH 04/14] migration: Modify ram_init_bitmaps() to report dirty tracking errors Cédric Le Goater
2024-02-07 20:15 ` Philippe Mathieu-Daudé
2024-02-12 8:51 ` Avihai Horon
2024-02-12 16:37 ` Cédric Le Goater
2024-02-07 13:33 ` [PATCH 05/14] vfio: Add Error** argument to .set_dirty_page_tracking() handler Cédric Le Goater
2024-02-07 20:16 ` Philippe Mathieu-Daudé
2024-02-07 13:33 ` Cédric Le Goater [this message]
2024-02-07 20:17 ` [PATCH 06/14] vfio: Add Error** argument to vfio_devices_dma_logging_start() Philippe Mathieu-Daudé
2024-02-07 13:33 ` [PATCH 07/14] vfio: Add Error** argument to vfio_devices_dma_logging_stop() Cédric Le Goater
2024-02-07 20:18 ` Philippe Mathieu-Daudé
2024-02-07 13:33 ` [PATCH 08/14] vfio: Use new Error** argument in vfio_save_setup() Cédric Le Goater
2024-02-07 20:21 ` Philippe Mathieu-Daudé
2024-02-12 9:17 ` Avihai Horon
2024-02-12 17:54 ` Cédric Le Goater
2024-02-13 13:57 ` Avihai Horon
2024-02-07 13:33 ` [PATCH 09/14] vfio: Add Error** argument to .vfio_save_config() handler Cédric Le Goater
2024-02-07 20:22 ` Philippe Mathieu-Daudé
2024-02-12 9:21 ` Avihai Horon
2024-02-07 13:33 ` [PATCH 10/14] vfio: Also trace event failures in vfio_save_complete_precopy() Cédric Le Goater
2024-02-07 13:33 ` [PATCH 11/14] vfio: Extend vfio_set_migration_error() with Error* argument Cédric Le Goater
2024-02-07 20:25 ` Philippe Mathieu-Daudé
2024-02-12 9:35 ` Avihai Horon
2024-02-16 13:12 ` Cédric Le Goater
2024-02-07 13:33 ` [PATCH 12/14] migration: Report error when shutdown fails Cédric Le Goater
2024-02-07 20:26 ` Philippe Mathieu-Daudé
2024-02-08 5:52 ` Peter Xu
2024-02-07 13:33 ` [PATCH 13/14] migration: Use migrate_has_error() in close_return_path_on_source() Cédric Le Goater
2024-02-08 5:52 ` Peter Xu
2024-02-08 13:07 ` Fabiano Rosas
2024-02-08 13:45 ` Cédric Le Goater
2024-02-08 13:57 ` Fabiano Rosas
2024-02-12 13:03 ` Cédric Le Goater
2024-02-14 16:00 ` Fabiano Rosas
2024-02-16 15:17 ` Cédric Le Goater
2024-02-23 4:14 ` Peter Xu
2024-02-07 13:33 ` [RFC PATCH 14/14] migration: Fix return-path thread exit Cédric Le Goater
2024-02-08 5:57 ` Peter Xu
2024-02-12 16:04 ` Cédric Le Goater
2024-02-23 4:25 ` Peter Xu
2024-02-08 13:29 ` Fabiano Rosas
2024-02-12 15:44 ` Cédric Le Goater
2024-02-14 20:35 ` Fabiano Rosas
2024-02-16 15:08 ` Cédric Le Goater
2024-02-16 17:35 ` Fabiano Rosas
2024-02-23 4:31 ` Peter Xu
2024-02-23 14:05 ` Fabiano Rosas
2024-02-26 8:44 ` Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240207133347.1115903-7-clg@redhat.com \
--to=clg@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=farosas@suse.de \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).