falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration fixes: 

- ensure src block devices continue fine after a failed migration
 - fail on migration blockers; helps 9p savevm/loadvm
 - move autoconverge commands out of experimental state
 - move the migration-specific qjson in migration/
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABCAAGBQJXQzqdAAoJEOsLTfxlfvZwMDgP/0WjJc6tcrRYWPnZ0I4+6/1A
 MByxfBf0LBeST5/A8HDOg8KrTasNHXKisMAQ5kHUxxWLuzF9GYScLdZ2Sf+2VrP2
 rRLJXW2c56cVPsc3j4ZU5t93SO5Q2Dd1hZ2uabu5XMMH2IhtO5H05wfPkkMdRZO2
 XzRt97z0LRBHOvh4O/ZfGjtEaMlmUTpl5X/PpPUW+o6yeDZU00kWFUz7BR7D9q27
 Adru6G8N3pN3KJEMWMqIdmlgoSTEdebTItwLLJ7XwKlKF+bPwr/gsqM6i66C0ahB
 HjpS2T4ly7U33B2JdWElDCZSwlFXAy3Tv7oB0mHgCEqgfryabQXRupVpK0Vyk2EV
 yV7Hf+R/DdkHBNeCCl+rduQiA6ed/DFHSa62vt796Yilf2vUlvdeuh4d1aNp5uxo
 M4QCuxOUsvp75b9mBEuVhz/CCgkq/Hm8HlMZX6/lDTyvNc7qKQnVKWCx95zGsKem
 vPMKxfrKNPY6J08LcjXtqfNNdJEQ5Z1St2a9HiDg5eWuWT2vCgRrjizkMH5zbKEx
 5BJbJlifY1JN7f5+guh9trQRRfB4CTAuuTOLrOH7xbST7jGNaFKAlmzsV0s0xDxF
 /47GcSz5uzLY4T2S4BMSu88mt3gVMTUIaZYxphHvCHqiOMuYG33HHLm8FyAdMBS2
 hhyG4UcKTJtxiO5ymqv5
 =RpPT
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/amit-migration/tags/migration-2.7-1' into staging

migration fixes:

- ensure src block devices continue fine after a failed migration
- fail on migration blockers; helps 9p savevm/loadvm
- move autoconverge commands out of experimental state
- move the migration-specific qjson in migration/

# gpg: Signature made Mon 23 May 2016 18:15:09 BST using RSA key ID 657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"

* remotes/amit-migration/tags/migration-2.7-1:
  migration: regain control of images when migration fails to complete
  savevm: fail if migration blockers are present
  migration: Promote improved autoconverge commands out of experimental state
  migration/qjson: Drop gratuitous use of QOM
  migration: Move qjson.[ch] to migration/

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-05-24 12:21:07 +01:00
parent b0f6ef8915 fe904ea824
commit 99694362ee
14 changed files with 140 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.objs
View File

@ -52,7 +52,6 @@ common-obj-$(CONFIG_LINUX) += fsdev/
common-obj-y += migration/ common-obj-y += migration/
common-obj-y += qemu-char.o #aio.o common-obj-y += qemu-char.o #aio.o
common-obj-y += page_cache.o common-obj-y += page_cache.o
common-obj-y += qjson.o
common-obj-$(CONFIG_SPICE) += spice-qemu-char.o common-obj-$(CONFIG_SPICE) += spice-qemu-char.o

28
hmp.c
View File

