From: Steve Sistare <steven.sistare@oracle.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Alex Williamson <alex.williamson@redhat.com>,
Cedric Le Goater <clg@redhat.com>,
Gerd Hoffmann <kraxel@redhat.com>,
Marc-Andre Lureau <marcandre.lureau@redhat.com>,
David Hildenbrand <david@redhat.com>,
Steve Sistare <steven.sistare@oracle.com>
Subject: [PATCH V4 05/14] migration: remove postcopy_after_devices
Date: Thu, 22 Feb 2024 09:28:31 -0800 [thread overview]
Message-ID: <1708622920-68779-6-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1708622920-68779-1-git-send-email-steven.sistare@oracle.com>
postcopy_after_devices and migration_in_postcopy_after_devices are no
longer used, so delete them.
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
---
include/migration/misc.h | 1 -
migration/migration.c | 7 -------
migration/migration.h | 2 --
3 files changed, 10 deletions(-)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 9e4abae..e615000 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -89,7 +89,6 @@ bool migration_in_setup(MigrationState *);
bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *);
/* ...and after the device transmission */
-bool migration_in_postcopy_after_devices(MigrationState *);
/* True if incoming migration entered POSTCOPY_INCOMING_DISCARD */
bool migration_in_incoming_postcopy(void);
/* True if incoming migration entered POSTCOPY_INCOMING_ADVISE */
diff --git a/migration/migration.c b/migration/migration.c
index 4650c21..8f7f2d9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1527,11 +1527,6 @@ bool migration_postcopy_is_alive(int state)
}
}
-bool migration_in_postcopy_after_devices(MigrationState *s)
-{
- return migration_in_postcopy() && s->postcopy_after_devices;
-}
-
bool migration_in_incoming_postcopy(void)
{
PostcopyState ps = postcopy_state_get();
@@ -1613,7 +1608,6 @@ int migrate_init(MigrationState *s, Error **errp)
s->expected_downtime = 0;
s->setup_time = 0;
s->start_postcopy = false;
- s->postcopy_after_devices = false;
s->migration_thread_running = false;
error_free(s->error);
s->error = NULL;
@@ -2543,7 +2537,6 @@ static int postcopy_start(MigrationState *ms, Error **errp)
* at the transition to postcopy and after the device state; in particular
* spice needs to trigger a transition now
*/
- ms->postcopy_after_devices = true;
migration_call_notifiers(ms, MIG_EVENT_PRECOPY_DONE);
migration_downtime_end(ms);
diff --git a/migration/migration.h b/migration/migration.h
index f2c8b8f..aef8afb 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -348,8 +348,6 @@ struct MigrationState {
/* Flag set once the migration has been asked to enter postcopy */
bool start_postcopy;
- /* Flag set after postcopy has sent the device state */
- bool postcopy_after_devices;
/* Flag set once the migration thread is running (and needs joining) */
bool migration_thread_running;
--
1.8.3.1
next prev parent reply other threads:[~2024-02-22 17:29 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-22 17:28 [PATCH V4 00/14] allow cpr-reboot for vfio Steve Sistare
2024-02-22 17:28 ` [PATCH V4 01/14] notify: pass error to notifier with return Steve Sistare
2024-02-22 17:28 ` [PATCH V4 02/14] migration: remove error from notifier data Steve Sistare
2024-02-22 17:28 ` [PATCH V4 03/14] migration: convert to NotifierWithReturn Steve Sistare
2024-02-22 17:28 ` [PATCH V4 04/14] migration: MigrationEvent for notifiers Steve Sistare
2024-02-22 17:28 ` Steve Sistare [this message]
2024-02-22 17:28 ` [PATCH V4 06/14] migration: MigrationNotifyFunc Steve Sistare
2024-02-22 17:28 ` [PATCH V4 07/14] migration: per-mode notifiers Steve Sistare
2024-02-22 17:28 ` [PATCH V4 08/14] migration: refactor migrate_fd_connect failures Steve Sistare
2024-02-22 17:28 ` [PATCH V4 09/14] migration: notifier error checking Steve Sistare
2024-02-26 2:03 ` Peter Xu
2024-02-22 17:28 ` [PATCH V4 10/14] migration: stop vm for cpr Steve Sistare
2024-02-26 2:08 ` Peter Xu
2024-02-29 15:21 ` Steven Sistare
2024-03-01 1:28 ` Peter Xu
2024-03-01 10:41 ` Cédric Le Goater
2024-03-13 14:18 ` Steven Sistare
2024-03-13 21:22 ` Cédric Le Goater
2024-02-22 17:28 ` [PATCH V4 11/14] vfio: register container " Steve Sistare
2024-02-29 8:35 ` Cédric Le Goater
2024-02-29 13:40 ` Steven Sistare
2024-02-22 17:28 ` [PATCH V4 12/14] vfio: allow cpr-reboot migration if suspended Steve Sistare
2024-02-29 8:44 ` Cédric Le Goater
2024-02-22 17:28 ` [PATCH V4 13/14] migration: update cpr-reboot description Steve Sistare
2024-02-26 2:10 ` Peter Xu
2024-02-28 7:12 ` Markus Armbruster
2024-02-22 17:28 ` [PATCH V4 14/14] migration: options incompatible with cpr Steve Sistare
2024-02-26 2:10 ` Peter Xu
2024-02-28 7:21 ` Markus Armbruster
2024-02-28 13:23 ` Steven Sistare
2024-02-28 16:05 ` Markus Armbruster
2024-02-28 16:31 ` Steven Sistare
2024-02-29 5:31 ` Markus Armbruster
2024-02-29 5:40 ` Peter Xu
2024-02-29 14:59 ` Steven Sistare
2024-02-22 17:33 ` [PATCH V4 00/14] allow cpr-reboot for vfio Steven Sistare
2024-02-26 2:14 ` Peter Xu
2024-02-26 8:49 ` Cédric Le Goater
2024-02-26 9:01 ` Peter Xu
2024-02-26 20:21 ` Steven Sistare
2024-02-26 22:08 ` Steven Sistare
2024-02-27 4:07 ` Peter Xu
2024-03-08 16:52 ` 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=1708622920-68779-6-git-send-email-steven.sistare@oracle.com \
--to=steven.sistare@oracle.com \
--cc=alex.williamson@redhat.com \
--cc=clg@redhat.com \
--cc=david@redhat.com \
--cc=farosas@suse.de \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--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).