From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Xu" <peterx@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"John Snow" <jsnow@redhat.com>, "Fam Zheng" <fam@euphon.net>,
"Hailiang Zhang" <zhanghailiang@xfusion.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
qemu-block@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@yandex-team.ru>,
"Leonardo Bras" <leobras@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Eric Blake" <eblake@redhat.com>
Subject: [PATCH v2 15/43] migration: Move qmp_query_migrate_capabilities() to options.c
Date: Thu, 20 Apr 2023 15:39:34 +0200 [thread overview]
Message-ID: <20230420134002.29531-16-quintela@redhat.com> (raw)
In-Reply-To: <20230420134002.29531-1-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 22 ----------------------
migration/options.c | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 933c96792b..bc796879c0 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -886,28 +886,6 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
}
-MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
-{
- MigrationCapabilityStatusList *head = NULL, **tail = &head;
- MigrationCapabilityStatus *caps;
- MigrationState *s = migrate_get_current();
- int i;
-
- for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
-#ifndef CONFIG_LIVE_BLOCK_MIGRATION
- if (i == MIGRATION_CAPABILITY_BLOCK) {
- continue;
- }
-#endif
- caps = g_malloc0(sizeof(*caps));
- caps->capability = i;
- caps->state = s->capabilities[i];
- QAPI_LIST_APPEND(tail, caps);
- }
-
- return head;
-}
-
MigrationParameters *qmp_query_migrate_parameters(Error **errp)
{
MigrationParameters *params;
diff --git a/migration/options.c b/migration/options.c
index 367c930f46..ff621bdeb3 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -13,6 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
+#include "qapi/qapi-commands-migration.h"
#include "sysemu/runstate.h"
#include "migration.h"
#include "ram.h"
@@ -390,3 +391,25 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
return true;
}
+
+MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
+{
+ MigrationCapabilityStatusList *head = NULL, **tail = &head;
+ MigrationCapabilityStatus *caps;
+ MigrationState *s = migrate_get_current();
+ int i;
+
+ for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
+#ifndef CONFIG_LIVE_BLOCK_MIGRATION
+ if (i == MIGRATION_CAPABILITY_BLOCK) {
+ continue;
+ }
+#endif
+ caps = g_malloc0(sizeof(*caps));
+ caps->capability = i;
+ caps->state = s->capabilities[i];
+ QAPI_LIST_APPEND(tail, caps);
+ }
+
+ return head;
+}
--
2.39.2
next prev parent reply other threads:[~2023-04-20 13:43 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 13:39 [PATCH v2 00/43] Migration: Create options.c for capabilities/params/properties Juan Quintela
2023-04-20 13:39 ` [PATCH v2 01/43] migration: move migration_global_dump() to migration-hmp-cmds.c Juan Quintela
2023-04-20 13:39 ` [PATCH v2 02/43] spice: move client_migrate_info command to ui/ Juan Quintela
2023-04-20 13:39 ` [PATCH v2 03/43] migration: Create migration_cap_set() Juan Quintela
2023-04-20 18:44 ` Fabiano Rosas
2023-04-20 19:22 ` Juan Quintela
2023-04-20 13:39 ` [PATCH v2 04/43] migration: Create options.c Juan Quintela
2023-04-20 13:39 ` [PATCH v2 05/43] migration: Move migrate_colo_enabled() to options.c Juan Quintela
2023-04-20 13:39 ` [PATCH v2 06/43] migration: Move migrate_use_compression() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 07/43] migration: Move migrate_use_events() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 08/43] migration: Move migrate_use_multifd() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 09/43] migration: Move migrate_use_zero_copy_send() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 10/43] migration: Move migrate_use_xbzrle() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 11/43] migration: Move migrate_use_block() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 12/43] migration: Move migrate_use_return() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 13/43] migration: Create migrate_rdma_pin_all() function Juan Quintela
2023-04-20 18:46 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 14/43] migration: Move migrate_caps_check() to options.c Juan Quintela
2023-04-20 18:09 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` Juan Quintela [this message]
2023-04-20 18:10 ` [PATCH v2 15/43] migration: Move qmp_query_migrate_capabilities() " Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 16/43] migration: Move qmp_migrate_set_capabilities() " Juan Quintela
2023-04-20 18:11 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 17/43] migration: Move migrate_cap_set() " Juan Quintela
2023-04-20 18:12 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 18/43] migration: Move parameters functions to option.c Juan Quintela
2023-04-20 18:28 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 19/43] migration: Use migrate_max_postcopy_bandwidth() Juan Quintela
2023-04-20 18:30 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 20/43] migration: Move migrate_use_block_incremental() to option.c Juan Quintela
2023-04-20 18:31 ` Vladimir Sementsov-Ogievskiy
2023-04-20 13:39 ` [PATCH v2 21/43] migration: Create migrate_throttle_trigger_threshold() Juan Quintela
2023-04-20 18:47 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 22/43] migration: Create migrate_checkpoint_delay() Juan Quintela
2023-04-20 19:00 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 23/43] migration: Create migrate_max_cpu_throttle() Juan Quintela
2023-04-20 19:01 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 24/43] migration: Move migrate_announce_params() to option.c Juan Quintela
2023-04-20 19:04 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 25/43] migration: Create migrate_cpu_throttle_initial() " Juan Quintela
2023-04-20 19:08 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 26/43] migration: Create migrate_cpu_throttle_increment() function Juan Quintela
2023-04-20 19:10 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 27/43] migration: Create migrate_cpu_throttle_tailslow() function Juan Quintela
2023-04-20 19:11 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 28/43] migration: Move migrate_use_tls() to options.c Juan Quintela
2023-04-20 19:19 ` Fabiano Rosas
2023-04-20 21:07 ` Juan Quintela
2023-04-20 13:39 ` [PATCH v2 29/43] migration: Move migrate_postcopy() " Juan Quintela
2023-04-20 19:25 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 30/43] migration: Create migrate_max_bandwidth() function Juan Quintela
2023-04-20 19:30 ` Fabiano Rosas
2023-04-20 13:39 ` [PATCH v2 31/43] migration: Move qmp_query_migrate_parameters() to options.c Juan Quintela
2023-04-20 13:39 ` [PATCH v2 32/43] migration: Move qmp_migrate_set_parameters() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 33/43] migration: Create migrate_params_init() function Juan Quintela
2023-04-20 13:39 ` [PATCH v2 34/43] migration: Make all functions check have the same format Juan Quintela
2023-04-20 13:39 ` [PATCH v2 35/43] migration: Create migrate_downtime_limit() function Juan Quintela
2023-04-20 13:39 ` [PATCH v2 36/43] migration: Move migrate_set_block_incremental() to options.c Juan Quintela
2023-04-20 13:39 ` [PATCH v2 37/43] migration: Move block_cleanup_parameters() " Juan Quintela
2023-04-20 13:39 ` [PATCH v2 38/43] migration: Remove MigrationState from block_cleanup_parameters() Juan Quintela
2023-04-20 13:39 ` [PATCH v2 39/43] migration: Create migrate_tls_creds() function Juan Quintela
2023-04-20 13:39 ` [PATCH v2 40/43] migration: Create migrate_tls_authz() function Juan Quintela
2023-04-20 13:40 ` [PATCH v2 41/43] migration: Create migrate_tls_hostname() function Juan Quintela
2023-04-20 13:40 ` [PATCH v2 42/43] migration: Create migrate_block_bitmap_mapping() function Juan Quintela
2023-04-20 13:40 ` [PATCH v2 43/43] migration: Move migration_properties to options.c Juan Quintela
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=20230420134002.29531-16-quintela@redhat.com \
--to=quintela@redhat.com \
--cc=armbru@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=fam@euphon.net \
--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).