@ -235,9 +235,9 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict)
info->xbzrle_cache->overflow); info->xbzrle_cache->overflow);
} }
if (info->has_x_cpu_throttle_percentage) { if (info->has_cpu_throttle_percentage) {
monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n", monitor_printf(mon, "cpu throttle percentage: %" PRIu64 "\n",
info->x_cpu_throttle_percentage); info->cpu_throttle_percentage);
} }
qapi_free_MigrationInfo(info); qapi_free_MigrationInfo(info);
@ -281,11 +281,11 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict)
MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS], MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS],
params->decompress_threads); params->decompress_threads);
monitor_printf(mon, " %s: %" PRId64, monitor_printf(mon, " %s: %" PRId64,
MigrationParameter_lookup[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL], MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL],
params->x_cpu_throttle_initial); params->cpu_throttle_initial);
monitor_printf(mon, " %s: %" PRId64, monitor_printf(mon, " %s: %" PRId64,
MigrationParameter_lookup[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT], MigrationParameter_lookup[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT],
params->x_cpu_throttle_increment); params->cpu_throttle_increment);
monitor_printf(mon, "\n"); monitor_printf(mon, "\n");
} }
@ -1240,8 +1240,8 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
bool has_compress_level = false; bool has_compress_level = false;
bool has_compress_threads = false; bool has_compress_threads = false;
bool has_decompress_threads = false; bool has_decompress_threads = false;
bool has_x_cpu_throttle_initial = false; bool has_cpu_throttle_initial = false;
bool has_x_cpu_throttle_increment = false; bool has_cpu_throttle_increment = false;
int i; int i;
for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) { for (i = 0; i < MIGRATION_PARAMETER__MAX; i++) {
@ -1256,18 +1256,18 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
case MIGRATION_PARAMETER_DECOMPRESS_THREADS: case MIGRATION_PARAMETER_DECOMPRESS_THREADS:
has_decompress_threads = true; has_decompress_threads = true;
break; break;
case MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL: case MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL:
has_x_cpu_throttle_initial = true; has_cpu_throttle_initial = true;
break; break;
case MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT: case MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT:
has_x_cpu_throttle_increment = true; has_cpu_throttle_increment = true;
break; break;
} }
qmp_migrate_set_parameters(has_compress_level, value, qmp_migrate_set_parameters(has_compress_level, value,
has_compress_threads, value, has_compress_threads, value,
has_decompress_threads, value, has_decompress_threads, value,
has_x_cpu_throttle_initial, value, has_cpu_throttle_initial, value,
has_x_cpu_throttle_increment, value, has_cpu_throttle_increment, value,
&err); &err);
break; break;
} }

1
include/migration/migration.h
View File

@ -210,6 +210,7 @@ int migrate_fd_close(MigrationState *s);
void add_migration_state_change_notifier(Notifier *notify); void add_migration_state_change_notifier(Notifier *notify);
void remove_migration_state_change_notifier(Notifier *notify); void remove_migration_state_change_notifier(Notifier *notify);
MigrationState *migrate_init(const MigrationParams *params); MigrationState *migrate_init(const MigrationParams *params);
bool migration_is_blocked(Error **errp);
bool migration_in_setup(MigrationState *); bool migration_in_setup(MigrationState *);
bool migration_has_finished(MigrationState *); bool migration_has_finished(MigrationState *);
bool migration_has_failed(MigrationState *); bool migration_has_failed(MigrationState *);

2
include/qjson.h → include/migration/qjson.h
View File

@ -13,10 +13,10 @@
#ifndef QEMU_QJSON_H #ifndef QEMU_QJSON_H
#define QEMU_QJSON_H #define QEMU_QJSON_H
#define TYPE_QJSON "QJSON"
typedef struct QJSON QJSON; typedef struct QJSON QJSON;
QJSON *qjson_new(void); QJSON *qjson_new(void);
void qjson_destroy(QJSON *json);
void json_prop_str(QJSON *json, const char *name, const char *str); void json_prop_str(QJSON *json, const char *name, const char *str);
void json_prop_int(QJSON *json, const char *name, int64_t val); void json_prop_int(QJSON *json, const char *name, int64_t val);
void json_end_array(QJSON *json); void json_end_array(QJSON *json);

2
include/migration/vmstate.h
View File

@ -29,7 +29,7 @@
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
#include <migration/qemu-file.h> #include <migration/qemu-file.h>
#endif #endif
#include <qjson.h> #include "migration/qjson.h"
typedef void SaveStateHandler(QEMUFile *f, void *opaque); typedef void SaveStateHandler(QEMUFile *f, void *opaque);
typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id); typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);

