From: peterx@redhat.com
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: "David Hildenbrand" <david@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Jason Wang" <jasowang@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Steve Sistare" <steven.sistare@oracle.com>
Subject: [PULL 15/25] migration: remove postcopy_after_devices
Date: Wed, 28 Feb 2024 13:13:05 +0800 [thread overview]
Message-ID: <20240228051315.400759-16-peterx@redhat.com> (raw)
In-Reply-To: <20240228051315.400759-1-peterx@redhat.com>
From: Steve Sistare <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>
Link: https://lore.kernel.org/r/1708622920-68779-6-git-send-email-steven.sistare@oracle.com
Signed-off-by: Peter Xu <peterx@redhat.com>
---
include/migration/misc.h | 1 -
migration/migration.h | 2 --
migration/migration.c | 7 -------
3 files changed, 10 deletions(-)
diff --git a/include/migration/misc.h b/include/migration/misc.h
index 9e4abae97f..e6150009e0 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.h b/migration/migration.h
index f2c8b8f286..aef8afbe1f 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;
diff --git a/migration/migration.c b/migration/migration.c
index 4650c21f67..8f7f2d92f4 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);
--
2.43.0
next prev parent reply other threads:[~2024-02-28 5:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-28 5:12 [PULL 00/25] Migration next patches peterx
2024-02-28 5:12 ` [PULL 01/25] docs/devel/migration.rst: Document the file transport peterx
2024-02-28 5:12 ` [PULL 02/25] tests/qtest/migration: Rename fd_proto test peterx
2024-02-28 5:12 ` [PULL 03/25] tests/qtest/migration: Add a fd + file test peterx
2024-02-28 5:12 ` [PULL 04/25] migration/multifd: Remove p->quit from recv side peterx
2024-02-28 5:12 ` [PULL 05/25] migration/multifd: Release recv sem_sync earlier peterx
2024-02-28 5:12 ` [PULL 06/25] migration/multifd: Cleanup TLS iochannel referencing peterx
2024-02-28 5:12 ` [PULL 07/25] migration/multifd: Drop registered_yank peterx
2024-02-28 5:12 ` [PULL 08/25] migration/multifd: Make multifd_channel_connect() return void peterx
2024-02-28 5:12 ` [PULL 09/25] migration/multifd: Cleanup outgoing_args in state destroy peterx
2024-02-28 5:13 ` [PULL 10/25] migration/multifd: Drop unnecessary helper to destroy IOC peterx
2024-02-28 5:13 ` [PULL 11/25] notify: pass error to notifier with return peterx
2024-02-28 5:13 ` [PULL 12/25] migration: remove error from notifier data peterx
2024-02-28 5:13 ` [PULL 13/25] migration: convert to NotifierWithReturn peterx
2024-02-28 5:13 ` [PULL 14/25] migration: MigrationEvent for notifiers peterx
2024-02-28 5:13 ` peterx [this message]
2024-02-28 5:13 ` [PULL 16/25] migration: MigrationNotifyFunc peterx
2024-02-28 5:13 ` [PULL 17/25] migration: per-mode notifiers peterx
2024-02-28 5:13 ` [PULL 18/25] migration: refactor migrate_fd_connect failures peterx
2024-02-28 5:13 ` [PULL 19/25] migration: notifier error checking peterx
2024-02-28 5:13 ` [PULL 20/25] migration: stop vm for cpr peterx
2024-05-13 18:22 ` CPR/liveupdate: test results using prior bug fix Michael Galaxy
2024-05-13 20:10 ` Steven Sistare
2024-05-14 1:15 ` Michael Galaxy
2024-05-14 13:39 ` Michael Galaxy
2024-05-14 13:54 ` Michael Tokarev
2024-05-14 15:33 ` Michael Tokarev
2024-05-15 10:58 ` Steven Sistare
2024-05-16 17:24 ` Michael Galaxy
2024-05-16 18:07 ` Steven Sistare
2024-05-17 17:48 ` Michael Galaxy
2024-02-28 5:13 ` [PULL 21/25] migration: update cpr-reboot description peterx
2024-02-28 5:13 ` [PULL 22/25] migration: options incompatible with cpr peterx
2024-02-28 5:13 ` [PULL 23/25] migration: Fix qmp_query_migrate mbps value peterx
2024-02-28 5:13 ` [PULL 24/25] migration: Join the return path thread before releasing to_dst_file peterx
2024-02-28 5:13 ` [PULL 25/25] migration: Use migrate_has_error() in close_return_path_on_source() peterx
2024-02-29 15:24 ` [PULL 00/25] Migration next patches Peter Maydell
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=20240228051315.400759-16-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=armbru@redhat.com \
--cc=clg@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=farosas@suse.de \
--cc=jasowang@redhat.com \
--cc=kraxel@redhat.com \
--cc=lvivier@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=steven.sistare@oracle.com \
--cc=thuth@redhat.com \
/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).