From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Fam Zheng" <fam@euphon.net>, "Eric Blake" <eblake@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Leonardo Bras" <leobras@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-block@nongnu.org, "Juan Quintela" <quintela@redhat.com>,
"Fabiano Rosas" <farosas@suse.de>
Subject: [PULL 29/30] migration: Move migrate_postcopy() to options.c
Date: Mon, 24 Apr 2023 15:27:29 +0200 [thread overview]
Message-ID: <20230424132730.70752-30-quintela@redhat.com> (raw)
In-Reply-To: <20230424132730.70752-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
---
migration/migration.c | 5 -----
migration/migration.h | 2 --
migration/options.c | 8 ++++++++
migration/options.h | 9 +++++++++
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index dccad95a55..f20d7bcc06 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2245,11 +2245,6 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp)
qemu_sem_post(&s->pause_sem);
}
-bool migrate_postcopy(void)
-{
- return migrate_postcopy_ram() || migrate_dirty_bitmaps();
-}
-
int migrate_use_tls(void)
{
MigrationState *s;
diff --git a/migration/migration.h b/migration/migration.h
index 3ae938b19c..dcf906868d 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -447,8 +447,6 @@ bool migration_is_blocked(Error **errp);
bool migration_in_postcopy(void);
MigrationState *migrate_get_current(void);
-bool migrate_postcopy(void);
-
int migrate_use_tls(void);
uint64_t ram_get_total_transferred_pages(void);
diff --git a/migration/options.c b/migration/options.c
index 615534c151..8bd2d949ae 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -204,6 +204,14 @@ bool migrate_zero_copy_send(void)
return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
}
+
+/* pseudo capabilities */
+
+bool migrate_postcopy(void)
+{
+ return migrate_postcopy_ram() || migrate_dirty_bitmaps();
+}
+
typedef enum WriteTrackingSupport {
WT_SUPPORT_UNKNOWN = 0,
WT_SUPPORT_ABSENT,
diff --git a/migration/options.h b/migration/options.h
index 99f6bbd7a1..093bc907a1 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -38,6 +38,15 @@ bool migrate_xbzrle(void);
bool migrate_zero_blocks(void);
bool migrate_zero_copy_send(void);
+/*
+ * pseudo capabilities
+ *
+ * These are functions that are used in a similar way to capabilities
+ * check, but they are not a capability.
+ */
+
+bool migrate_postcopy(void);
+
/* capabilities helpers */
bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
--
2.39.2
next prev parent reply other threads:[~2023-04-24 13:39 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-24 13:27 [PULL 00/30] Migration 20230424 patches Juan Quintela
2023-04-24 13:27 ` [PULL 01/30] migration: Minor control flow simplification Juan Quintela
2023-04-24 13:27 ` [PULL 02/30] migration: move migration_global_dump() to migration-hmp-cmds.c Juan Quintela
2023-04-24 13:27 ` [PULL 03/30] spice: move client_migrate_info command to ui/ Juan Quintela
2023-04-24 13:27 ` [PULL 04/30] migration: Create migrate_cap_set() Juan Quintela
2023-04-24 13:27 ` [PULL 05/30] migration: Create options.c Juan Quintela
2023-04-24 13:27 ` [PULL 06/30] migration: Move migrate_colo_enabled() to options.c Juan Quintela
2023-04-24 13:27 ` [PULL 07/30] migration: Move migrate_use_compression() " Juan Quintela
2023-04-24 13:27 ` [PULL 08/30] migration: Move migrate_use_events() " Juan Quintela
2023-04-24 13:27 ` [PULL 09/30] migration: Move migrate_use_multifd() " Juan Quintela
2023-04-24 13:27 ` [PULL 10/30] migration: Move migrate_use_zero_copy_send() " Juan Quintela
2023-04-24 13:27 ` [PULL 11/30] migration: Move migrate_use_xbzrle() " Juan Quintela
2023-04-24 13:27 ` [PULL 12/30] migration: Move migrate_use_block() " Juan Quintela
2023-04-24 13:27 ` [PULL 13/30] migration: Move migrate_use_return() " Juan Quintela
2023-04-24 13:27 ` [PULL 14/30] migration: Create migrate_rdma_pin_all() function Juan Quintela
2023-04-24 13:27 ` [PULL 15/30] migration: Move migrate_caps_check() to options.c Juan Quintela
2023-04-24 13:27 ` [PULL 16/30] migration: Move qmp_query_migrate_capabilities() " Juan Quintela
2023-04-24 13:27 ` [PULL 17/30] migration: Move qmp_migrate_set_capabilities() " Juan Quintela
2023-04-24 13:27 ` [PULL 18/30] migration: Move migrate_cap_set() " Juan Quintela
2023-04-24 13:27 ` [PULL 19/30] migration: Move parameters functions to option.c Juan Quintela
2023-04-24 13:27 ` [PULL 20/30] migration: Use migrate_max_postcopy_bandwidth() Juan Quintela
2023-04-24 13:27 ` [PULL 21/30] migration: Move migrate_use_block_incremental() to option.c Juan Quintela
2023-04-24 13:27 ` [PULL 22/30] migration: Create migrate_throttle_trigger_threshold() Juan Quintela
2023-04-24 13:27 ` [PULL 23/30] migration: Create migrate_checkpoint_delay() Juan Quintela
2023-04-24 13:27 ` [PULL 24/30] migration: Create migrate_max_cpu_throttle() Juan Quintela
2023-04-24 13:27 ` [PULL 25/30] migration: Move migrate_announce_params() to option.c Juan Quintela
2023-04-24 13:27 ` [PULL 26/30] migration: Create migrate_cpu_throttle_initial() " Juan Quintela
2023-04-24 13:27 ` [PULL 27/30] migration: Create migrate_cpu_throttle_increment() function Juan Quintela
2023-04-24 13:27 ` [PULL 28/30] migration: Create migrate_cpu_throttle_tailslow() function Juan Quintela
2023-04-24 13:27 ` Juan Quintela [this message]
2023-04-24 13:27 ` [PULL 30/30] migration: Create migrate_max_bandwidth() function Juan Quintela
2023-04-24 16:35 ` [PULL 00/30] Migration 20230424 patches 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=20230424132730.70752-30-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=jsnow@redhat.com \
--cc=kraxel@redhat.com \
--cc=leobras@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@yandex-team.ru \
--cc=zhanghailiang@xfusion.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).