1
migration/Makefile.objs
View File

@ -2,6 +2,7 @@ common-obj-y += migration.o tcp.o
common-obj-y += vmstate.o common-obj-y += vmstate.o
common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o common-obj-y += qemu-file.o qemu-file-buf.o qemu-file-unix.o qemu-file-stdio.o
common-obj-y += xbzrle.o postcopy-ram.o common-obj-y += xbzrle.o postcopy-ram.o
common-obj-y += qjson.o
common-obj-$(CONFIG_RDMA) += rdma.o common-obj-$(CONFIG_RDMA) += rdma.o
common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o common-obj-$(CONFIG_POSIX) += exec.o unix.o fd.o

94
migration/migration.c
View File

@ -50,8 +50,8 @@
/*0: means nocompress, 1: best speed, ... 9: best compress ratio */ /*0: means nocompress, 1: best speed, ... 9: best compress ratio */
#define DEFAULT_MIGRATE_COMPRESS_LEVEL 1 #define DEFAULT_MIGRATE_COMPRESS_LEVEL 1
/* Define default autoconverge cpu throttle migration parameters */ /* Define default autoconverge cpu throttle migration parameters */
#define DEFAULT_MIGRATE_X_CPU_THROTTLE_INITIAL 20 #define DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL 20
#define DEFAULT_MIGRATE_X_CPU_THROTTLE_INCREMENT 10 #define DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT 10
/* Migration XBZRLE default cache size */ /* Migration XBZRLE default cache size */
#define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024) #define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024)
@ -87,10 +87,10 @@ MigrationState *migrate_get_current(void)
DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT, DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,
.parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] = .parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT, DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,
.parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL] = .parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL] =
DEFAULT_MIGRATE_X_CPU_THROTTLE_INITIAL, DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL,
.parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] = .parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT] =
DEFAULT_MIGRATE_X_CPU_THROTTLE_INCREMENT, DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT,
}; };
if (!once) { if (!once) {
@ -521,10 +521,10 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS]; s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];
params->decompress_threads = params->decompress_threads =
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS]; s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];
params->x_cpu_throttle_initial = params->cpu_throttle_initial =
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL]; s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL];
params->x_cpu_throttle_increment = params->cpu_throttle_increment =
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT]; s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT];
return params; return params;
} }
@ -607,8 +607,8 @@ MigrationInfo *qmp_query_migrate(Error **errp)
} }
if (cpu_throttle_active()) { if (cpu_throttle_active()) {
info->has_x_cpu_throttle_percentage = true; info->has_cpu_throttle_percentage = true;
info->x_cpu_throttle_percentage = cpu_throttle_get_percentage(); info->cpu_throttle_percentage = cpu_throttle_get_percentage();
} }
get_xbzrle_cache_stats(info); get_xbzrle_cache_stats(info);
@ -718,10 +718,10 @@ void qmp_migrate_set_parameters(bool has_compress_level,
int64_t compress_threads, int64_t compress_threads,
bool has_decompress_threads, bool has_decompress_threads,
int64_t decompress_threads, int64_t decompress_threads,
bool has_x_cpu_throttle_initial, bool has_cpu_throttle_initial,
int64_t x_cpu_throttle_initial, int64_t cpu_throttle_initial,
bool has_x_cpu_throttle_increment, bool has_cpu_throttle_increment,
int64_t x_cpu_throttle_increment, Error **errp) int64_t cpu_throttle_increment, Error **errp)
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
@ -744,16 +744,16 @@ void qmp_migrate_set_parameters(bool has_compress_level,
"is invalid, it should be in the range of 1 to 255"); "is invalid, it should be in the range of 1 to 255");
return; return;
} }
if (has_x_cpu_throttle_initial && if (has_cpu_throttle_initial &&
(x_cpu_throttle_initial < 1 || x_cpu_throttle_initial > 99)) { (cpu_throttle_initial < 1 || cpu_throttle_initial > 99)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"x_cpu_throttle_initial", "cpu_throttle_initial",
"an integer in the range of 1 to 99"); "an integer in the range of 1 to 99");
} }
if (has_x_cpu_throttle_increment && if (has_cpu_throttle_increment &&
(x_cpu_throttle_increment < 1 || x_cpu_throttle_increment > 99)) { (cpu_throttle_increment < 1 || cpu_throttle_increment > 99)) {
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
"x_cpu_throttle_increment", "cpu_throttle_increment",
"an integer in the range of 1 to 99"); "an integer in the range of 1 to 99");
} }
@ -767,14 +767,14 @@ void qmp_migrate_set_parameters(bool has_compress_level,
s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] = s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =
decompress_threads; decompress_threads;
} }
if (has_x_cpu_throttle_initial) { if (has_cpu_throttle_initial) {
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL] = s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL] =
x_cpu_throttle_initial; cpu_throttle_initial;
} }
if (has_x_cpu_throttle_increment) { if (has_cpu_throttle_increment) {
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] = s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT] =
x_cpu_throttle_increment; cpu_throttle_increment;
} }
} }
@ -992,6 +992,20 @@ void qmp_migrate_incoming(const char *uri, Error **errp)
once = false; once = false;
} }
bool migration_is_blocked(Error **errp)
{
if (qemu_savevm_state_blocked(errp)) {
return true;
}
if (migration_blockers) {
*errp = error_copy(migration_blockers->data);
return true;
}
return false;
}
void qmp_migrate(const char *uri, bool has_blk, bool blk, void qmp_migrate(const char *uri, bool has_blk, bool blk,
bool has_inc, bool inc, bool has_detach, bool detach, bool has_inc, bool inc, bool has_detach, bool detach,
Error **errp) Error **errp)
@ -1014,12 +1028,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
return; return;
} }
if (qemu_savevm_state_blocked(errp)) { if (migration_is_blocked(errp)) {
return;
}
if (migration_blockers) {
*errp = error_copy(migration_blockers->data);
return; return;
} }
@ -1597,19 +1606,32 @@ static void migration_completion(MigrationState *s, int current_active_state,
rp_error = await_return_path_close_on_source(s); rp_error = await_return_path_close_on_source(s);
trace_migration_completion_postcopy_end_after_rp(rp_error); trace_migration_completion_postcopy_end_after_rp(rp_error);
if (rp_error) { if (rp_error) {
goto fail; goto fail_invalidate;
} }
} }
if (qemu_file_get_error(s->to_dst_file)) { if (qemu_file_get_error(s->to_dst_file)) {
trace_migration_completion_file_err(); trace_migration_completion_file_err();
goto fail; goto fail_invalidate;
} }
migrate_set_state(&s->state, current_active_state, migrate_set_state(&s->state, current_active_state,
MIGRATION_STATUS_COMPLETED); MIGRATION_STATUS_COMPLETED);
return; return;
fail_invalidate:
/* If not doing postcopy, vm_start() will be called: let's regain
* control on images.
*/
if (s->state == MIGRATION_STATUS_ACTIVE) {
Error *local_err = NULL;
bdrv_invalidate_cache_all(&local_err);
if (local_err) {
error_report_err(local_err);
}
}
fail: fail:
migrate_set_state(&s->state, current_active_state, migrate_set_state(&s->state, current_active_state,
MIGRATION_STATUS_FAILED); MIGRATION_STATUS_FAILED);

