mirror of https://github.com/proxmox/mirror_qemu
migration: move migration_global_dump() to migration-hmp-cmds.c
It is only used there, so we can make it static. Once there, remove spice.h that it is not used. Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Peter Xu <peterx@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- fix David Edmonson ui/qemu-spice.h unintended removalmaster
parent
5d39f44d7a
commit
c938157713
|
@ -66,7 +66,6 @@ bool migration_has_finished(MigrationState *);
|
||||||
bool migration_has_failed(MigrationState *);
|
bool migration_has_failed(MigrationState *);
|
||||||
/* ...and after the device transmission */
|
/* ...and after the device transmission */
|
||||||
bool migration_in_postcopy_after_devices(MigrationState *);
|
bool migration_in_postcopy_after_devices(MigrationState *);
|
||||||
void migration_global_dump(Monitor *mon);
|
|
||||||
/* True if incoming migration entered POSTCOPY_INCOMING_DISCARD */
|
/* True if incoming migration entered POSTCOPY_INCOMING_DISCARD */
|
||||||
bool migration_in_incoming_postcopy(void);
|
bool migration_in_incoming_postcopy(void);
|
||||||
/* True if incoming migration entered POSTCOPY_INCOMING_ADVISE */
|
/* True if incoming migration entered POSTCOPY_INCOMING_ADVISE */
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
|
|
||||||
#include "qemu/osdep.h"
|
#include "qemu/osdep.h"
|
||||||
#include "block/qapi.h"
|
#include "block/qapi.h"
|
||||||
#include "migration/misc.h"
|
|
||||||
#include "migration/snapshot.h"
|
#include "migration/snapshot.h"
|
||||||
#include "monitor/hmp.h"
|
#include "monitor/hmp.h"
|
||||||
#include "monitor/monitor.h"
|
#include "monitor/monitor.h"
|
||||||
|
@ -30,6 +29,27 @@
|
||||||
#include "qemu/sockets.h"
|
#include "qemu/sockets.h"
|
||||||
#include "sysemu/runstate.h"
|
#include "sysemu/runstate.h"
|
||||||
#include "ui/qemu-spice.h"
|
#include "ui/qemu-spice.h"
|
||||||
|
#include "sysemu/sysemu.h"
|
||||||
|
#include "migration.h"
|
||||||
|
|
||||||
|
static void migration_global_dump(Monitor *mon)
|
||||||
|
{
|
||||||
|
MigrationState *ms = migrate_get_current();
|
||||||
|
|
||||||
|
monitor_printf(mon, "globals:\n");
|
||||||
|
monitor_printf(mon, "store-global-state: %s\n",
|
||||||
|
ms->store_global_state ? "on" : "off");
|
||||||
|
monitor_printf(mon, "only-migratable: %s\n",
|
||||||
|
only_migratable ? "on" : "off");
|
||||||
|
monitor_printf(mon, "send-configuration: %s\n",
|
||||||
|
ms->send_configuration ? "on" : "off");
|
||||||
|
monitor_printf(mon, "send-section-footer: %s\n",
|
||||||
|
ms->send_section_footer ? "on" : "off");
|
||||||
|
monitor_printf(mon, "decompress-error-check: %s\n",
|
||||||
|
ms->decompress_error_check ? "on" : "off");
|
||||||
|
monitor_printf(mon, "clear-bitmap-shift: %u\n",
|
||||||
|
ms->clear_bitmap_shift);
|
||||||
|
}
|
||||||
|
|
||||||
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
|
void hmp_info_migrate(Monitor *mon, const QDict *qdict)
|
||||||
{
|
{
|
||||||
|
|
|
@ -4416,25 +4416,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
|
||||||
s->migration_thread_running = true;
|
s->migration_thread_running = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void migration_global_dump(Monitor *mon)
|
|
||||||
{
|
|
||||||
MigrationState *ms = migrate_get_current();
|
|
||||||
|
|
||||||
monitor_printf(mon, "globals:\n");
|
|
||||||
monitor_printf(mon, "store-global-state: %s\n",
|
|
||||||
ms->store_global_state ? "on" : "off");
|
|
||||||
monitor_printf(mon, "only-migratable: %s\n",
|
|
||||||
only_migratable ? "on" : "off");
|
|
||||||
monitor_printf(mon, "send-configuration: %s\n",
|
|
||||||
ms->send_configuration ? "on" : "off");
|
|
||||||
monitor_printf(mon, "send-section-footer: %s\n",
|
|
||||||
ms->send_section_footer ? "on" : "off");
|
|
||||||
monitor_printf(mon, "decompress-error-check: %s\n",
|
|
||||||
ms->decompress_error_check ? "on" : "off");
|
|
||||||
monitor_printf(mon, "clear-bitmap-shift: %u\n",
|
|
||||||
ms->clear_bitmap_shift);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define DEFINE_PROP_MIG_CAP(name, x) \
|
#define DEFINE_PROP_MIG_CAP(name, x) \
|
||||||
DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
|
DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue