Commit 20a519a0 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Create savevm.h for functions exported from savevm.c 



This removes last trace of migration functions from sysemu/sysemu.h.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
parent 0748b352

include/sysemu/sysemu.h

+0 −47
Original line number Diff line number Diff line
@@ -97,53 +97,6 @@ int load_vmstate(const char *name, Error **errp); 


void qemu_announce_self(void);



/* Subcommands for QEMU_VM_COMMAND */

enum qemu_vm_cmd {

    MIG_CMD_INVALID = 0,   /* Must be 0 */

    MIG_CMD_OPEN_RETURN_PATH,  /* Tell the dest to open the Return path */

    MIG_CMD_PING,              /* Request a PONG on the RP */



    MIG_CMD_POSTCOPY_ADVISE,       /* Prior to any page transfers, just

                                      warn we might want to do PC */

    MIG_CMD_POSTCOPY_LISTEN,       /* Start listening for incoming

                                      pages as it's running. */

    MIG_CMD_POSTCOPY_RUN,          /* Start execution */



    MIG_CMD_POSTCOPY_RAM_DISCARD,  /* A list of pages to discard that

                                      were previously sent during

                                      precopy but are dirty. */

    MIG_CMD_PACKAGED,          /* Send a wrapped stream within this stream */

    MIG_CMD_MAX

};



#define MAX_VM_CMD_PACKAGED_SIZE (1ul << 24)



bool qemu_savevm_state_blocked(Error **errp);

void qemu_savevm_state_begin(QEMUFile *f);

void qemu_savevm_state_header(QEMUFile *f);

int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy);

void qemu_savevm_state_cleanup(void);

void qemu_savevm_state_complete_postcopy(QEMUFile *f);

void qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only);

void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size,

                               uint64_t *res_non_postcopiable,

                               uint64_t *res_postcopiable);

void qemu_savevm_command_send(QEMUFile *f, enum qemu_vm_cmd command,

                              uint16_t len, uint8_t *data);

void qemu_savevm_send_ping(QEMUFile *f, uint32_t value);

void qemu_savevm_send_open_return_path(QEMUFile *f);

int qemu_savevm_send_packaged(QEMUFile *f, const uint8_t *buf, size_t len);

void qemu_savevm_send_postcopy_advise(QEMUFile *f);

void qemu_savevm_send_postcopy_listen(QEMUFile *f);

void qemu_savevm_send_postcopy_run(QEMUFile *f);



void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,

                                           uint16_t len,

                                           uint64_t *start_list,

                                           uint64_t *length_list);



int qemu_loadvm_state(QEMUFile *f);



extern int autostart;



typedef enum {

migration/colo.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "qemu-file-channel.h"

#include "migration/migration.h"

#include "migration/qemu-file.h"

#include "savevm.h"

#include "migration/colo.h"

#include "migration/block.h"

#include "io/channel-buffer.h"

migration/migration.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "qemu/main-loop.h"

#include "migration/blocker.h"

#include "migration/migration.h"

#include "savevm.h"

#include "qemu-file-channel.h"

#include "migration/qemu-file.h"

#include "migration/vmstate.h"

migration/postcopy-ram.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "exec/target_page.h"

#include "migration/migration.h"

#include "migration/qemu-file.h"

#include "savevm.h"

#include "postcopy-ram.h"

#include "sysemu/sysemu.h"

#include "sysemu/balloon.h"

migration/savevm.c

+25 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "qemu/timer.h"

#include "migration/migration.h"

#include "qemu-file-channel.h"

#include "savevm.h"

#include "postcopy-ram.h"

#include "qapi/qmp/qerror.h"

#include "qemu/error-report.h"
@@ -63,6 +64,26 @@ const unsigned int postcopy_ram_discard_version = 0; 


static bool skip_section_footers;



/* Subcommands for QEMU_VM_COMMAND */

enum qemu_vm_cmd {

    MIG_CMD_INVALID = 0,   /* Must be 0 */

    MIG_CMD_OPEN_RETURN_PATH,  /* Tell the dest to open the Return path */

    MIG_CMD_PING,              /* Request a PONG on the RP */



    MIG_CMD_POSTCOPY_ADVISE,       /* Prior to any page transfers, just

                                      warn we might want to do PC */

    MIG_CMD_POSTCOPY_LISTEN,       /* Start listening for incoming

                                      pages as it's running. */

    MIG_CMD_POSTCOPY_RUN,          /* Start execution */



    MIG_CMD_POSTCOPY_RAM_DISCARD,  /* A list of pages to discard that

                                      were previously sent during

                                      precopy but are dirty. */

    MIG_CMD_PACKAGED,          /* Send a wrapped stream within this stream */

    MIG_CMD_MAX

};



#define MAX_VM_CMD_PACKAGED_SIZE (1ul << 24)

static struct mig_cmd_args {

    ssize_t     len; /* -1 = variable */

    const char *name;
@@ -807,7 +828,7 @@ static void save_section_footer(QEMUFile *f, SaveStateEntry *se) 
 * @len: Length of associated data

 * @data: Data associated with command.

 */

void qemu_savevm_command_send(QEMUFile *f,

static void qemu_savevm_command_send(QEMUFile *f,

                                     enum qemu_vm_cmd command,

                                     uint16_t len,

                                     uint8_t *data)