migration: Move the QMP command from monitor/ to migration/
This moves the command from MAINTAINERS sections "Human Monitor (HMP)" and "QMP" to "Migration". Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20230124121946.1139465-19-armbru@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
parent
119f50ce30
commit
27be86351e
|
@ -61,6 +61,7 @@
|
||||||
#include "sysemu/cpus.h"
|
#include "sysemu/cpus.h"
|
||||||
#include "yank_functions.h"
|
#include "yank_functions.h"
|
||||||
#include "sysemu/qtest.h"
|
#include "sysemu/qtest.h"
|
||||||
|
#include "ui/qemu-spice.h"
|
||||||
|
|
||||||
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */
|
#define MAX_THROTTLE (128 << 20) /* Migration transfer speed throttling */
|
||||||
|
|
||||||
|
@ -963,6 +964,35 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
|
||||||
return params;
|
return params;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void qmp_client_migrate_info(const char *protocol, const char *hostname,
|
||||||
|
bool has_port, int64_t port,
|
||||||
|
bool has_tls_port, int64_t tls_port,
|
||||||
|
const char *cert_subject,
|
||||||
|
Error **errp)
|
||||||
|
{
|
||||||
|
if (strcmp(protocol, "spice") == 0) {
|
||||||
|
if (!qemu_using_spice(errp)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!has_port && !has_tls_port) {
|
||||||
|
error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (qemu_spice.migrate_info(hostname,
|
||||||
|
has_port ? port : -1,
|
||||||
|
has_tls_port ? tls_port : -1,
|
||||||
|
cert_subject)) {
|
||||||
|
error_setg(errp, "Could not set up display for migration");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
|
||||||
|
}
|
||||||
|
|
||||||
AnnounceParameters *migrate_announce_params(void)
|
AnnounceParameters *migrate_announce_params(void)
|
||||||
{
|
{
|
||||||
static AnnounceParameters ap;
|
static AnnounceParameters ap;
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
#include "monitor/qdev.h"
|
#include "monitor/qdev.h"
|
||||||
#include "exec/gdbstub.h"
|
#include "exec/gdbstub.h"
|
||||||
#include "net/slirp.h"
|
#include "net/slirp.h"
|
||||||
#include "ui/qemu-spice.h"
|
|
||||||
#include "qemu/ctype.h"
|
#include "qemu/ctype.h"
|
||||||
#include "disas/disas.h"
|
#include "disas/disas.h"
|
||||||
#include "qemu/log.h"
|
#include "qemu/log.h"
|
||||||
|
@ -43,7 +42,6 @@
|
||||||
#include "exec/ioport.h"
|
#include "exec/ioport.h"
|
||||||
#include "block/block-hmp-cmds.h"
|
#include "block/block-hmp-cmds.h"
|
||||||
#include "qapi/qapi-commands-control.h"
|
#include "qapi/qapi-commands-control.h"
|
||||||
#include "qapi/qapi-commands-migration.h"
|
|
||||||
#include "qapi/qapi-commands-misc.h"
|
#include "qapi/qapi-commands-misc.h"
|
||||||
#include "qapi/qapi-commands-run-state.h"
|
#include "qapi/qapi-commands-run-state.h"
|
||||||
#include "qapi/qapi-commands-machine.h"
|
#include "qapi/qapi-commands-machine.h"
|
||||||
|
@ -291,35 +289,6 @@ static void hmp_info_history(Monitor *mon, const QDict *qdict)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void qmp_client_migrate_info(const char *protocol, const char *hostname,
|
|
||||||
bool has_port, int64_t port,
|
|
||||||
bool has_tls_port, int64_t tls_port,
|
|
||||||
const char *cert_subject,
|
|
||||||
Error **errp)
|
|
||||||
{
|
|
||||||
if (strcmp(protocol, "spice") == 0) {
|
|
||||||
if (!qemu_using_spice(errp)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!has_port && !has_tls_port) {
|
|
||||||
error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (qemu_spice.migrate_info(hostname,
|
|
||||||
has_port ? port : -1,
|
|
||||||
has_tls_port ? tls_port : -1,
|
|
||||||
cert_subject)) {
|
|
||||||
error_setg(errp, "Could not set up display for migration");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hmp_logfile(Monitor *mon, const QDict *qdict)
|
static void hmp_logfile(Monitor *mon, const QDict *qdict)
|
||||||
{
|
{
|
||||||
Error *err = NULL;
|
Error *err = NULL;
|
||||||
|
|
Loading…
Reference in New Issue