From: Fabiano Rosas <farosas@suse.de>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Subject: [PULL v2 02/13] migration: move trace-point from migrate_fd_error to migrate_set_error
Date: Wed, 8 May 2024 20:35:30 -0300 [thread overview]
Message-ID: <20240508233541.2403-3-farosas@suse.de> (raw)
In-Reply-To: <20240508233541.2403-1-farosas@suse.de>
From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Cover more cases by trace-point.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
---
migration/migration.c | 4 +++-
migration/trace-events | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index b5af6b5105..2dc6a063e9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1421,6 +1421,9 @@ static void migrate_fd_cleanup_bh(void *opaque)
void migrate_set_error(MigrationState *s, const Error *error)
{
QEMU_LOCK_GUARD(&s->error_mutex);
+
+ trace_migrate_error(error_get_pretty(error));
+
if (!s->error) {
s->error = error_copy(error);
}
@@ -1444,7 +1447,6 @@ static void migrate_error_free(MigrationState *s)
static void migrate_fd_error(MigrationState *s, const Error *error)
{
- trace_migrate_fd_error(error_get_pretty(error));
assert(s->to_dst_file == NULL);
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
diff --git a/migration/trace-events b/migration/trace-events
index f0e1cb80c7..d0c44c3853 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -152,7 +152,7 @@ multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostnam
# migration.c
migrate_set_state(const char *new_state) "new state %s"
migrate_fd_cleanup(void) ""
-migrate_fd_error(const char *error_desc) "error=%s"
+migrate_error(const char *error_desc) "error=%s"
migrate_fd_cancel(void) ""
migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) "in %s at 0x%zx len 0x%zx"
migrate_pending_exact(uint64_t size, uint64_t pre, uint64_t post) "exact pending size %" PRIu64 " (pre = %" PRIu64 " post=%" PRIu64 ")"
--
2.35.3
next prev parent reply other threads:[~2024-05-08 23:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 23:35 [PULL v2 00/13] Migration patches for 2024-05-08 Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 01/13] migration/ram.c: API Conversion qemu_mutex_lock(), and qemu_mutex_unlock() to WITH_QEMU_LOCK_GUARD macro Fabiano Rosas
2024-05-08 23:35 ` Fabiano Rosas [this message]
2024-05-08 23:35 ` [PULL v2 03/13] migration: process_incoming_migration_co(): complete cleanup on failure Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 04/13] migration: process_incoming_migration_co(): fix reporting s->error Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 05/13] migration: process_incoming_migration_co(): rework error reporting Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 06/13] qapi: introduce exit-on-error parameter for migrate-incoming Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 07/13] migration: Remove 'skipped' field from MigrationStats Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 08/13] migration: Remove 'inc' option from migrate command Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 09/13] migration: Remove 'blk/-b' option from migrate commands Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 10/13] migration: Remove block migration Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 11/13] migration: Remove non-multifd compression Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 12/13] migration: Deprecate fd: for file migration Fabiano Rosas
2024-05-08 23:35 ` [PULL v2 13/13] hmp/migration: Fix "migrate" command's documentation Fabiano Rosas
2024-05-10 5:38 ` [PULL v2 00/13] Migration patches for 2024-05-08 Richard Henderson
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=20240508233541.2403-3-farosas@suse.de \
--to=farosas@suse.de \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=vsementsov@yandex-team.ru \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).