Notice that the live migration users never unregister, so no problem
about freeing the ops structure.
Signed-off-by: Juan Quintela <quintela@redhat.com>
#define MAX_WAIT 50 /* ms, half buffered_file limit */
#define MAX_WAIT 50 /* ms, half buffered_file limit */
-int ram_save_live(QEMUFile *f, int stage, void *opaque)
+static int ram_save_live(QEMUFile *f, int stage, void *opaque)
{
ram_addr_t addr;
uint64_t bytes_transferred_last;
{
ram_addr_t addr;
uint64_t bytes_transferred_last;
-int ram_load(QEMUFile *f, void *opaque, int version_id)
+static int ram_load(QEMUFile *f, void *opaque, int version_id)
{
ram_addr_t addr;
int flags, ret = 0;
{
ram_addr_t addr;
int flags, ret = 0;
+SaveVMHandlers savevm_ram_handlers = {
+ .save_live_state = ram_save_live,
+ .load_state = ram_load,
+};
+
#ifdef HAS_AUDIO
struct soundhw {
const char *name;
#ifdef HAS_AUDIO
struct soundhw {
const char *name;
block_mig_state.blk_enable |= params->shared;
}
block_mig_state.blk_enable |= params->shared;
}
+SaveVMHandlers savevm_block_handlers = {
+ .set_params = block_set_params,
+ .save_live_state = block_save_live,
+ .load_state = block_load,
+};
+
void blk_mig_init(void)
{
QSIMPLEQ_INIT(&block_mig_state.bmds_list);
QSIMPLEQ_INIT(&block_mig_state.blk_list);
void blk_mig_init(void)
{
QSIMPLEQ_INIT(&block_mig_state.bmds_list);
QSIMPLEQ_INIT(&block_mig_state.blk_list);
- register_savevm_live(NULL, "block", 0, 1, block_set_params,
- block_save_live, NULL, block_load, &block_mig_state);
+ register_savevm_live(NULL, "block", 0, 1, &savevm_block_handlers,
+ &block_mig_state);
#include "qemu-common.h"
#include "notify.h"
#include "error.h"
#include "qemu-common.h"
#include "notify.h"
#include "error.h"
struct MigrationParams {
bool blk;
struct MigrationParams {
bool blk;
uint64_t ram_bytes_transferred(void);
uint64_t ram_bytes_total(void);
uint64_t ram_bytes_transferred(void);
uint64_t ram_bytes_total(void);
-int ram_save_live(QEMUFile *f, int stage, void *opaque);
-int ram_load(QEMUFile *f, void *opaque, int version_id);
+extern SaveVMHandlers savevm_ram_handlers;
/**
* @migrate_add_blocker - prevent migration from proceeding
/**
* @migrate_add_blocker - prevent migration from proceeding
const char *idstr,
int instance_id,
int version_id,
const char *idstr,
int instance_id,
int version_id,
- SaveSetParamsHandler *set_params,
- SaveLiveStateHandler *save_live_state,
- SaveStateHandler *save_state,
- LoadStateHandler *load_state,
void *opaque)
{
SaveStateEntry *se;
void *opaque)
{
SaveStateEntry *se;
se = g_malloc0(sizeof(SaveStateEntry));
se->version_id = version_id;
se->section_id = global_section_id++;
se = g_malloc0(sizeof(SaveStateEntry));
se->version_id = version_id;
se->section_id = global_section_id++;
- se->ops = g_malloc0(sizeof(SaveVMHandlers));
- se->ops->set_params = set_params;
- se->ops->save_live_state = save_live_state;
- se->ops->save_state = save_state;
- se->ops->load_state = load_state;
se->opaque = opaque;
se->vmsd = NULL;
se->no_migrate = 0;
/* if this is a live_savem then set is_ram */
se->opaque = opaque;
se->vmsd = NULL;
se->no_migrate = 0;
/* if this is a live_savem then set is_ram */
- if (save_live_state != NULL) {
+ if (ops->save_live_state != NULL) {
LoadStateHandler *load_state,
void *opaque)
{
LoadStateHandler *load_state,
void *opaque)
{
+ SaveVMHandlers *ops = g_malloc0(sizeof(SaveVMHandlers));
+ ops->save_state = save_state;
+ ops->load_state = load_state;
return register_savevm_live(dev, idstr, instance_id, version_id,
return register_savevm_live(dev, idstr, instance_id, version_id,
- NULL, NULL, save_state, load_state, opaque);
}
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque)
}
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque)
default_drive(default_sdcard, snapshot, machine->use_scsi,
IF_SD, 0, SD_OPTS);
default_drive(default_sdcard, snapshot, machine->use_scsi,
IF_SD, 0, SD_OPTS);
- register_savevm_live(NULL, "ram", 0, 4, NULL, ram_save_live, NULL,
- ram_load, NULL);
+ register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);
if (nb_numa_nodes > 0) {
int i;
if (nb_numa_nodes > 0) {
int i;
const char *idstr,
int instance_id,
int version_id,
const char *idstr,
int instance_id,
int version_id,
- SaveSetParamsHandler *set_params,
- SaveLiveStateHandler *save_live_state,
- SaveStateHandler *save_state,
- LoadStateHandler *load_state,
void *opaque);
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);
void *opaque);
void unregister_savevm(DeviceState *dev, const char *idstr, void *opaque);