58
qjson.c → migration/qjson.c
View File

@ -1,5 +1,5 @@
/* /*
* QEMU JSON writer * A simple JSON writer
* *
* Copyright Alexander Graf * Copyright Alexander Graf
* *
@ -11,21 +11,27 @@
* *
*/ */
/*
* Type QJSON lets you build JSON text. Its interface mirrors (a
* subset of) abstract JSON syntax.
*
* It does *not* detect incorrect use. It happily produces invalid
* JSON then. This is what migration wants.
*
* QAPI output visitors also produce JSON text. However, they do
* assert their preconditions and invariants, and therefore abort on
* incorrect use.
*/
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <qapi/qmp/qstring.h> #include "qapi/qmp/qstring.h"
#include <glib.h> #include "migration/qjson.h"
#include <qjson.h>
#include <qemu/module.h>
#include <qom/object.h>
struct QJSON { struct QJSON {
Object obj;
QString *str; QString *str;
bool omit_comma; bool omit_comma;
}; };
#define QJSON(obj) OBJECT_CHECK(QJSON, (obj), TYPE_QJSON)
static void json_emit_element(QJSON *json, const char *name) static void json_emit_element(QJSON *json, const char *name)
{ {
/* Check whether we need to print a , before an element */ /* Check whether we need to print a , before an element */
@ -89,7 +95,10 @@ const char *qjson_get_str(QJSON *json)
QJSON *qjson_new(void) QJSON *qjson_new(void)
{ {
QJSON *json = QJSON(object_new(TYPE_QJSON)); QJSON *json = g_new0(QJSON, 1);
json->str = qstring_from_str("{ ");
json->omit_comma = true;
return json; return json;
} }
@ -98,32 +107,7 @@ void qjson_finish(QJSON *json)
json_end_object(json); json_end_object(json);
} }
static void qjson_initfn(Object *obj) void qjson_destroy(QJSON *json)
{ {
QJSON *json = QJSON(obj); g_free(json);
json->str = qstring_from_str("{ ");
json->omit_comma = true;
} }
static void qjson_finalizefn(Object *obj)
{
QJSON *json = QJSON(obj);
qobject_decref(QOBJECT(json->str));
}
static const TypeInfo qjson_type_info = {
.name = TYPE_QJSON,
.parent = TYPE_OBJECT,
.instance_size = sizeof(QJSON),
.instance_init = qjson_initfn,
.instance_finalize = qjson_finalizefn,
};
static void qjson_register_types(void)
{
type_register_static(&qjson_type_info);
}
type_init(qjson_register_types)

4
migration/ram.c
View File

@ -430,9 +430,9 @@ static void mig_throttle_guest_down(void)
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
uint64_t pct_initial = uint64_t pct_initial =
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL]; s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INITIAL];
uint64_t pct_icrement = uint64_t pct_icrement =
s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT]; s->parameters[MIGRATION_PARAMETER_CPU_THROTTLE_INCREMENT];
/* We have not started throttling yet. Let's start it. */ /* We have not started throttling yet. Let's start it. */
if (!cpu_throttle_active()) { if (!cpu_throttle_active()) {

4
migration/savevm.c
View File

@ -1115,7 +1115,7 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only)
qemu_put_be32(f, vmdesc_len); qemu_put_be32(f, vmdesc_len);
qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len); qemu_put_buffer(f, (uint8_t *)qjson_get_str(vmdesc), vmdesc_len);
} }
object_unref(OBJECT(vmdesc)); qjson_destroy(vmdesc);
qemu_fflush(f); qemu_fflush(f);
} }
@ -1170,7 +1170,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
MigrationState *ms = migrate_init(&params); MigrationState *ms = migrate_init(&params);
ms->to_dst_file = f; ms->to_dst_file = f;
if (qemu_savevm_state_blocked(errp)) { if (migration_is_blocked(errp)) {
return -EINVAL; return -EINVAL;
} }

1
migration/vmstate.c
View File

@ -6,7 +6,6 @@
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "trace.h" #include "trace.h"
#include "qjson.h"
static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd, static void vmstate_subsection_save(QEMUFile *f, const VMStateDescription *vmsd,
void *opaque, QJSON *vmdesc); void *opaque, QJSON *vmdesc);

54
qapi-schema.json
View File

@ -480,9 +480,9 @@
# may be expensive, but do not actually occur during the iterative # may be expensive, but do not actually occur during the iterative
# migration rounds themselves. (since 1.6) # migration rounds themselves. (since 1.6)
# #
# @x-cpu-throttle-percentage: #optional percentage of time guest cpus are being # @cpu-throttle-percentage: #optional percentage of time guest cpus are being
# throttled during auto-converge. This is only present when auto-converge # throttled during auto-converge. This is only present when auto-converge
# has started throttling guest cpus. (Since 2.5) # has started throttling guest cpus. (Since 2.7)
# #
# Since: 0.14.0 # Since: 0.14.0
## ##
@ -494,7 +494,7 @@
'*expected-downtime': 'int', '*expected-downtime': 'int',
'*downtime': 'int', '*downtime': 'int',
'*setup-time': 'int', '*setup-time': 'int',
'*x-cpu-throttle-percentage': 'int'} } '*cpu-throttle-percentage': 'int'} }
## ##
# @query-migrate # @query-migrate
@ -605,18 +605,18 @@
# compression, so set the decompress-threads to the number about 1/4 # compression, so set the decompress-threads to the number about 1/4
# of compress-threads is adequate. # of compress-threads is adequate.
# #
# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled # @cpu-throttle-initial: Initial percentage of time guest cpus are throttled
# when migration auto-converge is activated. The # when migration auto-converge is activated. The
# default value is 20. (Since 2.5) # default value is 20. (Since 2.7)
# #
# @x-cpu-throttle-increment: throttle percentage increase each time # @cpu-throttle-increment: throttle percentage increase each time
# auto-converge detects that migration is not making # auto-converge detects that migration is not making
# progress. The default value is 10. (Since 2.5) # progress. The default value is 10. (Since 2.7)
# Since: 2.4 # Since: 2.4
## ##
{ 'enum': 'MigrationParameter', { 'enum': 'MigrationParameter',
'data': ['compress-level', 'compress-threads', 'decompress-threads', 'data': ['compress-level', 'compress-threads', 'decompress-threads',
'x-cpu-throttle-initial', 'x-cpu-throttle-increment'] } 'cpu-throttle-initial', 'cpu-throttle-increment'] }
# #
# @migrate-set-parameters # @migrate-set-parameters
@ -629,21 +629,21 @@
# #
# @decompress-threads: decompression thread count # @decompress-threads: decompression thread count
# #
# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled # @cpu-throttle-initial: Initial percentage of time guest cpus are throttled
# when migration auto-converge is activated. The # when migration auto-converge is activated. The
# default value is 20. (Since 2.5) # default value is 20. (Since 2.7)
# #
# @x-cpu-throttle-increment: throttle percentage increase each time # @cpu-throttle-increment: throttle percentage increase each time
# auto-converge detects that migration is not making # auto-converge detects that migration is not making
# progress. The default value is 10. (Since 2.5) # progress. The default value is 10. (Since 2.7)
# Since: 2.4 # Since: 2.4
## ##
{ 'command': 'migrate-set-parameters', { 'command': 'migrate-set-parameters',
'data': { '*compress-level': 'int', 'data': { '*compress-level': 'int',
'*compress-threads': 'int', '*compress-threads': 'int',
'*decompress-threads': 'int', '*decompress-threads': 'int',
'*x-cpu-throttle-initial': 'int', '*cpu-throttle-initial': 'int',
'*x-cpu-throttle-increment': 'int'} } '*cpu-throttle-increment': 'int'} }
# #
# @MigrationParameters # @MigrationParameters
@ -654,13 +654,13 @@
# #
# @decompress-threads: decompression thread count # @decompress-threads: decompression thread count
# #
# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled # @cpu-throttle-initial: Initial percentage of time guest cpus are throttled
# when migration auto-converge is activated. The # when migration auto-converge is activated. The
# default value is 20. (Since 2.5) # default value is 20. (Since 2.7)
# #
# @x-cpu-throttle-increment: throttle percentage increase each time # @cpu-throttle-increment: throttle percentage increase each time
# auto-converge detects that migration is not making # auto-converge detects that migration is not making
# progress. The default value is 10. (Since 2.5) # progress. The default value is 10. (Since 2.7)
# #
# Since: 2.4 # Since: 2.4
## ##
@ -668,8 +668,8 @@
'data': { 'compress-level': 'int', 'data': { 'compress-level': 'int',
'compress-threads': 'int', 'compress-threads': 'int',
'decompress-threads': 'int', 'decompress-threads': 'int',
'x-cpu-throttle-initial': 'int', 'cpu-throttle-initial': 'int',
'x-cpu-throttle-increment': 'int'} } 'cpu-throttle-increment': 'int'} }
## ##
# @query-migrate-parameters # @query-migrate-parameters
# #

22
qmp-commands.hx
View File

@ -3747,10 +3747,10 @@ Set migration parameters
- "compress-level": set compression level during migration (json-int) - "compress-level": set compression level during migration (json-int)
- "compress-threads": set compression thread count for migration (json-int) - "compress-threads": set compression thread count for migration (json-int)
- "decompress-threads": set decompression thread count for migration (json-int) - "decompress-threads": set decompression thread count for migration (json-int)
- "x-cpu-throttle-initial": set initial percentage of time guest cpus are - "cpu-throttle-initial": set initial percentage of time guest cpus are
throttled for auto-converge (json-int) throttled for auto-converge (json-int)
- "x-cpu-throttle-increment": set throttle increasing percentage for - "cpu-throttle-increment": set throttle increasing percentage for
auto-converge (json-int) auto-converge (json-int)
Arguments: Arguments:
@ -3764,7 +3764,7 @@ EQMP
{ {
.name = "migrate-set-parameters", .name = "migrate-set-parameters",
.args_type = .args_type =
"compress-level:i?,compress-threads:i?,decompress-threads:i?,x-cpu-throttle-initial:i?,x-cpu-throttle-increment:i?", "compress-level:i?,compress-threads:i?,decompress-threads:i?,cpu-throttle-initial:i?,cpu-throttle-increment:i?",
.mhandler.cmd_new = qmp_marshal_migrate_set_parameters, .mhandler.cmd_new = qmp_marshal_migrate_set_parameters,
}, },
SQMP SQMP
@ -3777,10 +3777,10 @@ Query current migration parameters
- "compress-level" : compression level value (json-int) - "compress-level" : compression level value (json-int)
- "compress-threads" : compression thread count value (json-int) - "compress-threads" : compression thread count value (json-int)
- "decompress-threads" : decompression thread count value (json-int) - "decompress-threads" : decompression thread count value (json-int)
- "x-cpu-throttle-initial" : initial percentage of time guest cpus are - "cpu-throttle-initial" : initial percentage of time guest cpus are
throttled (json-int) throttled (json-int)
- "x-cpu-throttle-increment" : throttle increasing percentage for - "cpu-throttle-increment" : throttle increasing percentage for
auto-converge (json-int) auto-converge (json-int)
Arguments: Arguments:
@ -3790,10 +3790,10 @@ Example:
<- { <- {
"return": { "return": {
"decompress-threads": 2, "decompress-threads": 2,
"x-cpu-throttle-increment": 10, "cpu-throttle-increment": 10,
"compress-threads": 8, "compress-threads": 8,
"compress-level": 1, "compress-level": 1,
"x-cpu-throttle-initial": 20 "cpu-throttle-initial": 20
} }
} }

2
tests/Makefile
View File

@ -439,7 +439,7 @@ tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o \
$(test-qapi-obj-y) $(test-qapi-obj-y)
tests/test-vmstate$(EXESUF): tests/test-vmstate.o \ tests/test-vmstate$(EXESUF): tests/test-vmstate.o \
migration/vmstate.o migration/qemu-file.o migration/qemu-file-buf.o \ migration/vmstate.o migration/qemu-file.o migration/qemu-file-buf.o \
migration/qemu-file-unix.o qjson.o \ migration/qemu-file-unix.o migration/qjson.o \
$(test-qom-obj-y) $(test-qom-obj-y)
tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \ tests/test-timed-average$(EXESUF): tests/test-timed-average.o qemu-timer.o \
$(test-util-obj-y) $(test-util-obj-y)