Merge remote-tracking branch 'remotes/rth/tags/pull-axp-20180618' into staging

[mirror_qemu.git] / stubs / vmstate.c

diff --git a/stubs/vmstate.c b/stubs/vmstate.c
index 6d52f29bb2f1f91fde23173a59ddbebedfb76a72..6399474e49cad56f32cda95452808dedc8adf076 100644 (file)
--- a/stubs/vmstate.c
+++ b/stubs/vmstate.c
@@ -1,7 +1,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"
-#include "migration/migration.h"
 
 const VMStateDescription vmstate_dummy = {};
 
@@ -21,7 +20,7 @@ void vmstate_unregister(DeviceState *dev,
 {
 }
 
-int check_migratable(Object *obj, Error **err)
+bool vmstate_check_only_migratable(const VMStateDescription *vmsd)
 {
-    return 0;
+    return true;
 }