Migration: Create options.c for capabilities/params/properties
Subsystems (2)
cover Migration: Create options.c for capabilities/params/properties
Hi
This series move to options.c:
- all migration capabilities code
- all migration parameters code
- all properties code
- all qmp commands that only touch the previous
And once there:
- sort of functions
- make consistent and coherent all the functions naming/typing
- create accessors for the parameters/capabilties that don't exist
- more cleanups here and there.
Todo:
- There is still capabilities code on savevm.c, but I want this in before moving that code to options.c, but still needs more thought for my part. I.e. should I put vmstate sections in options.c, or should I create new functions to access the capabilities in savevm.c.
Please review.
Juan Quintela (43):
migration: rename enabled_capabilities to capabilities
migration: Pass migrate_caps_check() the old and new caps
migration: Create migration_cap_set()
migration: create options.c
migration: Move migrate_colo_enabled() to options.c
migration: Move migrate_use_compression() to options.c
migration: Move migrate_use_events() to options.c
migration: Move migrate_use_multifd() to options.c
migration: Move migrate_use_zero_copy_send() to options.c
migration: Move migrate_use_xbzrle() to options.c
migration: Move migrate_use_block() to options.c
migration: Move migrate_use_return() to options.c
migration: Create migrate_rdma_pin_all() function
migration: Move migrate_caps_check() to options.c
migration: Move qmp_query_migrate_capabilities() to options.c
migration: Move qmp_migrate_set_capabilities() to options.c
migration: Move migrate_cap_set() to options.c
migration: Move parameters functions to option.c
migration: Use migrate_max_postcopy_bandwidth()
migration: Move migrate_use_block_incremental() to option.c
migration: Create migrate_throttle_trigger_threshold()
migration: Create migrate_checkpoint_delay()
migration: Create migrate_max_cpu_throttle()
migration: Move migrate_announce_params() to option.c
migration: Create migrate_cpu_throttle_initial() to option.c
migration: Create migrate_cpu_throttle_increment() function
migration: Create migrate_cpu_throttle_tailslow() function
migration: Move migrate_use_tls() to options.c
migration: Move migrate_postcopy() to options.c
migration: Create migrate_max_bandwidth() function
migration: Move qmp_query_migrate_parameters() to options.c
migration: Move qmp_migrate_set_parameters() to options.c
migration: Create migrate_params_init() function
migration: Make all functions check have the same format
migration: Create migrate_downtime_limit() function
migration: Move migrate_set_block_incremental() to options.c
migration: Move block_cleanup_parameters() to options.c
migration: Remove MigrationState from block_cleanup_parameters()
migration: Create migrate_tls_creds() function
migration: Create migrate_tls_authz() function
migration: Create migrate_tls_hostname() function
migration: Create migrate_block_bitmap_mapping() function
migration: Move migration_properties to options.c
migration/migration.h | 44 +- migration/options.h | 108 +++ hw/virtio/virtio-balloon.c | 1 + migration/block-dirty-bitmap.c | 15 +- migration/block.c | 5 +- migration/colo.c | 6 +- migration/migration.c | 1325 +------------------------------- migration/multifd-zlib.c | 1 + migration/multifd-zstd.c | 1 + migration/multifd.c | 24 +- migration/options.c | 1318 +++++++++++++++++++++++++++++++ migration/postcopy-ram.c | 1 + migration/ram.c | 43 +- migration/rdma.c | 6 +- migration/savevm.c | 9 +- migration/socket.c | 5 +- migration/tls.c | 23 +- migration/meson.build | 1 + 18 files changed, 1529 insertions(+), 1407 deletions(-) create mode 100644 migration/options.h create mode 100644 migration/options.c
Signature · 1 line
2.39.2
PATCH 1/43 migration: rename enabled_capabilities to capabilities
It is clear from the context what that means, and such a long name with the extra long names of the capabilities make very difficilut to stay inside the 80 columns limit.
--- migration/migration.h | 2 +- migration/migration.c | 52 +++++++++++++++++++++---------------------- migration/rdma.c | 4 ++-- migration/savevm.c | 6 ++--- 4 files changed, 31 insertions(+), 33 deletions(-)
migration/migration.h +1 -1
@@ -299,7 +299,7 @@ struct MigrationState {int64_t downtime_start;int64_t downtime;int64_t expected_downtime; -bool enabled_capabilities[MIGRATION_CAPABILITY__MAX ]; +bool capabilities[MIGRATION_CAPABILITY__MAX ];int64_t setup_time;/* * Whether guest was running when we enter the completion stage.
migration/migration.c +25 -27
201 lines not on this page · raw message
migration/rdma.c +2 -2
@@ -4178,7 +4178,7 @@ void rdma_start_outgoing_migration(void *opaque, } ret =qemu_rdma_source_init (rdma, - s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp); + s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp);if (ret) { goto err;
@@ -4200,7 +4200,7 @@ void rdma_start_outgoing_migration(void *opaque, } ret =qemu_rdma_source_init (rdma_return_path, - s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp); + s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp);if (ret) { goto return_path_err;
migration/savevm.c +3 -3
@@ -253,7 +253,7 @@ static uint32_t get_validatable_capabilities_count(void)uint32_t result =0 ;int i;for (i =0 ; i <MIGRATION_CAPABILITY__MAX ; i++) { -if (should_validate_capability (i) && s->enabled_capabilities[i]) { +if (should_validate_capability (i) && s->capabilities[i]) { result++; } }
@@ -275,7 +275,7 @@ static int configuration_pre_save(void *opaque) state->capabilities =g_renew (MigrationCapability, state->capabilities, state->caps_count);for (i = j =0 ; i <MIGRATION_CAPABILITY__MAX ; i++) { -if (should_validate_capability (i) && s->enabled_capabilities[i]) { +if (should_validate_capability (i) && s->capabilities[i]) { state->capabilities[j++] = i; } }
@@ -325,7 +325,7 @@ static bool configuration_validate_capabilities(SaveState *state)continue ; } source_state =test_bit (i, source_caps_bm); - target_state = s->enabled_capabilities[i]; + target_state = s->capabilities[i];if (source_state != target_state) { error_report("Capability %s is %s, but received capability is %s", MigrationCapability_str(i),
Signature · 1 line
2.39.2
Re: [PATCH 01/43] migration: rename enabled_capabilities to capabilities
Quoted 5 lines · Juan Quintela
It is clear from the context what that means, and such a long name with the extra long names of the capabilities make very difficilut to stay inside the 80 columns limit.
Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 2/43 migration: Pass migrate_caps_check() the old and new caps
In reply to Juan QuintelaWe used to pass the old capabilities array and the new capabilities as a list.
--- migration/migration.c | 80 +++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 49 deletions(-)
migration/migration.c +31 -49
@@ -1267,30 +1267,20 @@ WriteTrackingSupport migrate_query_write_tracking(void) }/** -* @migration_caps_check - check capability validity +* @migration_caps_check - check capability compatibility * -* @cap_list: old capability list, array of bool -* @params: new capabilities to be applied soon +* @old_caps: old capability list +* @new_caps: new capability list * @errp: set *errp if the check failed, with reason * * Returns true if check passed, otherwise false. */ -static bool migrate_caps_check (bool *cap_list, -MigrationCapabilityStatusList *params, -Error **errp) +static bool migrate_caps_check (bool *old_caps,bool *new_caps,Error **errp) { -MigrationCapabilityStatusList *cap; -bool old_postcopy_cap;MigrationIncomingState *mis =migration_incoming_get_current (); - old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM ]; - -for (cap = params; cap; cap = cap->next) { - cap_list[cap->value->capability] = cap->value->state; - } -#ifndef CONFIG_LIVE_BLOCK_MIGRATION -if (cap_list[MIGRATION_CAPABILITY_BLOCK ]) { +if (new_caps[MIGRATION_CAPABILITY_BLOCK ]) {error_setg (errp,"QEMU compiled without old-style (blk/-b, inc/-i) " "block migration" );error_append_hint (errp,"Use drive_mirror+NBD instead.\n" );
@@ -1299,7 +1289,7 @@ static bool migrate_caps_check(bool *cap_list,#endif #ifndef CONFIG_REPLICATION -if (cap_list[MIGRATION_CAPABILITY_X_COLO ]) { +if (new_caps[MIGRATION_CAPABILITY_X_COLO ]) {error_setg (errp,"QEMU compiled without replication module" " can't enable COLO" );error_append_hint (errp,"Please enable replication before COLO.\n" );
@@ -1307,12 +1297,13 @@ static bool migrate_caps_check(bool *cap_list, }#endif -if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM ]) { +if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM ]) {/* This check is reasonably expensive, so only when it's being * set the first time, also it's only the destination that needs * special support. */ -if (!old_postcopy_cap &&runstate_check (RUN_STATE_INMIGRATE ) && +if (!old_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM ] && +runstate_check (RUN_STATE_INMIGRATE ) && !postcopy_ram_supported_by_host (mis)) {/* postcopy_ram_supported_by_host will have emitted a more * detailed message
@@ -1321,13 +1312,13 @@ static bool migrate_caps_check(bool *cap_list,return false; } -if (cap_list[MIGRATION_CAPABILITY_X_IGNORE_SHARED ]) { +if (new_caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED ]) {error_setg (errp,"Postcopy is not compatible with ignore-shared" );return false; } } -if (cap_list[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]) { +if (new_caps[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]) {WriteTrackingSupport wt_support;int idx;/*
@@ -1351,7 +1342,7 @@ static bool migrate_caps_check(bool *cap_list,*/ for (idx =0 ; idx < check_caps_background_snapshot.size; idx++) {int incomp_cap = check_caps_background_snapshot.caps[idx]; -if (cap_list[incomp_cap]) { +if (new_caps[incomp_cap]) {error_setg (errp,"Background-snapshot is not compatible with %s" ,MigrationCapability_str (incomp_cap));
@@ -1361,10 +1352,10 @@ static bool migrate_caps_check(bool *cap_list, }#ifdef CONFIG_LINUX -if (cap_list[MIGRATION_CAPABILITY_ZERO_COPY_SEND ] && - (!cap_list[MIGRATION_CAPABILITY_MULTIFD ] || - cap_list[MIGRATION_CAPABILITY_COMPRESS ] || - cap_list[MIGRATION_CAPABILITY_XBZRLE ] || +if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND ] && + (!new_caps[MIGRATION_CAPABILITY_MULTIFD ] || + new_caps[MIGRATION_CAPABILITY_COMPRESS ] || + new_caps[MIGRATION_CAPABILITY_XBZRLE ] ||migrate_multifd_compression () ||migrate_use_tls ())) { error_setg(errp,
@@ -1372,15 +1363,15 @@ static bool migrate_caps_check(bool *cap_list, return false; }#else -if (cap_list[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]) { +if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]) {error_setg (errp,"Zero copy currently only available on Linux" );return false; }#endif -if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT ]) { -if (!cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM ]) { +if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT ]) { +if (!new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM ]) {error_setg (errp,"Postcopy preempt requires postcopy-ram" );return false; }
@@ -1391,14 +1382,14 @@ static bool migrate_caps_check(bool *cap_list,* different compression channels, which is not compatible with the * preempt assumptions on channel assignments. */ -if (cap_list[MIGRATION_CAPABILITY_COMPRESS ]) { +if (new_caps[MIGRATION_CAPABILITY_COMPRESS ]) {error_setg (errp,"Postcopy preempt not compatible with compress" );return false; } } -if (cap_list[MIGRATION_CAPABILITY_MULTIFD ]) { -if (cap_list[MIGRATION_CAPABILITY_COMPRESS ]) { +if (new_caps[MIGRATION_CAPABILITY_MULTIFD ]) { +if (new_caps[MIGRATION_CAPABILITY_COMPRESS ]) {error_setg (errp,"Multifd is not compatible with compress" );return false; }
@@ -1454,15 +1445,19 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, {MigrationState *s =migrate_get_current ();MigrationCapabilityStatusList *cap; -bool cap_list[MIGRATION_CAPABILITY__MAX ]; +bool new_caps[MIGRATION_CAPABILITY__MAX ];if (migration_is_running (s->state)) {error_setg (errp,QERR_MIGRATION_ACTIVE );return ; } -memcpy (cap_list, s->capabilities,sizeof (cap_list)); -if (!migrate_caps_check (cap_list, params, errp)) { +memcpy (new_caps, s->capabilities,sizeof (new_caps)); +for (cap = params; cap; cap = cap->next) { + new_caps[cap->value->capability] = cap->value->state; + } + +if (!migrate_caps_check (s->capabilities, new_caps, errp)) {return ; }
@@ -4566,27 +4561,14 @@ static void migration_instance_init(Object *obj)*/ static bool migration_object_check (MigrationState *ms,Error **errp) { -MigrationCapabilityStatusList *head =NULL ;/* Assuming all off */ -bool cap_list[MIGRATION_CAPABILITY__MAX ] = {0 }, ret; -int i; +bool old_caps[MIGRATION_CAPABILITY__MAX ] = {0 };if (!migrate_params_check (&ms->parameters, errp)) {return false; } -for (i =0 ; i <MIGRATION_CAPABILITY__MAX ; i++) { -if (ms->capabilities[i]) { -QAPI_LIST_PREPEND (head,migrate_cap_add (i, true)); - } - } - - ret =migrate_caps_check (cap_list, head, errp); - -/* It works with head == NULL */ -qapi_free_MigrationCapabilityStatusList (head); - -return ret; +return migrate_caps_check (old_caps, ms->capabilities, errp); }static const TypeInfo migration_type = {
Signature · 1 line
2.39.2
Re: [PATCH 02/43] migration: Pass migrate_caps_check() the old and new caps
Quoted 4 lines · Juan Quintela
We used to pass the old capabilities array and the new capabilities as a list.
Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 3/43 migration: Create migration_cap_set()
In reply to Juan QuintelaAnd remove the convoluted use of qmp_migrate_set_capabilities() to enable disable MIGRATION_CAPABILITY_BLOCK.
--- migration/migration.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
migration/migration.c +16 -18
@@ -1910,25 +1910,24 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static MigrationCapabilityStatus *migrate_cap_add (MigrationCapability index, -bool state) +static bool migrate_cap_set (int cap,bool value,Error **errp) { -MigrationCapabilityStatus *cap; +MigrationState *s =migrate_get_current (); +bool new_caps[MIGRATION_CAPABILITY__MAX ]; - cap =g_new0 (MigrationCapabilityStatus,1 ); - cap->capability = index; - cap->state = state; +if (migration_is_running (s->state)) { +error_setg (errp,QERR_MIGRATION_ACTIVE ); +return false; + } -return cap; -} +memcpy (new_caps, s->capabilities,sizeof (new_caps)); + new_caps[cap] = value; -void migrate_set_block_enabled (bool value,Error **errp) -{ -MigrationCapabilityStatusList *cap =NULL ; - -QAPI_LIST_PREPEND (cap,migrate_cap_add (MIGRATION_CAPABILITY_BLOCK , value)); -qmp_migrate_set_capabilities (cap, errp); -qapi_free_MigrationCapabilityStatusList (cap); +if (!migrate_caps_check (s->capabilities, new_caps, errp)) { +return false; + } + s->capabilities[cap] = value; +return true; }static void migrate_set_block_incremental (MigrationState *s,bool value)
@@ -1940,7 +1939,7 @@ static void block_cleanup_parameters(MigrationState *s) {if (s->must_remove_block_options) {/* setting to false can never fail */ -migrate_set_block_enabled (false, &error_abort); +migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort);migrate_set_block_incremental (s, false); s->must_remove_block_options = false; }
@@ -2427,8 +2426,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, "current migration capabilities");return false; } -migrate_set_block_enabled (true, &local_err); -if (local_err) { +if (!migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , true, &local_err)) {error_propagate (errp, local_err);return false; }
Signature · 1 line
2.39.2
Re: [PATCH 03/43] migration: Create migration_cap_set()
Quoted 13 lines · * Juan Quintela ([email protected]) wrote:
And remove the convoluted use of
qmp_migrate_set_capabilities()to enable disableMIGRATION_CAPABILITY_BLOCK.Signed-off-by Juan Quintela <[email protected]>--- migration/migration.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)migration/migration.c +0
-0
migration/migration.c void migrate_set_state(int *state, int old_state, int new_state) · line 1913
Quoted 6 lines
migration/migration.c +1
-2@@ -1910,25 +1910,24 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static MigrationCapabilityStatus *migrate_cap_add (MigrationCapability index, -bool state) +static bool migrate_cap_set (int cap,bool value,Error **errp)
Why int cap rather than MigrationCapability ?
Dave
Quoted 55 lines
migration/migration.c +15
-16{ -MigrationCapabilityStatus *cap; +MigrationState *s =migrate_get_current (); +bool new_caps[MIGRATION_CAPABILITY__MAX ]; - cap =g_new0 (MigrationCapabilityStatus,1 ); - cap->capability = index; - cap->state = state; +if (migration_is_running (s->state)) { +error_setg (errp,QERR_MIGRATION_ACTIVE ); +return false; + } -return cap; -} +memcpy (new_caps, s->capabilities,sizeof (new_caps)); + new_caps[cap] = value; -void migrate_set_block_enabled (bool value,Error **errp) -{ -MigrationCapabilityStatusList *cap =NULL ; - -QAPI_LIST_PREPEND (cap,migrate_cap_add (MIGRATION_CAPABILITY_BLOCK , value)); -qmp_migrate_set_capabilities (cap, errp); -qapi_free_MigrationCapabilityStatusList (cap); +if (!migrate_caps_check (s->capabilities, new_caps, errp)) { +return false; + } + s->capabilities[cap] = value; +return true; }static void migrate_set_block_incremental (MigrationState *s,bool value)@@ -1940,7 +1939,7 @@ static void block_cleanup_parameters(MigrationState *s) {if (s->must_remove_block_options) {/* setting to false can never fail */ -migrate_set_block_enabled (false, &error_abort); +migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort);migrate_set_block_incremental (s, false); s->must_remove_block_options = false; }@@ -2427,8 +2426,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, "current migration capabilities");return false; } -migrate_set_block_enabled (true, &local_err); -if (local_err) { +if (!migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , true, &local_err)) {error_propagate (errp, local_err);return false; }Signature · 1 line
2.39.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 03/43] migration: Create migration_cap_set()
Quoted 17 lines · Dr. David Alan Gilbert
Quoted 16 lines · * Juan Quintela ([email protected]) wrote:
And remove the convoluted use of
qmp_migrate_set_capabilities()to enable disableMIGRATION_CAPABILITY_BLOCK.Signed-off-by Juan Quintela <[email protected]>--- migration/migration.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)migration/migration.c +0
-0@@ -1910,25 +1910,24 @@ void migrate_set_state(int *state, int old_state, int new_state) } }
Quoted 5 lines
migration/migration.c void migrate_set_state(int *state, int old_state, int new_state) · line 1913
Quoted 3 lines
migration/migration.c +1
-2-static MigrationCapabilityStatus *migrate_cap_add (MigrationCapability index, -bool state) +static bool migrate_cap_set (int cap,bool value,Error **errp)Why int cap rather than MigrationCapability ?
It is the index in one array, so it is int. And it is much, much shorter.
In this particular case I think that we don't lost anything having it as int, but will not fight over this O:-)
Later, Juan.
PATCH 4/43 migration: create options.c
In reply to Juan QuintelaWe move there all capabilities helpers from migration.c.
--- migration/migration.h | 12 ---- migration/options.h | 34 +++++++++ hw/virtio/virtio-balloon.c | 1 + migration/block-dirty-bitmap.c | 1 + migration/block.c | 1 + migration/colo.c | 1 + migration/migration.c | 109 +--------------------------- migration/options.c | 126 +++++++++++++++++++++++++++++++++ migration/postcopy-ram.c | 1 + migration/ram.c | 1 + migration/savevm.c | 1 + migration/socket.c | 1 + migration/meson.build | 1 + 13 files changed, 170 insertions(+), 120 deletions(-) create mode 100644 migration/options.h create mode 100644 migration/options.c
migration/migration.h +0 -12
@@ -410,16 +410,7 @@ MigrationState *migrate_get_current(void);bool migrate_postcopy (void ); -bool migrate_release_ram (void ); -bool migrate_postcopy_ram (void ); -bool migrate_zero_blocks (void ); -bool migrate_dirty_bitmaps (void ); -bool migrate_ignore_shared (void ); -bool migrate_validate_uuid (void ); - -bool migrate_auto_converge (void );bool migrate_use_multifd (void ); -bool migrate_pause_before_switchover (void );int migrate_multifd_channels (void );MultiFDCompression migrate_multifd_compression (void );int migrate_multifd_zlib_level (void );
@@ -448,9 +439,6 @@ int migrate_compress_threads(void);int migrate_compress_wait_thread (void );int migrate_decompress_threads (void );bool migrate_use_events (void ); -bool migrate_postcopy_blocktime (void ); -bool migrate_background_snapshot (void ); -bool migrate_postcopy_preempt (void );/* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis,
migration/options.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* QEMU migration options +* +* Copyright IBM, Corp. 2008 +* +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version. +*/ + +#ifndef QEMU_MIGRATION_OPTIONS_H +#define QEMU_MIGRATION_OPTIONS_H + +/* capabilities */ + +bool migrate_auto_converge (void ); +bool migrate_background_snapshot (void ); +bool migrate_dirty_bitmaps (void ); +bool migrate_ignore_shared (void ); +bool migrate_late_block_activate (void ); +bool migrate_pause_before_switchover (void ); +bool migrate_postcopy_blocktime (void ); +bool migrate_postcopy_preempt (void ); +bool migrate_postcopy_ram (void ); +bool migrate_release_ram (void ); +bool migrate_validate_uuid (void ); +bool migrate_zero_blocks (void ); + +#endif
hw/virtio/virtio-balloon.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/error-report.h" #include "migration/misc.h" #include "migration/migration.h" +#include "migration/options.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h"
migration/block-dirty-bitmap.c +1 -0
@@ -79,6 +79,7 @@#include "qapi/qapi-visit-migration.h" #include "qapi/clone-visitor.h" #include "trace.h" +#include "options.h" #define CHUNK_SIZE (1 << 10)
migration/block.c +1 -0
@@ -28,6 +28,7 @@#include "migration/vmstate.h" #include "sysemu/block-backend.h" #include "trace.h" +#include "options.h" #define BLK_MIG_BLOCK_SIZE (1ULL << 20)#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLK_MIG_BLOCK_SIZE >> BDRV_SECTOR_BITS)
migration/colo.c +1 -0
@@ -36,6 +36,7 @@#include "sysemu/cpus.h" #include "sysemu/runstate.h" #include "net/filter.h" +#include "options.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
migration/migration.c +1 -108
150 lines not on this page · raw message
migration/options.c new file +126 -0
126 lines not on this page · raw message
migration/postcopy-ram.c +1 -0
@@ -36,6 +36,7 @@#include "yank_functions.h" #include "tls.h" #include "qemu/userfaultfd.h" +#include "options.h" /* Arbitrary limit on size of each discard command, * keeps them around ~200 bytes
migration/ram.c +1 -0
@@ -57,6 +57,7 @@#include "qemu/iov.h" #include "multifd.h" #include "sysemu/runstate.h" +#include "options.h" #include "hw/boards.h" /* for machine_dump_guest_core() */
migration/savevm.c +1 -0
@@ -67,6 +67,7 @@#include "qemu/yank.h" #include "yank_functions.h" #include "sysemu/qtest.h" +#include "options.h" const unsigned int postcopy_ram_discard_version;
migration/socket.c +1 -0
@@ -27,6 +27,7 @@#include "io/net-listener.h" #include "trace.h" #include "postcopy-ram.h" +#include "options.h" struct SocketOutgoingArgs {SocketAddress *saddr;
migration/meson.build +1 -0
@@ -22,6 +22,7 @@ softmmu_ss.add(files( 'migration.c', 'multifd.c', 'multifd-zlib.c', + 'options.c', 'postcopy-ram.c', 'savevm.c', 'socket.c',
Signature · 1 line
2.39.2
Re: [PATCH 04/43] migration: create options.c
Quoted 61 lines · * Juan Quintela ([email protected]) wrote:
We move there all capabilities helpers from
migration.c.Signed-off-by Juan Quintela <[email protected]>--- migration/migration.h | 12 ---- migration/options.h | 34 +++++++++ hw/virtio/virtio-balloon.c | 1 + migration/block-dirty-bitmap.c | 1 + migration/block.c | 1 + migration/colo.c | 1 + migration/migration.c | 109 +--------------------------- migration/options.c | 126 +++++++++++++++++++++++++++++++++ migration/postcopy-ram.c | 1 + migration/ram.c | 1 + migration/savevm.c | 1 + migration/socket.c | 1 + migration/meson.build | 1 + 13 files changed, 170 insertions(+), 120 deletions(-) create mode 100644 migration/options.h create mode 100644 migration/options.cmigration/migration.h +0
-12@@ -410,16 +410,7 @@ MigrationState *migrate_get_current(void);bool migrate_postcopy (void ); -bool migrate_release_ram (void ); -bool migrate_postcopy_ram (void ); -bool migrate_zero_blocks (void ); -bool migrate_dirty_bitmaps (void ); -bool migrate_ignore_shared (void ); -bool migrate_validate_uuid (void ); - -bool migrate_auto_converge (void );bool migrate_use_multifd (void ); -bool migrate_pause_before_switchover (void );int migrate_multifd_channels (void );MultiFDCompression migrate_multifd_compression (void );int migrate_multifd_zlib_level (void );@@ -448,9 +439,6 @@ int migrate_compress_threads(void);int migrate_compress_wait_thread (void );int migrate_decompress_threads (void );bool migrate_use_events (void ); -bool migrate_postcopy_blocktime (void ); -bool migrate_background_snapshot (void ); -bool migrate_postcopy_preempt (void );/* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis,migration/options.h new file +3
-0@@ -0,0 +1,34 @@ +/* +* QEMU migration options +*
migration/options.h line 13
Quoted 10 lines
migration/options.h new file +10
-0+* Copyright IBM, Corp. 2008 +* +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version.
I don't think any of these functions were written by Anthony, and I think they're all after 2012 aren't they? If so we can update to a more modern header.
Other than that,
Dave
Quoted 424 lines
migration/options.h new file +21
-0+*/ + +#ifndef QEMU_MIGRATION_OPTIONS_H +#define QEMU_MIGRATION_OPTIONS_H + +/* capabilities */ + +bool migrate_auto_converge (void ); +bool migrate_background_snapshot (void ); +bool migrate_dirty_bitmaps (void ); +bool migrate_ignore_shared (void ); +bool migrate_late_block_activate (void ); +bool migrate_pause_before_switchover (void ); +bool migrate_postcopy_blocktime (void ); +bool migrate_postcopy_preempt (void ); +bool migrate_postcopy_ram (void ); +bool migrate_release_ram (void ); +bool migrate_validate_uuid (void ); +bool migrate_zero_blocks (void ); + +#endif hw/virtio/virtio-balloon.c +1
-0@@ -32,6 +32,7 @@#include "qemu/error-report.h" #include "migration/misc.h" #include "migration/migration.h" +#include "migration/options.h" #include "hw/virtio/virtio-bus.h" #include "hw/virtio/virtio-access.h" migration/block-dirty-bitmap.c +1
-0@@ -79,6 +79,7 @@#include "qapi/qapi-visit-migration.h" #include "qapi/clone-visitor.h" #include "trace.h" +#include "options.h" #define CHUNK_SIZE (1 << 10)migration/block.c +1
-0@@ -28,6 +28,7 @@#include "migration/vmstate.h" #include "sysemu/block-backend.h" #include "trace.h" +#include "options.h" #define BLK_MIG_BLOCK_SIZE (1ULL << 20)#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLK_MIG_BLOCK_SIZE >> BDRV_SECTOR_BITS)migration/colo.c +1
-0@@ -36,6 +36,7 @@#include "sysemu/cpus.h" #include "sysemu/runstate.h" #include "net/filter.h" +#include "options.h" static bool vmstate_loading;static Notifier packets_compare_notifier;migration/migration.c +1
-108@@ -63,6 +63,7 @@#include "sysemu/cpus.h" #include "yank_functions.h" #include "sysemu/qtest.h" +#include "options.h" #define MAX_THROTTLE (128 << 20)/* Migration transfer speed throttling */ @@ -357,15 +358,6 @@ static void migrate_generate_event(int new_state) } } -static bool migrate_late_block_activate (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE ]; -} -/* * Send a message on the return channel back to the source * of the migration. @@ -2523,56 +2515,11 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp)qemu_sem_post (&s->pause_sem); } -bool migrate_release_ram (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM ]; -} - -bool migrate_postcopy_ram (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM ]; -} -bool migrate_postcopy (void ) {return migrate_postcopy_ram () ||migrate_dirty_bitmaps (); } -bool migrate_auto_converge (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE ]; -} - -bool migrate_zero_blocks (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS ]; -} - -bool migrate_postcopy_blocktime (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME ]; -} -bool migrate_use_compression (void ) {MigrationState *s;@@ -2618,33 +2565,6 @@ int migrate_decompress_threads(void)return s->parameters.decompress_threads; } -bool migrate_dirty_bitmaps (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS ]; -} - -bool migrate_ignore_shared (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED ]; -} - -bool migrate_validate_uuid (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID ]; -} -bool migrate_use_events (void ) {MigrationState *s;@@ -2663,15 +2583,6 @@ bool migrate_use_multifd(void)return s->capabilities[MIGRATION_CAPABILITY_MULTIFD ]; } -bool migrate_pause_before_switchover (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER ]; -} -int migrate_multifd_channels (void ) {MigrationState *s;@@ -2783,24 +2694,6 @@ bool migrate_use_block_incremental(void)return s->parameters.block_incremental; } -bool migrate_background_snapshot (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]; -} - -bool migrate_postcopy_preempt (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT ]; -} -/* migration thread support */ /* * Something bad happened to the RP stream, mark an error migration/options.c new file +126
-0@@ -0,0 +1,126 @@ +/* +* QEMU migration capabilities +* +* Copyright IBM, Corp. 2008 +* +* Authors: +* Anthony Liguori <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version. +*/ + +#include "qemu/osdep.h" +#include "migration.h" +#include "options.h" + +bool migrate_auto_converge (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE ]; +} + +bool migrate_background_snapshot (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]; +} + +bool migrate_dirty_bitmaps (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS ]; +} + +bool migrate_ignore_shared (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED ]; +} + +bool migrate_late_block_activate (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE ]; +} + +bool migrate_pause_before_switchover (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER ]; +} + +bool migrate_postcopy_blocktime (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME ]; +} + +bool migrate_postcopy_preempt (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT ]; +} + +bool migrate_postcopy_ram (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM ]; +} + +bool migrate_release_ram (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM ]; +} + +bool migrate_validate_uuid (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID ]; +} + +bool migrate_zero_blocks (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS ]; +}migration/postcopy-ram.c +1
-0@@ -36,6 +36,7 @@#include "yank_functions.h" #include "tls.h" #include "qemu/userfaultfd.h" +#include "options.h" /* Arbitrary limit on size of each discard command, * keeps them around ~200 bytes migration/ram.c +1
-0@@ -57,6 +57,7 @@#include "qemu/iov.h" #include "multifd.h" #include "sysemu/runstate.h" +#include "options.h" #include "hw/boards.h" /* for machine_dump_guest_core() */ migration/savevm.c +1
-0@@ -67,6 +67,7 @@#include "qemu/yank.h" #include "yank_functions.h" #include "sysemu/qtest.h" +#include "options.h" const unsigned int postcopy_ram_discard_version;migration/socket.c +1
-0@@ -27,6 +27,7 @@#include "io/net-listener.h" #include "trace.h" #include "postcopy-ram.h" +#include "options.h" struct SocketOutgoingArgs {SocketAddress *saddr;migration/meson.build +1
-0@@ -22,6 +22,7 @@ softmmu_ss.add(files( 'migration.c', 'multifd.c', 'multifd-zlib.c', + 'options.c', 'postcopy-ram.c', 'savevm.c', 'socket.c',Signature · 1 line
2.39.2
Signature · 1 line
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Re: [PATCH 04/43] migration: create options.c
Quoted 15 lines · Dr. David Alan Gilbert
Quoted 14 lines · * Juan Quintela ([email protected]) wrote:
We move there all capabilities helpers from
migration.c.Signed-off-by Juan Quintela <[email protected]>migration/options.h new file +7
-0@@ -0,0 +1,34 @@ +/* +* QEMU migration options +* +* Copyright IBM, Corp. 2008 +* +* Authors: +* Anthony Liguori <[email protected]>
Quoted 8 lines
migration/options.h line 13
Quoted 6 lines
migration/options.h new file +6
-0+* +* This work is licensed under the terms of the GNU GPL, version 2. See +* the COPYING file in the top-level directory. +* +* Contributions after 2012-01-13 are licensed under the terms of the +* GNU GPL, version 2 or (at your option) any later version. I don't think any of these functions were written by Anthony, and I
I investigated, and the creator of enabled_capabilities is:
commit bbf6da32b5bd32018069e4eaeda59a02855903f2
Author: Orit Wasserman <[email protected]> Date: Mon Aug 6 21:42:47 2012 +0300
Add migration capabilities
Quoted 1 line
think they're all after 2012 aren't they?
We are ... by 8 months O:-)
Quoted 1 line
If so we can update to a more modern header.
/*
* QEMU migration capabilities
*
* Copyright (c) 2012-2023 Red Hat Inc
*
* Authors:
* Orit Wasserman <[email protected]>
* Juan Quintela <[email protected]>
*
* This work is licensed under the terms of the GNU GPL, version 2 or later.
* See the COPYING file in the top-level directory.
*/
I put Orit and myself. Peter Xu has also done quite a bit of work here. Rest of people have just added capabilities for its stuff.
But if anyone feel that they need/want to be added, just ask.
Quoted 1 line
Other than that,
Thanks, Juan.
Quoted 2 lines
Reviewed-by Dr. David Alan Gilbert <[email protected]>
PATCH 5/43 migration: Move migrate_colo_enabled() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_colo() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 16 +++++----------- migration/options.c | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-)
migration/migration.h +0 -1
@@ -424,7 +424,6 @@ bool migrate_use_zero_copy_send(void);int migrate_use_tls (void );int migrate_use_xbzrle (void );uint64_t migrate_xbzrle_cache_size (void ); -bool migrate_colo_enabled (void );bool migrate_use_block (void );bool migrate_use_block_incremental (void );
migration/options.h +1 -0
@@ -20,6 +20,7 @@bool migrate_auto_converge (void );bool migrate_background_snapshot (void ); +bool migrate_colo (void );bool migrate_dirty_bitmaps (void );bool migrate_ignore_shared (void );bool migrate_late_block_activate (void );
migration/migration.c +5 -11
@@ -2409,7 +2409,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, }if (blk || blk_inc) { -if (migrate_colo_enabled ()) { +if (migrate_colo ()) {error_setg (errp,"No disk migration is required in COLO mode" );return false; }
@@ -3290,7 +3290,7 @@ static void migration_completion(MigrationState *s) ret =global_state_store ();if (!ret) { -bool inactivate = !migrate_colo_enabled (); +bool inactivate = !migrate_colo (); ret =vm_stop_force_state (RUN_STATE_FINISH_MIGRATE );trace_migration_completion_vm_stop (ret);if (ret >=0 ) {
@@ -3349,7 +3349,7 @@ static void migration_completion(MigrationState *s) goto fail_invalidate; } -if (migrate_colo_enabled () && s->state ==MIGRATION_STATUS_ACTIVE ) { +if (migrate_colo () && s->state ==MIGRATION_STATUS_ACTIVE ) {/* COLO does not support postcopy */ migrate_set_state (&s->state,MIGRATION_STATUS_ACTIVE ,MIGRATION_STATUS_COLO );
@@ -3427,12 +3427,6 @@ fail: MIGRATION_STATUS_FAILED); } -bool migrate_colo_enabled (void ) -{ -MigrationState *s =migrate_get_current (); -return s->capabilities[MIGRATION_CAPABILITY_X_COLO ]; -} - typedef enum MigThrError { /* No error detected */ MIG_THR_ERR_NONE = 0,
@@ -3763,7 +3757,7 @@ static void migration_iteration_finish(MigrationState *s)runstate_set (RUN_STATE_POSTMIGRATE );break ;case MIGRATION_STATUS_COLO : -if (!migrate_colo_enabled ()) { +if (!migrate_colo ()) {error_report ("%s: critical error: calling COLO code without " "COLO enabled" , __func__); }
@@ -3959,7 +3953,7 @@ static void *migration_thread(void *opaque)qemu_savevm_send_postcopy_advise (s->to_dst_file); } -if (migrate_colo_enabled ()) { +if (migrate_colo ()) {/* Notify migration destination that we enable COLO */ qemu_savevm_send_colo_enable (s->to_dst_file); }
migration/options.c +6 -0
@@ -35,6 +35,12 @@ bool migrate_background_snapshot(void)return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]; } +bool migrate_colo (void ) +{ +MigrationState *s =migrate_get_current (); +return s->capabilities[MIGRATION_CAPABILITY_X_COLO ]; +} +bool migrate_dirty_bitmaps (void ) {MigrationState *s;
Signature · 1 line
2.39.2
Re: [PATCH 05/43] migration: Move migrate_colo_enabled() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_colo()to be consistent with all other capabilities.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 6/43 migration: Move migrate_use_compression() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_compress() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ migration/ram.c | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-)
migration/migration.h +0 -1
@@ -432,7 +432,6 @@ bool migrate_use_return_path(void);uint64_t ram_get_total_transferred_pages (void ); -bool migrate_use_compression (void );int migrate_compress_level (void );int migrate_compress_threads (void );int migrate_compress_wait_thread (void );
migration/options.h +1 -0
@@ -21,6 +21,7 @@bool migrate_auto_converge (void );bool migrate_background_snapshot (void );bool migrate_colo (void ); +bool migrate_compress (void );bool migrate_dirty_bitmaps (void );bool migrate_ignore_shared (void );bool migrate_late_block_activate (void );
migration/migration.c +1 -10
@@ -1131,7 +1131,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->xbzrle_cache->overflow = xbzrle_counters.overflow; } -if (migrate_use_compression ()) { +if (migrate_compress ()) { info->compression =g_malloc0 (sizeof (*info->compression)); info->compression->pages = compression_counters.pages; info->compression->busy = compression_counters.busy;
@@ -2520,15 +2520,6 @@ bool migrate_postcopy(void)return migrate_postcopy_ram () ||migrate_dirty_bitmaps (); } -bool migrate_use_compression (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_COMPRESS ]; -} -int migrate_compress_level (void ) {MigrationState *s;
migration/options.c +9 -0
@@ -41,6 +41,15 @@ bool migrate_colo(void)return s->capabilities[MIGRATION_CAPABILITY_X_COLO ]; } +bool migrate_compress (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_COMPRESS ]; +} +bool migrate_dirty_bitmaps (void ) {MigrationState *s;
migration/ram.c +8 -8
@@ -591,7 +591,7 @@ static void compress_threads_save_cleanup(void) {int i, thread_count; -if (!migrate_use_compression () || !comp_param) { +if (!migrate_compress () || !comp_param) {return ; }
@@ -630,7 +630,7 @@ static int compress_threads_save_setup(void) {int i, thread_count; -if (!migrate_use_compression ()) { +if (!migrate_compress ()) {return 0 ; } thread_count =migrate_compress_threads ();
@@ -1161,7 +1161,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time) rs->xbzrle_bytes_prev = xbzrle_counters.bytes; } -if (migrate_use_compression ()) { +if (migrate_compress ()) { compression_counters.busy_rate = (double )(compression_counters.busy - rs->compress_thread_busy_prev) / page_count; rs->compress_thread_busy_prev = compression_counters.busy;
@@ -2276,7 +2276,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)static bool save_page_use_compression (RAMState *rs) { -if (!migrate_use_compression ()) { +if (!migrate_compress ()) {return false; }
@@ -3739,7 +3739,7 @@ static int wait_for_decompress_done(void) {int idx, thread_count; -if (!migrate_use_compression ()) { +if (!migrate_compress ()) {return 0 ; }
@@ -3758,7 +3758,7 @@ static void compress_threads_load_cleanup(void) {int i, thread_count; -if (!migrate_use_compression ()) { +if (!migrate_compress ()) {return ; } thread_count =migrate_decompress_threads ();
@@ -3799,7 +3799,7 @@ static int compress_threads_load_setup(QEMUFile *f) {int i, thread_count; -if (!migrate_use_compression ()) { +if (!migrate_compress ()) {return 0 ; }
@@ -4265,7 +4265,7 @@ static int ram_load_precopy(QEMUFile *f)int flags =0 , ret =0 , invalid_flags =0 , len =0 , i =0 ;/* ADVISE is earlier, it shows the source has the postcopy capability on */ bool postcopy_advised =migration_incoming_postcopy_advised (); -if (!migrate_use_compression ()) { +if (!migrate_compress ()) { invalid_flags |=RAM_SAVE_FLAG_COMPRESS_PAGE ; }
Signature · 1 line
2.39.2
Re: [PATCH 06/43] migration: Move migrate_use_compression() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_compress()to be consistent with all other capabilities.Signed-off-by Juan Quintela <[email protected]>
Quoted 5 lines
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++
[..]
Quoted 4 lines
migration/options.c +0
-0@@ -41,6 +41,15 @@ bool migrate_colo(void)return s->capabilities[MIGRATION_CAPABILITY_X_COLO ];
migration/options.c bool migrate_colo(void) · line 51
Quoted 10 lines
migration/options.c +8
-0} +bool migrate_compress (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_COMPRESS ]; +}
Probably, we could generate these functions automatically, or at least have a helper, so that all such functions are one-line wrappers on that helper.
Signature · 2 lines
Best regards, Vladimir
Re: [PATCH 06/43] migration: Move migrate_use_compression() to options.c
Quoted 24 lines · Vladimir Sementsov-Ogievskiy
Quoted 3 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_compress()to be consistent with all other capabilities.Signed-off-by Juan Quintela <[email protected]>Reviewed-by Vladimir Sementsov-Ogievskiy <[email protected]>Quoted 5 lines
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++[..]
Quoted 9 lines
migration/options.c +3
-0@@ -41,6 +41,15 @@ bool migrate_colo(void)return s->capabilities[MIGRATION_CAPABILITY_X_COLO ]; } +bool migrate_compress(void) +{ +MigrationState *s; +
Quoted 8 lines
migration/options.c bool migrate_colo(void) · line 51
Quoted 4 lines
migration/options.c +4
-0+ s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_COMPRESS ]; +}Probably, we could generate these functions automatically, or at least have a helper, so that all such functions are one-line wrappers on that helper.
Markus, or any other qapi guru, I would be happy if this could be managed automagically O:-)
Later, Juan.
PATCH 7/43 migration: Move migrate_use_events() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_events() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ migration/ram.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-)
migration/migration.h +0 -1
@@ -436,7 +436,6 @@ int migrate_compress_level(void);int migrate_compress_threads (void );int migrate_compress_wait_thread (void );int migrate_decompress_threads (void ); -bool migrate_use_events (void );/* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut(MigrationIncomingState *mis,
migration/options.h +1 -0
@@ -23,6 +23,7 @@ bool migrate_background_snapshot(void);bool migrate_colo (void );bool migrate_compress (void );bool migrate_dirty_bitmaps (void ); +bool migrate_events (void );bool migrate_ignore_shared (void );bool migrate_late_block_activate (void );bool migrate_pause_before_switchover (void );
migration/migration.c +1 -10
@@ -353,7 +353,7 @@ void migration_incoming_state_destroy(void)static void migrate_generate_event (int new_state) { -if (migrate_use_events ()) { +if (migrate_events ()) {qapi_event_send_migration (new_state); } }
@@ -2556,15 +2556,6 @@ int migrate_decompress_threads(void)return s->parameters.decompress_threads; } -bool migrate_use_events (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_EVENTS ]; -} -bool migrate_use_multifd (void ) {MigrationState *s;
migration/options.c +9 -0
@@ -59,6 +59,15 @@ bool migrate_dirty_bitmaps(void)return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS ]; } +bool migrate_events (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_EVENTS ]; +} +bool migrate_ignore_shared (void ) {MigrationState *s;
migration/ram.c +1 -1
@@ -1252,7 +1252,7 @@ static void migration_bitmap_sync(RAMState *rs) rs->num_dirty_pages_period =0 ; rs->bytes_xfer_prev =stat64_get (&ram_counters.transferred); } -if (migrate_use_events ()) { +if (migrate_events ()) {qapi_event_send_migration_pass (ram_counters.dirty_sync_count); } }
Signature · 1 line
2.39.2
Re: [PATCH 07/43] migration: Move migrate_use_events() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_events()to be consistent with all other capabilities.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 8/43 migration: Move migrate_use_multifd() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_multifd() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 19 +++++-------------- migration/multifd.c | 16 ++++++++-------- migration/options.c | 9 +++++++++ migration/ram.c | 2 +- migration/socket.c | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-)
migration/migration.h +0 -1
@@ -410,7 +410,6 @@ MigrationState *migrate_get_current(void);bool migrate_postcopy (void ); -bool migrate_use_multifd (void );int migrate_multifd_channels (void );MultiFDCompression migrate_multifd_compression (void );int migrate_multifd_zlib_level (void );
migration/options.h +1 -0
@@ -26,6 +26,7 @@ bool migrate_dirty_bitmaps(void);bool migrate_events (void );bool migrate_ignore_shared (void );bool migrate_late_block_activate (void ); +bool migrate_multifd (void );bool migrate_pause_before_switchover (void );bool migrate_postcopy_blocktime (void );bool migrate_postcopy_preempt (void );
migration/migration.c +5 -14
@@ -186,7 +186,7 @@ static void migrate_fd_cancel(MigrationState *s);static bool migration_needs_multiple_sockets (void ) { -return migrate_use_multifd () ||migrate_postcopy_preempt (); +return migrate_multifd () ||migrate_postcopy_preempt (); }static bool uri_supports_multi_channels (const char *uri)
@@ -732,7 +732,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error **errp)static bool migration_should_start_incoming (bool main_channel) {/* Multifd doesn't start unless all channels are established */ -if (migrate_use_multifd ()) { +if (migrate_multifd ()) {return migration_has_all_channels (); }
@@ -759,7 +759,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)uint32_t channel_magic =0 ;int ret =0 ; -if (migrate_use_multifd () && !migrate_postcopy_ram () && +if (migrate_multifd () && !migrate_postcopy_ram () &&qio_channel_has_feature (ioc,QIO_CHANNEL_FEATURE_READ_MSG_PEEK )) {/* * With multiple channels, it is possible that we receive channels
@@ -798,7 +798,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp) }else {/* Multiple connections */ assert (migration_needs_multiple_sockets ()); -if (migrate_use_multifd ()) { +if (migrate_multifd ()) {multifd_recv_new_channel (ioc, &local_err); }else {assert (migrate_postcopy_preempt ());
@@ -834,7 +834,7 @@ bool migration_has_all_channels(void)return false; } -if (migrate_use_multifd ()) { +if (migrate_multifd ()) {return multifd_recv_all_channels_created (); }
@@ -2556,15 +2556,6 @@ int migrate_decompress_threads(void)return s->parameters.decompress_threads; } -bool migrate_use_multifd (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_MULTIFD ]; -} -int migrate_multifd_channels (void ) {MigrationState *s;
migration/multifd.c +8 -8
@@ -516,7 +516,7 @@ void multifd_save_cleanup(void) {int i; -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return ; }multifd_send_terminate_threads (NULL );
@@ -587,7 +587,7 @@ int multifd_send_sync_main(QEMUFile *f)int i;bool flush_zero_copy; -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return 0 ; }if (multifd_send_state->pages->num) {
@@ -910,7 +910,7 @@ int multifd_save_setup(Error **errp)uint32_t page_count =MULTIFD_PACKET_SIZE /qemu_target_page_size ();uint8_t i; -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return 0 ; }
@@ -1015,7 +1015,7 @@ static void multifd_recv_terminate_threads(Error *err)void multifd_load_shutdown (void ) { -if (migrate_use_multifd ()) { +if (migrate_multifd ()) {multifd_recv_terminate_threads (NULL ); } }
@@ -1024,7 +1024,7 @@ void multifd_load_cleanup(void) {int i; -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return ; }multifd_recv_terminate_threads (NULL );
@@ -1071,7 +1071,7 @@ void multifd_recv_sync_main(void) {int i; -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return ; }for (i =0 ; i <migrate_multifd_channels (); i++) {
@@ -1169,7 +1169,7 @@ int multifd_load_setup(Error **errp)* Return successfully if multiFD recv state is already initialised * or multiFD is not enabled. */ -if (multifd_recv_state || !migrate_use_multifd ()) { +if (multifd_recv_state || !migrate_multifd ()) {return 0 ; }
@@ -1215,7 +1215,7 @@ bool multifd_recv_all_channels_created(void) {int thread_count =migrate_multifd_channels (); -if (!migrate_use_multifd ()) { +if (!migrate_multifd ()) {return true; }
migration/options.c +9 -0
@@ -86,6 +86,15 @@ bool migrate_late_block_activate(void)return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE ]; } +bool migrate_multifd (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_MULTIFD ]; +} +bool migrate_pause_before_switchover (void ) {MigrationState *s;
migration/ram.c +1 -1
@@ -2368,7 +2368,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)* if host page size == guest page size the dest guest during run may * still see partially copied pages which is data corruption. */ -if (migrate_use_multifd () && !migration_in_postcopy ()) { +if (migrate_multifd () && !migration_in_postcopy ()) {return ram_save_multifd_page (pss->pss_channel, block, offset); }
migration/socket.c +1 -1
@@ -183,7 +183,7 @@ socket_start_incoming_migration_internal(SocketAddress *saddr,qio_net_listener_set_name (listener,"migration-socket-listener" ); -if (migrate_use_multifd ()) { +if (migrate_multifd ()) { num =migrate_multifd_channels (); }else if (migrate_postcopy_preempt ()) { num =RAM_CHANNEL_MAX ;
Signature · 1 line
2.39.2
Re: [PATCH 08/43] migration: Move migrate_use_multifd() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_multifd()to be consistent with all other capabilities.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 9/43 migration: Move migrate_use_zero_copy_send() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_zero_copy_send() to be consistent with all other capabilities.
We can remove the CONFIG_LINUX guard. We already check that we can't setup this capability in migrate_caps_check().
--- migration/migration.h | 5 ----- migration/options.h | 1 + migration/migration.c | 13 +------------ migration/multifd.c | 8 ++++---- migration/options.c | 9 +++++++++ migration/socket.c | 2 +- 6 files changed, 16 insertions(+), 22 deletions(-)
migration/migration.h +0 -5
@@ -415,11 +415,6 @@ MultiFDCompression migrate_multifd_compression(void);int migrate_multifd_zlib_level (void );int migrate_multifd_zstd_level (void ); -#ifdef CONFIG_LINUX -bool migrate_use_zero_copy_send (void ); -#else -#define migrate_use_zero_copy_send () (false) -#endif int migrate_use_tls (void );int migrate_use_xbzrle (void );uint64_t migrate_xbzrle_cache_size (void );
migration/options.h +1 -0
@@ -34,5 +34,6 @@ bool migrate_postcopy_ram(void);bool migrate_release_ram (void );bool migrate_validate_uuid (void );bool migrate_zero_blocks (void ); +bool migrate_zero_copy_send (void );#endif
migration/migration.c +1 -12
@@ -1607,7 +1607,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp) }#ifdef CONFIG_LINUX -if (migrate_use_zero_copy_send () && +if (migrate_zero_copy_send () && ((params->has_multifd_compression && params->multifd_compression) || (params->tls_creds && *params->tls_creds))) { error_setg(errp,
@@ -2593,17 +2593,6 @@ int migrate_multifd_zstd_level(void)return s->parameters.multifd_zstd_level; } -#ifdef CONFIG_LINUX -bool migrate_use_zero_copy_send (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]; -} -#endif -int migrate_use_tls (void ) {MigrationState *s;
migration/multifd.c +4 -4
@@ -25,7 +25,7 @@#include "trace.h" #include "multifd.h" #include "threadinfo.h" - +#include "options.h" #include "qemu/yank.h" #include "io/channel-socket.h" #include "yank_functions.h"
@@ -608,7 +608,7 @@ int multifd_send_sync_main(QEMUFile *f)* all the dirty bitmaps. */ - flush_zero_copy =migrate_use_zero_copy_send (); + flush_zero_copy =migrate_zero_copy_send ();for (i =0 ; i <migrate_multifd_channels (); i++) {MultiFDSendParams *p = &multifd_send_state->params[i];
@@ -653,7 +653,7 @@ static void *multifd_send_thread(void *opaque)MigrationThread *thread =NULL ;Error *local_err =NULL ;int ret =0 ; -bool use_zero_copy_send =migrate_use_zero_copy_send (); +bool use_zero_copy_send =migrate_zero_copy_send (); thread =MigrationThreadAdd (p->name,qemu_get_thread_id ());
@@ -944,7 +944,7 @@ int multifd_save_setup(Error **errp) p->page_size =qemu_target_page_size (); p->page_count = page_count; -if (migrate_use_zero_copy_send ()) { +if (migrate_zero_copy_send ()) { p->write_flags =QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ; }else { p->write_flags =0 ;
migration/options.c +9 -0
@@ -157,3 +157,12 @@ bool migrate_zero_blocks(void)return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS ]; } + +bool migrate_zero_copy_send (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]; +}
migration/socket.c +1 -1
@@ -98,7 +98,7 @@ static void socket_outgoing_migration(QIOTask *task,trace_migration_socket_outgoing_connected (data->hostname); -if (migrate_use_zero_copy_send () && +if (migrate_zero_copy_send () && !qio_channel_has_feature (sioc,QIO_CHANNEL_FEATURE_WRITE_ZERO_COPY )) {error_setg (&err,"Zero copy send feature not detected in host kernel" ); }
Signature · 1 line
2.39.2
Re: [PATCH 09/43] migration: Move migrate_use_zero_copy_send() to options.c
Quoted 7 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_zero_copy_send()to be consistent with all other capabilities.We can remove the
CONFIG_LINUXguard. We already check that we can't setup this capability inmigrate_caps_check().Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 10/43 migration: Move migrate_use_xbzrle() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_xbzrle() to be consistent with all other capabilities.
We change the type to return bool also for consistency.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ migration/ram.c | 10 +++++----- 5 files changed, 16 insertions(+), 16 deletions(-)
migration/migration.h +0 -1
@@ -416,7 +416,6 @@ int migrate_multifd_zlib_level(void);int migrate_multifd_zstd_level (void );int migrate_use_tls (void ); -int migrate_use_xbzrle (void );uint64_t migrate_xbzrle_cache_size (void );bool migrate_use_block (void );
migration/options.h +1 -0
@@ -33,6 +33,7 @@ bool migrate_postcopy_preempt(void);bool migrate_postcopy_ram (void );bool migrate_release_ram (void );bool migrate_validate_uuid (void ); +bool migrate_xbzrle (void );bool migrate_zero_blocks (void );bool migrate_zero_copy_send (void );
migration/migration.c +1 -10
@@ -1120,7 +1120,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->downtime_bytes = ram_counters.downtime_bytes; info->ram->postcopy_bytes =stat64_get (&ram_counters.postcopy_bytes); -if (migrate_use_xbzrle ()) { +if (migrate_xbzrle ()) { info->xbzrle_cache =g_malloc0 (sizeof (*info->xbzrle_cache)); info->xbzrle_cache->cache_size =migrate_xbzrle_cache_size (); info->xbzrle_cache->bytes = xbzrle_counters.bytes;
@@ -2602,15 +2602,6 @@ int migrate_use_tls(void)return s->parameters.tls_creds && *s->parameters.tls_creds; } -int migrate_use_xbzrle (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_XBZRLE ]; -} -uint64_t migrate_xbzrle_cache_size (void ) {MigrationState *s;
migration/options.c +9 -0
@@ -149,6 +149,15 @@ bool migrate_validate_uuid(void)return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID ]; } +bool migrate_xbzrle (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_XBZRLE ]; +} +bool migrate_zero_blocks (void ) {MigrationState *s;
migration/ram.c +5 -5
@@ -156,14 +156,14 @@ static struct {static void XBZRLE_cache_lock (void ) { -if (migrate_use_xbzrle ()) { +if (migrate_xbzrle ()) {qemu_mutex_lock (&XBZRLE .lock); } }static void XBZRLE_cache_unlock (void ) { -if (migrate_use_xbzrle ()) { +if (migrate_xbzrle ()) {qemu_mutex_unlock (&XBZRLE .lock); } }
@@ -1143,7 +1143,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)return ; } -if (migrate_use_xbzrle ()) { +if (migrate_xbzrle ()) {double encoded_size, unencoded_size; xbzrle_counters.cache_miss_rate = (double)(xbzrle_counters.cache_miss -
@@ -1632,7 +1632,7 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)/* Flag that we've looped */ pss->complete_round = true;/* After the first round, enable XBZRLE. */ -if (migrate_use_xbzrle ()) { +if (migrate_xbzrle ()) { rs->xbzrle_enabled = true; } }
@@ -2985,7 +2985,7 @@ static int xbzrle_init(void) {Error *local_err =NULL ; -if (!migrate_use_xbzrle ()) { +if (!migrate_xbzrle ()) {return 0 ; }
Signature · 1 line
2.39.2
Re: [PATCH 10/43] migration: Move migrate_use_xbzrle() to options.c
Quoted 5 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_xbzrle()to be consistent with all other capabilities.
We change the type to return bool also for consistency.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 11/43 migration: Move migrate_use_block() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_block() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/block.c | 2 +- migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ migration/savevm.c | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-)
migration/migration.h +0 -1
@@ -418,7 +418,6 @@ int migrate_multifd_zstd_level(void);int migrate_use_tls (void );uint64_t migrate_xbzrle_cache_size (void ); -bool migrate_use_block (void );bool migrate_use_block_incremental (void );int migrate_max_cpu_throttle (void );bool migrate_use_return_path (void );
migration/options.h +1 -0
@@ -20,6 +20,7 @@bool migrate_auto_converge (void );bool migrate_background_snapshot (void ); +bool migrate_block (void );bool migrate_colo (void );bool migrate_compress (void );bool migrate_dirty_bitmaps (void );
migration/block.c +1 -1
@@ -1002,7 +1002,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)static bool block_is_active (void *opaque) { -return migrate_use_block (); +return migrate_block (); }static SaveVMHandlers savevm_block_handlers = {
migration/migration.c +1 -10
@@ -2413,7 +2413,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,error_setg (errp,"No disk migration is required in COLO mode" );return false; } -if (migrate_use_block () ||migrate_use_block_incremental ()) { +if (migrate_block () ||migrate_use_block_incremental ()) {error_setg (errp,"Command options are incompatible with " "current migration capabilities" );return false;
@@ -2620,15 +2620,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)return s->parameters.max_postcopy_bandwidth; } -bool migrate_use_block (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_BLOCK ]; -} -bool migrate_use_return_path (void ) {MigrationState *s;
migration/options.c +9 -0
@@ -35,6 +35,15 @@ bool migrate_background_snapshot(void)return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]; } +bool migrate_block (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_BLOCK ]; +} +bool migrate_colo (void ) {MigrationState *s =migrate_get_current ();
migration/savevm.c +1 -1
@@ -1612,7 +1612,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)return -EINVAL ; } -if (migrate_use_block ()) { +if (migrate_block ()) {error_setg (errp,"Block migration and snapshots are incompatible" );return -EINVAL ; }
Signature · 1 line
2.39.2
Re: [PATCH 11/43] migration: Move migrate_use_block() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_block()to be consistent with all other capabilities.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 12/43 migration: Move migrate_use_return() to options.c
In reply to Juan QuintelaOnce that we are there, we rename the function to migrate_return_path() to be consistent with all other capabilities.
--- migration/migration.h | 1 - migration/options.h | 1 + migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ 4 files changed, 11 insertions(+), 11 deletions(-)
migration/migration.h +0 -1
@@ -420,7 +420,6 @@ uint64_t migrate_xbzrle_cache_size(void);bool migrate_use_block_incremental (void );int migrate_max_cpu_throttle (void ); -bool migrate_use_return_path (void );uint64_t ram_get_total_transferred_pages (void );
migration/options.h +1 -0
@@ -33,6 +33,7 @@ bool migrate_postcopy_blocktime(void);bool migrate_postcopy_preempt (void );bool migrate_postcopy_ram (void );bool migrate_release_ram (void ); +bool migrate_return_path (void );bool migrate_validate_uuid (void );bool migrate_xbzrle (void );bool migrate_zero_blocks (void );
migration/migration.c +1 -10
@@ -2620,15 +2620,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)return s->parameters.max_postcopy_bandwidth; } -bool migrate_use_return_path (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH ]; -} -bool migrate_use_block_incremental (void ) {MigrationState *s;
@@ -4167,7 +4158,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)* precopy, only if user specified "return-path" capability would * QEMU uses the return path. */ -if (migrate_postcopy_ram () ||migrate_use_return_path ()) { +if (migrate_postcopy_ram () ||migrate_return_path ()) {if (open_return_path_on_source (s, !resume)) {error_report ("Unable to open return-path for postcopy" );migrate_set_state (&s->state, s->state,MIGRATION_STATUS_FAILED );
migration/options.c +9 -0
@@ -149,6 +149,15 @@ bool migrate_release_ram(void)return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM ]; } +bool migrate_return_path (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH ]; +} +bool migrate_validate_uuid (void ) {MigrationState *s;
Signature · 1 line
2.39.2
Re: [PATCH 12/43] migration: Move migrate_use_return() to options.c
Quoted 4 lines · Juan Quintela
Once that we are there, we rename the function to
migrate_return_path()to be consistent with all other capabilities.Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 13/43 migration: Create migrate_rdma_pin_all() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 7 +++++++ migration/rdma.c | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-)
migration/options.h +1 -0
@@ -32,6 +32,7 @@ bool migrate_pause_before_switchover(void);bool migrate_postcopy_blocktime (void );bool migrate_postcopy_preempt (void );bool migrate_postcopy_ram (void ); +bool migrate_rdma_pin_all (void );bool migrate_release_ram (void );bool migrate_return_path (void );bool migrate_validate_uuid (void );
migration/options.c +7 -0
@@ -140,6 +140,13 @@ bool migrate_postcopy_ram(void)return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM ]; } +bool migrate_rdma_pin_all (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ]; +} +bool migrate_release_ram (void ) {MigrationState *s;
migration/rdma.c +3 -3
@@ -35,6 +35,7 @@#include <rdma/rdma_cma.h> #include "trace.h" #include "qom/object.h" +#include "options.h" #include <poll.h> /*
@@ -4177,8 +4178,7 @@ void rdma_start_outgoing_migration(void *opaque, goto err; } - ret =qemu_rdma_source_init (rdma, - s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp); + ret =qemu_rdma_source_init (rdma,migrate_rdma_pin_all (), errp);if (ret) { goto err;
@@ -4200,7 +4200,7 @@ void rdma_start_outgoing_migration(void *opaque, } ret =qemu_rdma_source_init (rdma_return_path, - s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL ], errp); +migrate_rdma_pin_all (), errp);if (ret) { goto return_path_err;
Signature · 1 line
2.39.2
Re: [PATCH 13/43] migration: Create migrate_rdma_pin_all() function
Quoted 1 line · Juan Quintela
Signed-off-by Juan Quintela<[email protected]>
Signature · 2 lines
Best regards, Vladimir
PATCH 14/43 migration: Move migrate_caps_check() to options.c
In reply to Juan Quintela--- migration/options.h | 4 + migration/migration.c | 190 ----------------------------------------- migration/options.c | 192 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 196 insertions(+), 190 deletions(-)
migration/options.h +4 -0
@@ -40,4 +40,8 @@ bool migrate_xbzrle(void);bool migrate_zero_blocks (void );bool migrate_zero_copy_send (void ); +/* capabilities helpers */ + +bool migrate_caps_check (bool *old_caps,bool *new_caps,Error **errp); +#endif
migration/migration.c +0 -190
202 lines not on this page · raw message
migration/options.c +192 -0
202 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH 15/43 migration: Move qmp_query_migrate_capabilities() to options.c
In reply to Juan Quintela--- migration/migration.c | 22 ---------------------- migration/options.c | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 22 deletions(-)
migration/migration.c +0 -22
@@ -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;
migration/options.c +23 -0
@@ -15,6 +15,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"
@@ -392,3 +393,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; +}
Signature · 1 line
2.39.2
PATCH 16/43 migration: Move qmp_migrate_set_capabilities() to options.c
In reply to Juan Quintela--- migration/migration.c | 26 -------------------------- migration/options.c | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-)
migration/migration.c +0 -26
@@ -1220,32 +1220,6 @@ MigrationInfo *qmp_query_migrate(Error **errp)return info; } -void qmp_migrate_set_capabilities (MigrationCapabilityStatusList *params, -Error **errp) -{ -MigrationState *s =migrate_get_current (); -MigrationCapabilityStatusList *cap; -bool new_caps[MIGRATION_CAPABILITY__MAX ]; - -if (migration_is_running (s->state)) { -error_setg (errp,QERR_MIGRATION_ACTIVE ); -return ; - } - -memcpy (new_caps, s->capabilities,sizeof (new_caps)); -for (cap = params; cap; cap = cap->next) { - new_caps[cap->value->capability] = cap->value->state; - } - -if (!migrate_caps_check (s->capabilities, new_caps, errp)) { -return ; - } - -for (cap = params; cap; cap = cap->next) { - s->capabilities[cap->value->capability] = cap->value->state; - } -} -/* * Check whether the parameters are valid. Error will be put into errp * (if provided). Return true if valid, otherwise false.
migration/options.c +26 -0
@@ -415,3 +415,29 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)return head; } + +void qmp_migrate_set_capabilities (MigrationCapabilityStatusList *params, +Error **errp) +{ +MigrationState *s =migrate_get_current (); +MigrationCapabilityStatusList *cap; +bool new_caps[MIGRATION_CAPABILITY__MAX ]; + +if (migration_is_running (s->state)) { +error_setg (errp,QERR_MIGRATION_ACTIVE ); +return ; + } + +memcpy (new_caps, s->capabilities,sizeof (new_caps)); +for (cap = params; cap; cap = cap->next) { + new_caps[cap->value->capability] = cap->value->state; + } + +if (!migrate_caps_check (s->capabilities, new_caps, errp)) { +return ; + } + +for (cap = params; cap; cap = cap->next) { + s->capabilities[cap->value->capability] = cap->value->state; + } +}
Signature · 1 line
2.39.2
PATCH 17/43 migration: Move migrate_cap_set() to options.c
In reply to Juan Quintela--- migration/options.h | 1 + migration/migration.c | 20 -------------------- migration/options.c | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 20 deletions(-)
migration/options.h +1 -0
@@ -43,5 +43,6 @@ bool migrate_zero_copy_send(void);/* capabilities helpers */ bool migrate_caps_check (bool *old_caps,bool *new_caps,Error **errp); +bool migrate_cap_set (int cap,bool value,Error **errp);#endif
migration/migration.c +0 -20
@@ -1664,26 +1664,6 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static bool migrate_cap_set (int cap,bool value,Error **errp) -{ -MigrationState *s =migrate_get_current (); -bool new_caps[MIGRATION_CAPABILITY__MAX ]; - -if (migration_is_running (s->state)) { -error_setg (errp,QERR_MIGRATION_ACTIVE ); -return false; - } - -memcpy (new_caps, s->capabilities,sizeof (new_caps)); - new_caps[cap] = value; - -if (!migrate_caps_check (s->capabilities, new_caps, errp)) { -return false; - } - s->capabilities[cap] = value; -return true; -} -static void migrate_set_block_incremental (MigrationState *s,bool value) { s->parameters.block_incremental = value;
migration/options.c +21 -0
@@ -16,6 +16,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-commands-migration.h" +#include "qapi/qmp/qerror.h" #include "sysemu/runstate.h" #include "migration.h" #include "ram.h"
@@ -394,6 +395,26 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)return true; } +bool migrate_cap_set (int cap,bool value,Error **errp) +{ +MigrationState *s =migrate_get_current (); +bool new_caps[MIGRATION_CAPABILITY__MAX ]; + +if (migration_is_running (s->state)) { +error_setg (errp,QERR_MIGRATION_ACTIVE ); +return false; + } + +memcpy (new_caps, s->capabilities,sizeof (new_caps)); + new_caps[cap] = value; + +if (!migrate_caps_check (s->capabilities, new_caps, errp)) { +return false; + } + s->capabilities[cap] = value; +return true; +} +MigrationCapabilityStatusList *qmp_query_migrate_capabilities (Error **errp) {MigrationCapabilityStatusList *head =NULL , **tail = &head;
Signature · 1 line
2.39.2
PATCH 18/43 migration: Move parameters functions to option.c
In reply to Juan Quintela--- migration/migration.h | 11 ----- migration/options.h | 13 ++++++ migration/migration.c | 91 --------------------------------------- migration/multifd-zlib.c | 1 + migration/multifd-zstd.c | 1 + migration/options.c | 93 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 108 insertions(+), 102 deletions(-)
migration/migration.h +0 -11
@@ -410,24 +410,13 @@ MigrationState *migrate_get_current(void);bool migrate_postcopy (void ); -int migrate_multifd_channels (void ); -MultiFDCompression migrate_multifd_compression (void ); -int migrate_multifd_zlib_level (void ); -int migrate_multifd_zstd_level (void ); -int migrate_use_tls (void ); -uint64_t migrate_xbzrle_cache_size (void );bool migrate_use_block_incremental (void );int migrate_max_cpu_throttle (void );uint64_t ram_get_total_transferred_pages (void ); -int migrate_compress_level (void ); -int migrate_compress_threads (void ); -int migrate_compress_wait_thread (void ); -int migrate_decompress_threads (void ); -/* Sending on the return path - generic and then for each message type */ void migrate_send_rp_shut (MigrationIncomingState *mis,uint32_t value);
migration/options.h +13 -0
@@ -45,4 +45,17 @@ bool migrate_zero_copy_send(void);bool migrate_caps_check (bool *old_caps,bool *new_caps,Error **errp);bool migrate_cap_set (int cap,bool value,Error **errp); +/* parameters */ + +int migrate_compress_level (void ); +int migrate_compress_threads (void ); +int migrate_compress_wait_thread (void ); +int migrate_decompress_threads (void ); +int64_t migrate_max_postcopy_bandwidth (void ); +int migrate_multifd_channels (void ); +MultiFDCompression migrate_multifd_compression (void ); +int migrate_multifd_zlib_level (void ); +int migrate_multifd_zstd_level (void ); +uint64_t migrate_xbzrle_cache_size (void ); +#endif
migration/migration.c +0 -91
103 lines not on this page · raw message
migration/multifd-zlib.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/error.h" #include "migration.h" #include "trace.h" +#include "options.h" #include "multifd.h" struct zlib_data {
migration/multifd-zstd.c +1 -0
@@ -18,6 +18,7 @@#include "qapi/error.h" #include "migration.h" #include "trace.h" +#include "options.h" #include "multifd.h" struct zstd_data {
migration/options.c +93 -0
96 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH 19/43 migration: Use migrate_max_postcopy_bandwidth()
In reply to Juan Quintela--- migration/migration.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/migration.c +1 -1
@@ -3791,7 +3791,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)if (resume) {/* This is a resumed migration */ - rate_limit = s->parameters.max_postcopy_bandwidth / + rate_limit =migrate_max_postcopy_bandwidth () /XFER_LIMIT_RATIO ; }else {/* This is a fresh new migration */
Signature · 1 line
2.39.2
PATCH 20/43 migration: Move migrate_use_block_incremental() to option.c
In reply to Juan QuintelaTo be consistent with every other parameter, rename to migrate_block_incremental().
--- migration/migration.h | 1 - migration/options.h | 1 + migration/block.c | 2 +- migration/migration.c | 11 +---------- migration/options.c | 9 +++++++++ 5 files changed, 12 insertions(+), 12 deletions(-)
migration/migration.h +0 -1
@@ -412,7 +412,6 @@ bool migrate_postcopy(void);int migrate_use_tls (void ); -bool migrate_use_block_incremental (void );int migrate_max_cpu_throttle (void );uint64_t ram_get_total_transferred_pages (void );
migration/options.h +1 -0
@@ -47,6 +47,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);/* parameters */ +bool migrate_block_incremental (void );int migrate_compress_level (void );int migrate_compress_threads (void );int migrate_compress_wait_thread (void );
migration/block.c +1 -1
@@ -418,7 +418,7 @@ static int init_blk_migration(QEMUFile *f) bmds->bulk_completed =0 ; bmds->total_sectors = sectors; bmds->completed_sectors =0 ; - bmds->shared_base =migrate_use_block_incremental (); + bmds->shared_base =migrate_block_incremental ();assert (i < num_bs); bmds_bs[i].bmds = bmds;
migration/migration.c +1 -10
@@ -2155,7 +2155,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,error_setg (errp,"No disk migration is required in COLO mode" );return false; } -if (migrate_block () ||migrate_use_block_incremental ()) { +if (migrate_block () ||migrate_block_incremental ()) {error_setg (errp,"Command options are incompatible with " "current migration capabilities" );return false;
@@ -2271,15 +2271,6 @@ int migrate_use_tls(void)return s->parameters.tls_creds && *s->parameters.tls_creds; } -bool migrate_use_block_incremental (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->parameters.block_incremental; -} -/* migration thread support */ /* * Something bad happened to the RP stream, mark an error
migration/options.c +9 -0
@@ -465,6 +465,15 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,/* parameters */ +bool migrate_block_incremental (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.block_incremental; +} +int migrate_compress_level (void ) {MigrationState *s;
Signature · 1 line
2.39.2
PATCH 21/43 migration: Create migrate_throttle_trigger_threshold()
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-)
migration/options.h +1 -0
@@ -57,6 +57,7 @@ int migrate_multifd_channels(void);MultiFDCompression migrate_multifd_compression (void );int migrate_multifd_zlib_level (void );int migrate_multifd_zstd_level (void ); +uint8_t migrate_throttle_trigger_threshold (void );uint64_t migrate_xbzrle_cache_size (void );#endif
migration/options.c +9 -0
@@ -556,6 +556,15 @@ int migrate_multifd_zstd_level(void)return s->parameters.multifd_zstd_level; } +uint8_t migrate_throttle_trigger_threshold (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.throttle_trigger_threshold; +} +uint64_t migrate_xbzrle_cache_size (void ) {MigrationState *s;
migration/ram.c +1 -2
@@ -1184,8 +1184,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)static void migration_trigger_throttle (RAMState *rs) { -MigrationState *s =migrate_get_current (); -uint64_t threshold = s->parameters.throttle_trigger_threshold; +uint64_t threshold =migrate_throttle_trigger_threshold ();uint64_t bytes_xfer_period =stat64_get (&ram_counters.transferred) - rs->bytes_xfer_prev;uint64_t bytes_dirty_period = rs->num_dirty_pages_period *TARGET_PAGE_SIZE ;
Signature · 1 line
2.39.2
PATCH 22/43 migration: Create migrate_checkpoint_delay()
In reply to Juan Quintela--- migration/options.h | 1 + migration/colo.c | 5 ++--- migration/options.c | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-)
migration/options.h +1 -0
@@ -48,6 +48,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);/* parameters */ bool migrate_block_incremental (void ); +uint32_t migrate_checkpoint_delay (void );int migrate_compress_level (void );int migrate_compress_threads (void );int migrate_compress_wait_thread (void );
migration/colo.c +2 -3
@@ -576,7 +576,7 @@ static void colo_process_checkpoint(MigrationState *s)trace_colo_vm_state_change ("stop" ,"run" );timer_mod (s->colo_delay_timer,qemu_clock_get_ms (QEMU_CLOCK_HOST ) + - s->parameters.x_checkpoint_delay); +migrate_checkpoint_delay ());while (s->state ==MIGRATION_STATUS_COLO ) {if (failover_get_state () !=FAILOVER_STATUS_NONE ) {
@@ -651,8 +651,7 @@ void colo_checkpoint_notify(void *opaque)qemu_event_set (&s->colo_checkpoint_event); s->colo_checkpoint_time =qemu_clock_get_ms (QEMU_CLOCK_HOST ); - next_notify_time = s->colo_checkpoint_time + - s->parameters.x_checkpoint_delay; + next_notify_time = s->colo_checkpoint_time +migrate_checkpoint_delay ();timer_mod (s->colo_delay_timer, next_notify_time); }
migration/options.c +9 -0
@@ -474,6 +474,15 @@ bool migrate_block_incremental(void)return s->parameters.block_incremental; } +uint32_t migrate_checkpoint_delay (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.x_checkpoint_delay; +} +int migrate_compress_level (void ) {MigrationState *s;
Signature · 1 line
2.39.2
PATCH 23/43 migration: Create migrate_max_cpu_throttle()
In reply to Juan Quintela--- migration/migration.h | 2 -- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-)
migration/migration.h +0 -2
@@ -412,8 +412,6 @@ bool migrate_postcopy(void);int migrate_use_tls (void ); -int migrate_max_cpu_throttle (void ); -uint64_t ram_get_total_transferred_pages (void );/* Sending on the return path - generic and then for each message type */
migration/options.h +1 -0
@@ -53,6 +53,7 @@ int migrate_compress_level(void);int migrate_compress_threads (void );int migrate_compress_wait_thread (void );int migrate_decompress_threads (void ); +uint8_t migrate_max_cpu_throttle (void );int64_t migrate_max_postcopy_bandwidth (void );int migrate_multifd_channels (void );MultiFDCompression migrate_multifd_compression (void );
migration/options.c +9 -0
@@ -519,6 +519,15 @@ int migrate_decompress_threads(void)return s->parameters.decompress_threads; } +uint8_t migrate_max_cpu_throttle (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.max_cpu_throttle; +} +int64_t migrate_max_postcopy_bandwidth (void ) {MigrationState *s;
migration/ram.c +1 -1
@@ -721,7 +721,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period,uint64_t pct_initial = s->parameters.cpu_throttle_initial;uint64_t pct_increment = s->parameters.cpu_throttle_increment;bool pct_tailslow = s->parameters.cpu_throttle_tailslow; -int pct_max = s->parameters.max_cpu_throttle; +int pct_max =migrate_max_cpu_throttle ();uint64_t throttle_now =cpu_throttle_get_percentage ();uint64_t cpu_now, cpu_ideal, throttle_inc;
Signature · 1 line
2.39.2
PATCH 24/43 migration: Move migrate_announce_params() to option.c
In reply to Juan Quintela--- migration/migration.c | 14 -------------- migration/options.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-)
migration/migration.c +0 -14
@@ -954,20 +954,6 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)return params; } -AnnounceParameters *migrate_announce_params (void ) -{ -static AnnounceParameters ap; - -MigrationState *s =migrate_get_current (); - - ap.initial = s->parameters.announce_initial; - ap.max = s->parameters.announce_max; - ap.rounds = s->parameters.announce_rounds; - ap.step = s->parameters.announce_step; - -return ≈ -} -/* * Return true if we're already in the middle of a migration * (i.e. any of the active or setup states)
migration/options.c +19 -0
@@ -18,6 +18,7 @@#include "qapi/qapi-commands-migration.h" #include "qapi/qmp/qerror.h" #include "sysemu/runstate.h" +#include "migration/misc.h" #include "migration.h" #include "ram.h" #include "options.h"
@@ -591,3 +592,21 @@ uint64_t migrate_xbzrle_cache_size(void)return s->parameters.xbzrle_cache_size; } + +/* parameters helpers */ + +AnnounceParameters *migrate_announce_params (void ) +{ +static AnnounceParameters ap; + +MigrationState *s =migrate_get_current (); + + ap.initial = s->parameters.announce_initial; + ap.max = s->parameters.announce_max; + ap.rounds = s->parameters.announce_rounds; + ap.step = s->parameters.announce_step; + +return ≈ +} + +
Signature · 1 line
2.39.2
PATCH 25/43 migration: Create migrate_cpu_throttle_initial() to option.c
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-)
migration/options.h +1 -0
@@ -52,6 +52,7 @@ uint32_t migrate_checkpoint_delay(void);int migrate_compress_level (void );int migrate_compress_threads (void );int migrate_compress_wait_thread (void ); +uint8_t migrate_cpu_throttle_initial (void );int migrate_decompress_threads (void );uint8_t migrate_max_cpu_throttle (void );int64_t migrate_max_postcopy_bandwidth (void );
migration/options.c +9 -0
@@ -511,6 +511,15 @@ int migrate_compress_wait_thread(void)return s->parameters.compress_wait_thread; } +uint8_t migrate_cpu_throttle_initial (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.cpu_throttle_initial; +} +int migrate_decompress_threads (void ) {MigrationState *s;
migration/ram.c +1 -1
@@ -718,7 +718,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period, uint64_t bytes_dirty_threshold) {MigrationState *s =migrate_get_current (); -uint64_t pct_initial = s->parameters.cpu_throttle_initial; +uint64_t pct_initial =migrate_cpu_throttle_initial ();uint64_t pct_increment = s->parameters.cpu_throttle_increment;bool pct_tailslow = s->parameters.cpu_throttle_tailslow;int pct_max =migrate_max_cpu_throttle ();
Signature · 1 line
2.39.2
PATCH 26/43 migration: Create migrate_cpu_throttle_increment() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-)
migration/options.h +1 -0
@@ -52,6 +52,7 @@ uint32_t migrate_checkpoint_delay(void);int migrate_compress_level (void );int migrate_compress_threads (void );int migrate_compress_wait_thread (void ); +uint8_t migrate_cpu_throttle_increment (void );uint8_t migrate_cpu_throttle_initial (void );int migrate_decompress_threads (void );uint8_t migrate_max_cpu_throttle (void );
migration/options.c +9 -0
@@ -511,6 +511,15 @@ int migrate_compress_wait_thread(void)return s->parameters.compress_wait_thread; } +uint8_t migrate_cpu_throttle_increment (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.cpu_throttle_increment; +} +uint8_t migrate_cpu_throttle_initial (void ) {MigrationState *s;
migration/ram.c +1 -1
@@ -719,7 +719,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period, {MigrationState *s =migrate_get_current ();uint64_t pct_initial =migrate_cpu_throttle_initial (); -uint64_t pct_increment = s->parameters.cpu_throttle_increment; +uint64_t pct_increment =migrate_cpu_throttle_increment ();bool pct_tailslow = s->parameters.cpu_throttle_tailslow;int pct_max =migrate_max_cpu_throttle ();
Signature · 1 line
2.39.2
PATCH 27/43 migration: Create migrate_cpu_throttle_tailslow() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 9 +++++++++ migration/ram.c | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-)
migration/options.h +1 -0
@@ -54,6 +54,7 @@ int migrate_compress_threads(void);int migrate_compress_wait_thread (void );uint8_t migrate_cpu_throttle_increment (void );uint8_t migrate_cpu_throttle_initial (void ); +bool migrate_cpu_throttle_tailslow (void );int migrate_decompress_threads (void );uint8_t migrate_max_cpu_throttle (void );int64_t migrate_max_postcopy_bandwidth (void );
migration/options.c +9 -0
@@ -529,6 +529,15 @@ uint8_t migrate_cpu_throttle_initial(void)return s->parameters.cpu_throttle_initial; } +bool migrate_cpu_throttle_tailslow (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.cpu_throttle_tailslow; +} +int migrate_decompress_threads (void ) {MigrationState *s;
migration/ram.c +1 -2
@@ -717,10 +717,9 @@ static size_t save_page_header(PageSearchStatus *pss, RAMBlock *block,static void mig_throttle_guest_down (uint64_t bytes_dirty_period,uint64_t bytes_dirty_threshold) { -MigrationState *s =migrate_get_current ();uint64_t pct_initial =migrate_cpu_throttle_initial ();uint64_t pct_increment =migrate_cpu_throttle_increment (); -bool pct_tailslow = s->parameters.cpu_throttle_tailslow; +bool pct_tailslow =migrate_cpu_throttle_tailslow ();int pct_max =migrate_max_cpu_throttle ();uint64_t throttle_now =cpu_throttle_get_percentage ();
Signature · 1 line
2.39.2
PATCH 28/43 migration: Move migrate_use_tls() to options.c
In reply to Juan QuintelaOnce there, rename it to migrate_tls() and make it return bool for consistency.
--- migration/migration.h | 2 -- migration/options.h | 9 +++++++++ migration/migration.c | 9 --------- migration/options.c | 16 +++++++++++++++- migration/tls.c | 3 ++- 5 files changed, 26 insertions(+), 13 deletions(-)
migration/migration.h +0 -2
@@ -410,8 +410,6 @@ MigrationState *migrate_get_current(void);bool migrate_postcopy (void ); -int migrate_use_tls (void ); -uint64_t ram_get_total_transferred_pages (void );/* Sending on the return path - generic and then for each message type */
migration/options.h +9 -0
@@ -40,6 +40,15 @@ bool migrate_xbzrle(void);bool migrate_zero_blocks (void );bool migrate_zero_copy_send (void ); +/* +* pseudo capabilities +* +* This are functions that are used in a similar way that capabilities +* check, but they are not a capability. +*/ + +bool migrate_tls (void ); +/* capabilities helpers */ bool migrate_caps_check (bool *old_caps,bool *new_caps,Error **errp);
migration/migration.c +0 -9
@@ -2248,15 +2248,6 @@ bool migrate_postcopy(void)return migrate_postcopy_ram () ||migrate_dirty_bitmaps (); } -int migrate_use_tls (void ) -{ -MigrationState *s; - - s =migrate_get_current (); - -return s->parameters.tls_creds && *s->parameters.tls_creds; -} -/* migration thread support */ /* * Something bad happened to the RP stream, mark an error
migration/options.c +15 -1
@@ -206,6 +206,20 @@ bool migrate_zero_copy_send(void)return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]; } + +/* pseudo capabilities */ + +bool migrate_tls (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.tls_creds && *s->parameters.tls_creds; +} + + + typedef enum WriteTrackingSupport { WT_SUPPORT_UNKNOWN = 0, WT_SUPPORT_ABSENT,
@@ -355,7 +369,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp) new_caps[MIGRATION_CAPABILITY_COMPRESS] || new_caps[MIGRATION_CAPABILITY_XBZRLE] || migrate_multifd_compression() || - migrate_use_tls())) { + migrate_tls())) {error_setg (errp,"Zero copy only available for non-compressed non-TLS multifd migration" );return false;
migration/tls.c +2 -1
@@ -22,6 +22,7 @@#include "channel.h" #include "migration.h" #include "tls.h" +#include "options.h" #include "crypto/tlscreds.h" #include "qemu/error-report.h" #include "qapi/error.h"
@@ -165,7 +166,7 @@ void migration_tls_channel_connect(MigrationState *s,bool migrate_channel_requires_tls_upgrade (QIOChannel *ioc) { -if (!migrate_use_tls ()) { +if (!migrate_tls ()) {return false; }
Signature · 1 line
2.39.2
PATCH 29/43 migration: Move migrate_postcopy() to options.c
In reply to Juan Quintela--- migration/migration.h | 2 -- migration/options.h | 1 + migration/migration.c | 5 ----- migration/options.c | 5 +++++ 4 files changed, 6 insertions(+), 7 deletions(-)
migration/migration.h +0 -2
@@ -408,8 +408,6 @@ bool migration_is_blocked(Error **errp);bool migration_in_postcopy (void );MigrationState *migrate_get_current (void ); -bool migrate_postcopy (void ); -uint64_t ram_get_total_transferred_pages (void );/* Sending on the return path - generic and then for each message type */
migration/options.h +1 -0
@@ -47,6 +47,7 @@ bool migrate_zero_copy_send(void);* check, but they are not a capability. */ +bool migrate_postcopy (void );bool migrate_tls (void );/* capabilities helpers */
migration/migration.c +0 -5
@@ -2243,11 +2243,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 (); -} -/* migration thread support */ /* * Something bad happened to the RP stream, mark an error
migration/options.c +5 -0
@@ -209,6 +209,11 @@ bool migrate_zero_copy_send(void)/* pseudo capabilities */ +bool migrate_postcopy (void ) +{ +return migrate_postcopy_ram () ||migrate_dirty_bitmaps (); +} +bool migrate_tls (void ) {MigrationState *s;
Signature · 1 line
2.39.2
PATCH 30/43 migration: Create migrate_max_bandwidth() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/migration.c | 2 +- migration/options.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-)
migration/options.h +1 -0
@@ -67,6 +67,7 @@ uint8_t migrate_cpu_throttle_initial(void);bool migrate_cpu_throttle_tailslow (void );int migrate_decompress_threads (void );uint8_t migrate_max_cpu_throttle (void ); +uint64_t migrate_max_bandwidth (void );int64_t migrate_max_postcopy_bandwidth (void );int migrate_multifd_channels (void );MultiFDCompression migrate_multifd_compression (void );
migration/migration.c +1 -1
@@ -3758,7 +3758,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)XFER_LIMIT_RATIO ; }else {/* This is a fresh new migration */ - rate_limit = s->parameters.max_bandwidth /XFER_LIMIT_RATIO ; + rate_limit =migrate_max_bandwidth () /XFER_LIMIT_RATIO ;/* Notify before starting migration thread */ notifier_list_notify (&migration_state_notifiers, s);
migration/options.c +9 -0
@@ -575,6 +575,15 @@ uint8_t migrate_max_cpu_throttle(void)return s->parameters.max_cpu_throttle; } +uint64_t migrate_max_bandwidth (void ) +{ +MigrationState *s; + + s =migrate_get_current (); + +return s->parameters.max_bandwidth; +} +int64_t migrate_max_postcopy_bandwidth (void ) {MigrationState *s;
Signature · 1 line
2.39.2
PATCH 31/43 migration: Move qmp_query_migrate_parameters() to options.c
In reply to Juan Quintela--- migration/migration.c | 68 ------------------------------------------- migration/options.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 68 deletions(-)
migration/migration.c +0 -68
@@ -886,74 +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); } -MigrationParameters *qmp_query_migrate_parameters (Error **errp) -{ -MigrationParameters *params; -MigrationState *s =migrate_get_current (); - -/* TODO use QAPI_CLONE() instead of duplicating it inline */ - params =g_malloc0 (sizeof (*params)); - params->has_compress_level = true; - params->compress_level = s->parameters.compress_level; - params->has_compress_threads = true; - params->compress_threads = s->parameters.compress_threads; - params->has_compress_wait_thread = true; - params->compress_wait_thread = s->parameters.compress_wait_thread; - params->has_decompress_threads = true; - params->decompress_threads = s->parameters.decompress_threads; - params->has_throttle_trigger_threshold = true; - params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold; - params->has_cpu_throttle_initial = true; - params->cpu_throttle_initial = s->parameters.cpu_throttle_initial; - params->has_cpu_throttle_increment = true; - params->cpu_throttle_increment = s->parameters.cpu_throttle_increment; - params->has_cpu_throttle_tailslow = true; - params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow; - params->tls_creds =g_strdup (s->parameters.tls_creds); - params->tls_hostname =g_strdup (s->parameters.tls_hostname); - params->tls_authz =g_strdup (s->parameters.tls_authz ? - s->parameters.tls_authz :"" ); - params->has_max_bandwidth = true; - params->max_bandwidth = s->parameters.max_bandwidth; - params->has_downtime_limit = true; - params->downtime_limit = s->parameters.downtime_limit; - params->has_x_checkpoint_delay = true; - params->x_checkpoint_delay = s->parameters.x_checkpoint_delay; - params->has_block_incremental = true; - params->block_incremental = s->parameters.block_incremental; - params->has_multifd_channels = true; - params->multifd_channels = s->parameters.multifd_channels; - params->has_multifd_compression = true; - params->multifd_compression = s->parameters.multifd_compression; - params->has_multifd_zlib_level = true; - params->multifd_zlib_level = s->parameters.multifd_zlib_level; - params->has_multifd_zstd_level = true; - params->multifd_zstd_level = s->parameters.multifd_zstd_level; - params->has_xbzrle_cache_size = true; - params->xbzrle_cache_size = s->parameters.xbzrle_cache_size; - params->has_max_postcopy_bandwidth = true; - params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth; - params->has_max_cpu_throttle = true; - params->max_cpu_throttle = s->parameters.max_cpu_throttle; - params->has_announce_initial = true; - params->announce_initial = s->parameters.announce_initial; - params->has_announce_max = true; - params->announce_max = s->parameters.announce_max; - params->has_announce_rounds = true; - params->announce_rounds = s->parameters.announce_rounds; - params->has_announce_step = true; - params->announce_step = s->parameters.announce_step; - -if (s->parameters.has_block_bitmap_mapping) { - params->has_block_bitmap_mapping = true; - params->block_bitmap_mapping = -QAPI_CLONE (BitmapMigrationNodeAliasList, - s->parameters.block_bitmap_mapping); - } - -return params; -} -/* * Return true if we're already in the middle of a migration * (i.e. any of the active or setup states)
migration/options.c +68 -0
80 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH 32/43 migration: Move qmp_migrate_set_parameters() to options.c
In reply to Juan Quintela--- migration/options.h | 11 ++ migration/migration.c | 420 ------------------------------------------ migration/options.c | 418 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 429 insertions(+), 420 deletions(-)
migration/options.h +11 -0
@@ -16,6 +16,13 @@#ifndef QEMU_MIGRATION_OPTIONS_H #define QEMU_MIGRATION_OPTIONS_H +/* constants */ + +/* Amount of time to allocate to each "chunk" of bandwidth-throttled +* data. */ +#define BUFFER_DELAY 100 +#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY) +/* capabilities */ bool migrate_auto_converge (void );
@@ -76,4 +83,8 @@ int migrate_multifd_zstd_level(void);uint8_t migrate_throttle_trigger_threshold (void );uint64_t migrate_xbzrle_cache_size (void ); +/* parameters helpers */ + +bool migrate_params_check (MigrationParameters *params,Error **errp); +#endif
migration/migration.c +0 -420
436 lines not on this page · raw message
migration/options.c +418 -0
438 lines not on this page · raw message
Signature · 1 line
2.39.2
PATCH 33/43 migration: Create migrate_params_init() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/migration.c | 29 +---------------------------- migration/options.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 28 deletions(-)
migration/options.h +1 -0
@@ -86,5 +86,6 @@ uint64_t migrate_xbzrle_cache_size(void);/* parameters helpers */ bool migrate_params_check (MigrationParameters *params,Error **errp); +void migrate_params_init (MigrationParameters *params);#endif
migration/migration.c +1 -28
@@ -3455,7 +3455,6 @@ static void migration_instance_finalize(Object *obj)static void migration_instance_init (Object *obj) {MigrationState *ms =MIGRATION_OBJ (obj); -MigrationParameters *params = &ms->parameters; ms->state =MIGRATION_STATUS_NONE ; ms->mbps =-1 ;
@@ -3463,33 +3462,7 @@ static void migration_instance_init(Object *obj)qemu_sem_init (&ms->pause_sem,0 );qemu_mutex_init (&ms->error_mutex); - params->tls_hostname =g_strdup ("" ); - params->tls_creds =g_strdup ("" ); - -/* Set has_* up only for parameter checks */ - params->has_compress_level = true; - params->has_compress_threads = true; - params->has_compress_wait_thread = true; - params->has_decompress_threads = true; - params->has_throttle_trigger_threshold = true; - params->has_cpu_throttle_initial = true; - params->has_cpu_throttle_increment = true; - params->has_cpu_throttle_tailslow = true; - params->has_max_bandwidth = true; - params->has_downtime_limit = true; - params->has_x_checkpoint_delay = true; - params->has_block_incremental = true; - params->has_multifd_channels = true; - params->has_multifd_compression = true; - params->has_multifd_zlib_level = true; - params->has_multifd_zstd_level = true; - params->has_xbzrle_cache_size = true; - params->has_max_postcopy_bandwidth = true; - params->has_max_cpu_throttle = true; - params->has_announce_initial = true; - params->has_announce_max = true; - params->has_announce_rounds = true; - params->has_announce_step = true; +migrate_params_init (&ms->parameters);qemu_sem_init (&ms->postcopy_pause_sem,0 );qemu_sem_init (&ms->postcopy_pause_rp_sem,0 );
migration/options.c +31 -0
@@ -742,6 +742,37 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)return params; } +void migrate_params_init (MigrationParameters *params) +{ + params->tls_hostname =g_strdup ("" ); + params->tls_creds =g_strdup ("" ); + +/* Set has_* up only for parameter checks */ + params->has_compress_level = true; + params->has_compress_threads = true; + params->has_compress_wait_thread = true; + params->has_decompress_threads = true; + params->has_throttle_trigger_threshold = true; + params->has_cpu_throttle_initial = true; + params->has_cpu_throttle_increment = true; + params->has_cpu_throttle_tailslow = true; + params->has_max_bandwidth = true; + params->has_downtime_limit = true; + params->has_x_checkpoint_delay = true; + params->has_block_incremental = true; + params->has_multifd_channels = true; + params->has_multifd_compression = true; + params->has_multifd_zlib_level = true; + params->has_multifd_zstd_level = true; + params->has_xbzrle_cache_size = true; + params->has_max_postcopy_bandwidth = true; + params->has_max_cpu_throttle = true; + params->has_announce_initial = true; + params->has_announce_max = true; + params->has_announce_rounds = true; + params->has_announce_step = true; +} +/* * Check whether the parameters are valid. Error will be put into errp * (if provided). Return true if valid, otherwise false.
Signature · 1 line
2.39.2
PATCH 34/43 migration: Make all functions check have the same format
In reply to Juan Quintela--- migration/options.c | 153 +++++++++++--------------------------------- 1 file changed, 39 insertions(+), 114 deletions(-)
migration/options.c +39 -114
@@ -35,27 +35,21 @@bool migrate_auto_converge (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE ]; }bool migrate_background_snapshot (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT ]; }bool migrate_block (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_BLOCK ]; }
@@ -63,95 +57,76 @@ bool migrate_block(void)bool migrate_colo (void ) {MigrationState *s =migrate_get_current (); +return s->capabilities[MIGRATION_CAPABILITY_X_COLO ]; }bool migrate_compress (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_COMPRESS ]; }bool migrate_dirty_bitmaps (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS ]; }bool migrate_events (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_EVENTS ]; }bool migrate_ignore_shared (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED ]; }bool migrate_late_block_activate (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE ]; }bool migrate_multifd (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_MULTIFD ]; }bool migrate_pause_before_switchover (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER ]; }bool migrate_postcopy_blocktime (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME ]; }bool migrate_postcopy_preempt (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT ]; }bool migrate_postcopy_ram (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM ]; }
@@ -165,54 +140,42 @@ bool migrate_rdma_pin_all(void)bool migrate_release_ram (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM ]; }bool migrate_return_path (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH ]; }bool migrate_validate_uuid (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID ]; }bool migrate_xbzrle (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_XBZRLE ]; }bool migrate_zero_blocks (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS ]; }bool migrate_zero_copy_send (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND ]; }
@@ -226,9 +189,7 @@ bool migrate_postcopy(void)bool migrate_tls (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.tls_creds && *s->parameters.tls_creds; }
@@ -497,126 +458,98 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,bool migrate_block_incremental (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.block_incremental; }uint32_t migrate_checkpoint_delay (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.x_checkpoint_delay; }int migrate_compress_level (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.compress_level; }int migrate_compress_threads (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.compress_threads; }int migrate_compress_wait_thread (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.compress_wait_thread; }uint8_t migrate_cpu_throttle_increment (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.cpu_throttle_increment; }uint8_t migrate_cpu_throttle_initial (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.cpu_throttle_initial; }bool migrate_cpu_throttle_tailslow (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.cpu_throttle_tailslow; }int migrate_decompress_threads (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.decompress_threads; }uint8_t migrate_max_cpu_throttle (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.max_cpu_throttle; }uint64_t migrate_max_bandwidth (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.max_bandwidth; }int64_t migrate_max_postcopy_bandwidth (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.max_postcopy_bandwidth; }int migrate_multifd_channels (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.multifd_channels; }MultiFDCompression migrate_multifd_compression (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();assert (s->parameters.multifd_compression <MULTIFD_COMPRESSION__MAX );return s->parameters.multifd_compression;
@@ -624,36 +557,28 @@ MultiFDCompression migrate_multifd_compression(void)int migrate_multifd_zlib_level (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.multifd_zlib_level; }int migrate_multifd_zstd_level (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.multifd_zstd_level; }uint8_t migrate_throttle_trigger_threshold (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.throttle_trigger_threshold; }uint64_t migrate_xbzrle_cache_size (void ) { -MigrationState *s; - - s =migrate_get_current (); +MigrationState *s =migrate_get_current ();return s->parameters.xbzrle_cache_size; }
Signature · 1 line
2.39.2
PATCH 35/43 migration: Create migrate_downtime_limit() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/migration.c | 4 ++-- migration/options.c | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-)
migration/options.h +1 -0
@@ -73,6 +73,7 @@ uint8_t migrate_cpu_throttle_increment(void);uint8_t migrate_cpu_throttle_initial (void );bool migrate_cpu_throttle_tailslow (void );int migrate_decompress_threads (void ); +uint64_t migrate_downtime_limit (void );uint8_t migrate_max_cpu_throttle (void );uint64_t migrate_max_bandwidth (void );int64_t migrate_max_postcopy_bandwidth (void );
migration/migration.c +2 -2
@@ -2733,7 +2733,7 @@ static void migration_update_counters(MigrationState *s, transferred = current_bytes - s->iteration_initial_bytes; time_spent = current_time - s->iteration_start_time; bandwidth = (double )transferred / time_spent; - s->threshold_size = bandwidth * s->parameters.downtime_limit; + s->threshold_size = bandwidth *migrate_downtime_limit (); s->mbps = (((double ) transferred *8.0 ) / ((double ) time_spent /1000.0 )) /1000.0 /1000.0 ;
@@ -3240,7 +3240,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)*/ migrate_error_free (s); - s->expected_downtime = s->parameters.downtime_limit; + s->expected_downtime =migrate_downtime_limit ();if (resume) {assert (s->cleanup_bh); }else {
migration/options.c +7 -0
@@ -519,6 +519,13 @@ int migrate_decompress_threads(void)return s->parameters.decompress_threads; } +uint64_t migrate_downtime_limit (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->parameters.downtime_limit; +} +uint8_t migrate_max_cpu_throttle (void ) {MigrationState *s =migrate_get_current ();
Signature · 1 line
2.39.2
PATCH 36/43 migration: Move migrate_set_block_incremental() to options.c
In reply to Juan QuintelaOnce there, make it more regular and remove th eneed for MigrationState parameter.
--- migration/options.h | 4 ++++ migration/migration.c | 9 ++------- migration/options.c | 9 +++++++++ 3 files changed, 15 insertions(+), 7 deletions(-)
migration/options.h +4 -0
@@ -84,6 +84,10 @@ int migrate_multifd_zstd_level(void);uint8_t migrate_throttle_trigger_threshold (void );uint64_t migrate_xbzrle_cache_size (void ); +/* parameters setters */ + +void migrate_set_block_incremental (bool value); +/* parameters helpers */ bool migrate_params_check (MigrationParameters *params,Error **errp);
migration/migration.c +2 -7
@@ -1162,17 +1162,12 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static void migrate_set_block_incremental (MigrationState *s,bool value) -{ - s->parameters.block_incremental = value; -} -static void block_cleanup_parameters (MigrationState *s) {if (s->must_remove_block_options) {/* setting to false can never fail */ migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort); -migrate_set_block_incremental (s, false); +migrate_set_block_incremental (false); s->must_remove_block_options = false; } }
@@ -1666,7 +1661,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc, }if (blk_inc) { -migrate_set_block_incremental (s, true); +migrate_set_block_incremental (true); }migrate_init (s);
migration/options.c +9 -0
@@ -590,6 +590,15 @@ uint64_t migrate_xbzrle_cache_size(void)return s->parameters.xbzrle_cache_size; } +/* parameter setters */ + +void migrate_set_block_incremental (bool value) +{ +MigrationState *s =migrate_get_current (); + + s->parameters.block_incremental = value; +} +/* parameters helpers */ AnnounceParameters *migrate_announce_params (void )
Signature · 1 line
2.39.2
PATCH 37/43 migration: Move block_cleanup_parameters() to options.c
In reply to Juan Quintela--- migration/options.h | 1 + migration/migration.c | 10 ---------- migration/options.c | 10 ++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-)
migration/options.h +1 -0
@@ -92,5 +92,6 @@ void migrate_set_block_incremental(bool value);bool migrate_params_check (MigrationParameters *params,Error **errp);void migrate_params_init (MigrationParameters *params); +void block_cleanup_parameters (MigrationState *s);#endif
migration/migration.c +0 -10
@@ -1162,16 +1162,6 @@ void migrate_set_state(int *state, int old_state, int new_state) } } -static void block_cleanup_parameters (MigrationState *s) -{ -if (s->must_remove_block_options) { -/* setting to false can never fail */ -migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort); -migrate_set_block_incremental (false); - s->must_remove_block_options = false; - } -} -static void migrate_fd_cleanup (MigrationState *s) {qemu_bh_delete (s->cleanup_bh);
migration/options.c +10 -0
@@ -601,6 +601,16 @@ void migrate_set_block_incremental(bool value)/* parameters helpers */ +void block_cleanup_parameters (MigrationState *s) +{ +if (s->must_remove_block_options) { +/* setting to false can never fail */ +migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort); +migrate_set_block_incremental (false); + s->must_remove_block_options = false; + } +} +AnnounceParameters *migrate_announce_params (void ) {static AnnounceParameters ap;
Signature · 1 line
2.39.2
PATCH 38/43 migration: Remove MigrationState from block_cleanup_parameters()
In reply to Juan QuintelaThis makes the function more regular with everything else.
--- migration/options.h | 2 +- migration/migration.c | 4 ++-- migration/options.c | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-)
migration/options.h +1 -1
@@ -92,6 +92,6 @@ void migrate_set_block_incremental(bool value);bool migrate_params_check (MigrationParameters *params,Error **errp);void migrate_params_init (MigrationParameters *params); -void block_cleanup_parameters (MigrationState *s); +void block_cleanup_parameters (void );#endif
migration/migration.c +2 -2
@@ -1216,7 +1216,7 @@ static void migrate_fd_cleanup(MigrationState *s)error_report_err (error_copy (s->error)); }notifier_list_notify (&migration_state_notifiers, s); -block_cleanup_parameters (s); +block_cleanup_parameters ();yank_unregister_instance (MIGRATION_YANK_INSTANCE ); }
@@ -1710,7 +1710,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, "a valid migration protocol");migrate_set_state (&s->state,MIGRATION_STATUS_SETUP ,MIGRATION_STATUS_FAILED ); -block_cleanup_parameters (s); +block_cleanup_parameters ();return ; }
migration/options.c +3 -1
@@ -601,8 +601,10 @@ void migrate_set_block_incremental(bool value)/* parameters helpers */ -void block_cleanup_parameters (MigrationState *s) +void block_cleanup_parameters (void ) { +MigrationState *s =migrate_get_current (); +if (s->must_remove_block_options) {/* setting to false can never fail */ migrate_cap_set (MIGRATION_CAPABILITY_BLOCK , false, &error_abort);
Signature · 1 line
2.39.2
PATCH 39/43 migration: Create migrate_tls_creds() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 7 +++++++ migration/tls.c | 9 ++++----- 3 files changed, 12 insertions(+), 5 deletions(-)
migration/options.h +1 -0
@@ -82,6 +82,7 @@ MultiFDCompression migrate_multifd_compression(void);int migrate_multifd_zlib_level (void );int migrate_multifd_zstd_level (void );uint8_t migrate_throttle_trigger_threshold (void ); +char *migrate_tls_creds (void );uint64_t migrate_xbzrle_cache_size (void );/* parameters setters */
migration/options.c +7 -0
@@ -583,6 +583,13 @@ uint8_t migrate_throttle_trigger_threshold(void)return s->parameters.throttle_trigger_threshold; } +char *migrate_tls_creds (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->parameters.tls_creds; +} +uint64_t migrate_xbzrle_cache_size (void ) {MigrationState *s =migrate_get_current ();
migration/tls.c +4 -5
@@ -34,20 +34,19 @@ migration_tls_get_creds(MigrationState *s, Error **errp) {Object *creds; +char *tls_creds =migrate_tls_creds ();QCryptoTLSCreds *ret; - creds =object_resolve_path_component ( -object_get_objects_root (), s->parameters.tls_creds); + creds =object_resolve_path_component (object_get_objects_root (), tls_creds);if (!creds) { -error_setg (errp,"No TLS credentials with id '%s'" , - s->parameters.tls_creds); +error_setg (errp,"No TLS credentials with id '%s'" , tls_creds);return NULL ; } ret = (QCryptoTLSCreds *)object_dynamic_cast ( creds,TYPE_QCRYPTO_TLS_CREDS );if (!ret) {error_setg (errp,"Object with id '%s' is not TLS credentials" , - s->parameters.tls_creds); + tls_creds);return NULL ; }if (!qcrypto_tls_creds_check_endpoint (ret, endpoint, errp)) {
Signature · 1 line
2.39.2
PATCH 40/43 migration: Create migrate_tls_authz() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 7 +++++++ migration/tls.c | 5 +---- 3 files changed, 9 insertions(+), 4 deletions(-)
migration/options.h +1 -0
@@ -82,6 +82,7 @@ MultiFDCompression migrate_multifd_compression(void);int migrate_multifd_zlib_level (void );int migrate_multifd_zstd_level (void );uint8_t migrate_throttle_trigger_threshold (void ); +char *migrate_tls_authz (void );char *migrate_tls_creds (void );uint64_t migrate_xbzrle_cache_size (void );
migration/options.c +7 -0
@@ -583,6 +583,13 @@ uint8_t migrate_throttle_trigger_threshold(void)return s->parameters.throttle_trigger_threshold; } +char *migrate_tls_authz (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->parameters.tls_authz; +} +char *migrate_tls_creds (void ) {MigrationState *s =migrate_get_current ();
migration/tls.c +1 -4
@@ -86,10 +86,7 @@ void migration_tls_channel_process_incoming(MigrationState *s,return ; } - tioc =qio_channel_tls_new_server ( - ioc, creds, - s->parameters.tls_authz, - errp); + tioc =qio_channel_tls_new_server (ioc, creds,migrate_tls_authz (), errp);if (!tioc) {return ; }
Signature · 1 line
2.39.2
PATCH 41/43 migration: Create migrate_tls_hostname() function
In reply to Juan Quintela--- migration/options.h | 1 + migration/options.c | 7 +++++++ migration/tls.c | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-)
migration/options.h +1 -0
@@ -84,6 +84,7 @@ int migrate_multifd_zstd_level(void);uint8_t migrate_throttle_trigger_threshold (void );char *migrate_tls_authz (void );char *migrate_tls_creds (void ); +char *migrate_tls_hostname (void );uint64_t migrate_xbzrle_cache_size (void );/* parameters setters */
migration/options.c +7 -0
@@ -597,6 +597,13 @@ char *migrate_tls_creds(void)return s->parameters.tls_creds; } +char *migrate_tls_hostname (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->parameters.tls_hostname; +} +uint64_t migrate_xbzrle_cache_size (void ) {MigrationState *s =migrate_get_current ();
migration/tls.c +4 -2
@@ -123,6 +123,7 @@ QIOChannelTLS *migration_tls_client_create(MigrationState *s, Error **errp) {QCryptoTLSCreds *creds; +char *tls_hostname; creds =migration_tls_get_creds ( s,QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT , errp);
@@ -130,8 +131,9 @@ QIOChannelTLS *migration_tls_client_create(MigrationState *s,return NULL ; } -if (s->parameters.tls_hostname && *s->parameters.tls_hostname) { - hostname = s->parameters.tls_hostname; + tls_hostname =migrate_tls_hostname (); +if (tls_hostname && *tls_hostname) { + hostname = tls_hostname; }return qio_channel_tls_new_client (ioc, creds, hostname, errp);
Signature · 1 line
2.39.2
PATCH 42/43 migration: Create migrate_block_bitmap_mapping() function
In reply to Juan QuintelaNotice that we changed the test of ->has_block_bitmap_mapping for the test that block_bitmap_mapping is not NULL.
--- migration/options.h | 1 + migration/block-dirty-bitmap.c | 14 ++++++++------ migration/options.c | 7 +++++++ 3 files changed, 16 insertions(+), 6 deletions(-)
migration/options.h +1 -0
@@ -64,6 +64,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);/* parameters */ +BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping (void );bool migrate_block_incremental (void );uint32_t migrate_checkpoint_delay (void );int migrate_compress_level (void );
migration/block-dirty-bitmap.c +8 -6
@@ -605,11 +605,12 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)SaveBitmapState *dbms;GHashTable *handled_by_blk =g_hash_table_new (NULL ,NULL );BlockBackend *blk; -const MigrationParameters *mig_params = &migrate_get_current ()->parameters;GHashTable *alias_map =NULL ; +BitmapMigrationNodeAliasList *block_bitmap_mapping = +migrate_block_bitmap_mapping (); -if (mig_params->has_block_bitmap_mapping) { - alias_map =construct_alias_map (mig_params->block_bitmap_mapping, true, +if (block_bitmap_mapping) { + alias_map =construct_alias_map (block_bitmap_mapping, true, &error_abort); }
@@ -1158,7 +1159,8 @@ static int dirty_bitmap_load_header(QEMUFile *f, DBMLoadState *s,static int dirty_bitmap_load (QEMUFile *f,void *opaque,int version_id) {GHashTable *alias_map =NULL ; -const MigrationParameters *mig_params = &migrate_get_current ()->parameters; +BitmapMigrationNodeAliasList *block_bitmap_mapping = +migrate_block_bitmap_mapping ();DBMLoadState *s = &((DBMState *)opaque)->load;int ret =0 ;
@@ -1170,8 +1172,8 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id)return -EINVAL ; } -if (mig_params->has_block_bitmap_mapping) { - alias_map =construct_alias_map (mig_params->block_bitmap_mapping, +if (block_bitmap_mapping) { + alias_map =construct_alias_map (block_bitmap_mapping, false, &error_abort); }
migration/options.c +7 -0
@@ -456,6 +456,13 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,/* parameters */ +BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping (void ) +{ +MigrationState *s =migrate_get_current (); + +return s->parameters.block_bitmap_mapping; +} +bool migrate_block_incremental (void ) {MigrationState *s =migrate_get_current ();
Signature · 1 line
2.39.2
PATCH 43/43 migration: Move migration_properties to options.c
In reply to Juan Quintela--- migration/options.h | 7 ++ migration/migration.c | 155 ------------------------------------------ migration/options.c | 153 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 160 insertions(+), 155 deletions(-)
migration/options.h +7 -0
@@ -16,6 +16,9 @@#ifndef QEMU_MIGRATION_OPTIONS_H #define QEMU_MIGRATION_OPTIONS_H +#include "hw/qdev-properties.h" +#include "hw/qdev-properties-system.h" +/* constants */ /* Amount of time to allocate to each "chunk" of bandwidth-throttled
@@ -23,6 +26,10 @@#define BUFFER_DELAY 100#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY) +/* migration properties */ + +extern Property migration_properties[]; +/* capabilities */ bool migrate_auto_converge (void );
migration/migration.c +0 -155
173 lines not on this page · raw message
migration/options.c +153 -0
159 lines not on this page · raw message
Signature · 1 line
2.39.2
Quoted 14 lines · Juan Quintela
Hi
This series move to
options.c:
- all migration capabilities code
- all migration parameters code
- all properties code
- all qmp commands that only touch the previousAnd once there:
- sort of functions
- make consistent and coherent all the functions naming/typing
- create accessors for the parameters/capabilties that don't exist
- more cleanups here and there.
Quoted 8 lines
Todo:
- There is still capabilities code on
savevm.c, but I want this in before moving that code tooptions.c, but still needs more thought for my part. I.e. should I put vmstate sections inoptions.c, or should I create new functions to access the capabilities insavevm.c.Please review.
Hmm, I can't apply to current master, neither can patchew: https://patchew.org/QEMU/[email protected]/
On which commit the series based on?
Signature · 2 lines
Best regards, Vladimir
Quoted 19 lines · Vladimir Sementsov-Ogievskiy
Quoted 9 lines · Juan Quintela
Hi
This series move tooptions.c:
- all migration capabilities code
- all migration parameters code
- all properties code
- all qmp commands that only touch the previous
And once there:
- sort of functions
- make consistent and coherent all the functions naming/typingQuoted 8 lines
- create accessors for the parameters/capabilties that don't exist
- more cleanups here and there.
Todo:
- There is still capabilities code onsavevm.c, but I want this in before moving that code tooptions.c, but still needs more thought for my part. I.e. should I put vmstate sections inoptions.c, or should I create new functions to access the capabilities insavevm.c.
Please review.
Quoted 4 lines
Hmm, I can't apply to current master, neither can patchew:
https://patchew.org/QEMU/[email protected]/On which commit the series based on?
It was on top of my spice changes O:-)
But I sent a new version right now on top of the PULL request.
Thanks, Juan.