Commit 73aa4692 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170614' into staging 



migration/next for 20170614

# gpg: Signature made Wed 14 Jun 2017 11:16:21 BST
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170614:
  migration: Don't create decompression threads if not enabled
  migration: Test for disabled features on reception
  migration: Remove unneeded includes
  migration: fix incorrect enable return path
  migration: Fix compilation with older compilers

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3f060292 3416ab5b

include/migration/colo.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#define QEMU_COLO_H



#include "qemu-common.h"

#include "qemu/coroutine_int.h"

#include "qemu/thread.h"

#include "qemu/main-loop.h"



bool colo_supported(void);

void colo_info_init(void);

include/migration/misc.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#ifndef MIGRATION_MISC_H

#define MIGRATION_MISC_H



#include "qemu/notify.h"



/* migration/ram.c */



void ram_mig_init(void);

include/migration/register.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#ifndef MIGRATION_REGISTER_H

#define MIGRATION_REGISTER_H



typedef void SaveStateHandler(QEMUFile *f, void *opaque);

typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);



typedef struct SaveVMHandlers {

    /* This runs inside the iothread lock.  */

    SaveStateHandler *save_state;

include/migration/vmstate.h

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


#include "migration/qjson.h"



typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);

typedef struct VMStateInfo VMStateInfo;

typedef struct VMStateDescription VMStateDescription;

typedef struct VMStateField VMStateField;

include/qemu/typedefs.h

+2 −0
Original line number Diff line number Diff line
@@ -96,5 +96,7 @@ typedef struct uWireSlave uWireSlave; 
typedef struct VirtIODevice VirtIODevice;

typedef struct Visitor Visitor;

typedef struct node_info NodeInfo;

typedef void SaveStateHandler(QEMUFile *f, void *opaque);

typedef int LoadStateHandler(QEMUFile *f, void *opaque, int version_id);



#endif /* QEMU_TYPEDEFS_H */