Index: new/blockdev.c
===================================================================
---- new.orig/blockdev.c 2013-12-02 12:54:24.000000000 +0100
-+++ new/blockdev.c 2013-12-02 14:10:24.000000000 +0100
+--- new.orig/blockdev.c 2013-12-03 07:34:22.000000000 +0100
++++ new/blockdev.c 2013-12-03 07:46:15.000000000 +0100
@@ -45,6 +45,7 @@
#include "qmp-commands.h"
#include "trace.h"
static QTAILQ_HEAD(drivelist, DriveInfo) drives = QTAILQ_HEAD_INITIALIZER(drives);
-@@ -1438,6 +1439,418 @@
+@@ -1438,6 +1439,416 @@
}
}
+ /* drain all i/o (awake jobs waiting for aio) */
+ bdrv_drain_all();
+
-+ int job_count = 0;
+ GList *l = backup_state.di_list;
+ while (l) {
+ PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+ l = g_list_next(l);
+ BlockJob *job = di->bs->job;
+ if (job) {
-+ job_count++;
+ if (!di->completed) {
+ block_job_cancel_sync(job);
+ }
{
Index: new/hmp-commands.hx
===================================================================
---- new.orig/hmp-commands.hx 2013-12-02 12:49:36.000000000 +0100
-+++ new/hmp-commands.hx 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/hmp-commands.hx 2013-12-03 06:36:18.000000000 +0100
++++ new/hmp-commands.hx 2013-12-03 07:34:22.000000000 +0100
@@ -83,6 +83,35 @@
Copy data from a backing file into a block device.
ETEXI
@item info migrate_capabilities
Index: new/hmp.c
===================================================================
---- new.orig/hmp.c 2013-12-02 12:49:36.000000000 +0100
-+++ new/hmp.c 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/hmp.c 2013-12-03 07:34:22.000000000 +0100
++++ new/hmp.c 2013-12-03 07:34:22.000000000 +0100
@@ -133,6 +133,38 @@
qapi_free_MouseInfoList(mice_list);
}
Error *error = NULL;
Index: new/hmp.h
===================================================================
---- new.orig/hmp.h 2013-12-02 12:49:36.000000000 +0100
-+++ new/hmp.h 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/hmp.h 2013-12-03 06:36:18.000000000 +0100
++++ new/hmp.h 2013-12-03 07:34:22.000000000 +0100
@@ -28,6 +28,7 @@
void hmp_info_migrate(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
Index: new/monitor.c
===================================================================
---- new.orig/monitor.c 2013-12-02 12:49:36.000000000 +0100
-+++ new/monitor.c 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/monitor.c 2013-12-03 06:36:18.000000000 +0100
++++ new/monitor.c 2013-12-03 07:34:22.000000000 +0100
@@ -2880,6 +2880,13 @@
},
#endif
.params = "",
Index: new/qapi-schema.json
===================================================================
---- new.orig/qapi-schema.json 2013-12-02 12:49:36.000000000 +0100
-+++ new/qapi-schema.json 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/qapi-schema.json 2013-12-03 07:34:22.000000000 +0100
++++ new/qapi-schema.json 2013-12-03 07:34:22.000000000 +0100
@@ -547,6 +547,95 @@
##
{ 'command': 'query-events', 'returns': ['EventInfo'] }
#
Index: new/qmp-commands.hx
===================================================================
---- new.orig/qmp-commands.hx 2013-12-02 12:49:36.000000000 +0100
-+++ new/qmp-commands.hx 2013-12-02 12:58:31.000000000 +0100
+--- new.orig/qmp-commands.hx 2013-12-03 07:34:22.000000000 +0100
++++ new/qmp-commands.hx 2013-12-03 07:34:22.000000000 +0100
@@ -966,6 +966,24 @@
EQMP