aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure1
-rw-r--r--include/migration/migration.h1
-rw-r--r--migration/migration.c7
-rw-r--r--migration/savevm.c1
-rw-r--r--xen-common.c5
5 files changed, 14 insertions, 1 deletions
diff --git a/configure b/configure
index 704b34c5aa..cd219d8e3b 100755
--- a/configure
+++ b/configure
@@ -1337,7 +1337,6 @@ disabled with --disable-FEATURE, default is enabled if available:
vnc-sasl SASL encryption for VNC server
vnc-jpeg JPEG lossy compression for VNC server
vnc-png PNG compression for VNC server
- vnc-ws Websockets support for VNC server
cocoa Cocoa UI (Mac OS X only)
virtfs VirtFS
xen xen backend driver support
diff --git a/include/migration/migration.h b/include/migration/migration.h
index a2f8ed093c..83346210b1 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -203,4 +203,5 @@ void register_global_state(void);
void global_state_set_optional(void);
void savevm_skip_configuration(void);
int global_state_store(void);
+void global_state_store_running(void);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index fd4f99b84e..662e77e4eb 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -122,6 +122,13 @@ int global_state_store(void)
return 0;
}
+void global_state_store_running(void)
+{
+ const char *state = RunState_lookup[RUN_STATE_RUNNING];
+ strncpy((char *)global_state.runstate,
+ state, sizeof(global_state.runstate));
+}
+
static bool global_state_received(void)
{
return global_state.received;
diff --git a/migration/savevm.c b/migration/savevm.c
index 81dbe5879f..60712153fa 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1394,6 +1394,7 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp)
saved_vm_running = runstate_is_running();
vm_stop(RUN_STATE_SAVE_VM);
+ global_state_store_running();
f = qemu_fopen(filename, "wb");
if (!f) {
diff --git a/xen-common.c b/xen-common.c
index 56359ca725..0dcdbc39f4 100644
--- a/xen-common.c
+++ b/xen-common.c
@@ -12,6 +12,7 @@
#include "qmp-commands.h"
#include "sysemu/char.h"
#include "sysemu/accel.h"
+#include "migration/migration.h"
//#define DEBUG_XEN
@@ -119,6 +120,10 @@ static int xen_init(MachineState *ms)
}
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
+ global_state_set_optional();
+ savevm_skip_configuration();
+ savevm_skip_section_footers();
+
return 0;
}