Commit d47a851c authored by Peter Maydell's avatar Peter Maydell
Browse files

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



migration/next for 20170601

# gpg: Signature made Thu 01 Jun 2017 17:51:04 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/20170601:
  migration: Move include/migration/block.h into migration/
  migration: Export ram.c functions in its own file
  migration: Create include for migration snapshots
  migration: Export rdma.c functions in its own file
  migration: Export tls.c functions in its own file
  migration: Export socket.c functions in its own file
  migration: Export fd.c functions in its own file
  migration: Export exec.c functions in its own file
  migration: Split qemu-file.h
  migration: Remove unneeded includes of migration/vmstate.h
  migration: shut src return path unconditionally
  migration: fix leak of src file on dst
  migration: Remove section_id parameter from vmstate_load
  migration: loadvm handlers are not used
  migration: Use savevm_handlers instead of loadvm copy

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7693cd7c 2c9e6fec

hmp.c

+3 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "qemu/error-report.h"

#include "exec/ramlist.h"

#include "hw/intc/intc.h"

#include "migration/snapshot.h"



#ifdef CONFIG_SPICE

#include <spice/enums.h>
@@ -1284,7 +1285,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict) 


    vm_stop(RUN_STATE_RESTORE_VM);



    if (load_vmstate(name, &err) == 0 && saved_vm_running) {

    if (load_snapshot(name, &err) == 0 && saved_vm_running) {

        vm_start();

    }

    hmp_handle_error(mon, &err);
@@ -1294,7 +1295,7 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) 
{

    Error *err = NULL;



    save_vmstate(qdict_get_try_str(qdict, "name"), &err);

    save_snapshot(qdict_get_try_str(qdict, "name"), &err);

    hmp_handle_error(mon, &err);

}

hw/core/qdev.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "hw/boards.h"

#include "hw/sysbus.h"

#include "qapi-event.h"

#include "migration/vmstate.h"



bool qdev_hotplug = false;

static bool qdev_hot_added = false;

hw/i2c/i2c-ddc.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "qemu/log.h"

#include "hw/i2c/i2c.h"

#include "hw/i2c/i2c-ddc.h"

hw/intc/s390_flic.c

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

#include "qemu/error-report.h"

#include "hw/sysbus.h"

#include "migration/qemu-file.h"

#include "hw/s390x/s390_flic.h"

#include "trace.h"

#include "hw/qdev.h"

hw/intc/s390_flic_kvm.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "qemu/error-report.h"

#include "hw/sysbus.h"

#include "sysemu/kvm.h"

#include "migration/qemu-file.h"

#include "hw/s390x/s390_flic.h"

#include "hw/s390x/adapter.h"

#include "trace.h"