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 V3 05/13] migration: remove postcopy_after_devices
Date: Thu, 8 Feb 2024 10:53:58 -0800 [thread overview]
Message-ID: <1707418446-134863-6-git-send-email-steven.sistare@oracle.com> (raw)
In-Reply-To: <1707418446-134863-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>
---
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 ff8cc57..7a51b45 100644
--- a/include/migration/misc.h
+++ b/include/migration/misc.h
@@ -80,7 +80,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 82098ad..9a72680 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1519,11 +1519,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();
@@ -1605,7 +1600,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;
@@ -2529,7 +2523,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-08 18:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-08 18:53 [PATCH V3 00/13] allow cpr-reboot for vfio Steve Sistare
2024-02-08 18:53 ` [PATCH V3 01/13] notify: pass error to notifier with return Steve Sistare
2024-02-12 9:08 ` David Hildenbrand
2024-02-08 18:53 ` [PATCH V3 02/13] migration: remove error from notifier data Steve Sistare
2024-02-12 9:08 ` David Hildenbrand
2024-02-08 18:53 ` [PATCH V3 03/13] migration: convert to NotifierWithReturn Steve Sistare
2024-02-12 9:10 ` David Hildenbrand
2024-02-08 18:53 ` [PATCH V3 04/13] migration: MigrationEvent for notifiers Steve Sistare
2024-02-12 9:11 ` David Hildenbrand
2024-02-20 6:38 ` Peter Xu
2024-02-08 18:53 ` Steve Sistare [this message]
2024-02-20 6:42 ` [PATCH V3 05/13] migration: remove postcopy_after_devices Peter Xu
2024-02-08 18:53 ` [PATCH V3 06/13] migration: MigrationNotifyFunc Steve Sistare
2024-02-12 9:14 ` David Hildenbrand
2024-02-20 6:48 ` Peter Xu
2024-02-08 18:54 ` [PATCH V3 07/13] migration: per-mode notifiers Steve Sistare
2024-02-12 9:16 ` David Hildenbrand
2024-02-20 6:51 ` Peter Xu
2024-02-08 18:54 ` [PATCH V3 08/13] migration: refactor migrate_fd_connect failures Steve Sistare
2024-02-12 9:17 ` David Hildenbrand
2024-02-08 18:54 ` [PATCH V3 09/13] migration: notifier error checking Steve Sistare
2024-02-12 9:24 ` David Hildenbrand
2024-02-12 15:37 ` Steven Sistare
2024-02-20 7:12 ` Peter Xu
2024-02-20 22:12 ` Steven Sistare
2024-02-08 18:54 ` [PATCH V3 10/13] migration: stop vm for cpr Steve Sistare
2024-02-20 7:33 ` Peter Xu
2024-02-20 22:19 ` Steven Sistare
2024-02-21 21:20 ` Steven Sistare
2024-02-22 9:12 ` Peter Xu
2024-02-22 9:30 ` Peter Xu
2024-02-22 13:29 ` Steven Sistare
2024-02-21 21:23 ` Steven Sistare
2024-02-22 9:03 ` Peter Xu
2024-02-22 13:24 ` Steven Sistare
2024-02-08 18:54 ` [PATCH V3 11/13] vfio: register container " Steve Sistare
2024-02-08 18:54 ` [PATCH V3 12/13] vfio: allow cpr-reboot migration if suspended Steve Sistare
2024-02-21 18:32 ` Steven Sistare
2024-02-08 18:54 ` [PATCH V3 13/13] migration: update cpr-reboot description Steve Sistare
2024-02-20 7:49 ` [PATCH V3 00/13] allow cpr-reboot for vfio Peter Xu
2024-02-20 22:32 ` Steven Sistare
2024-02-21 2:13 ` Peter Xu
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=1707418446-134863-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).