---
.../patches/backup-add-pve-monitor-commands.patch | 2 +-
debian/patches/backup-modify-job-api.patch | 32 ++++++++++++----------
debian/patches/internal-snapshot-async.patch | 4 +--
debian/patches/modify-query-machines.patch | 2 +-
debian/patches/modify-query-spice.patch | 2 +-
debian/patches/virtio-balloon-fix-query.patch | 24 ++++++----------
6 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/debian/patches/backup-add-pve-monitor-commands.patch
b/debian/patches/backup-add-pve-monitor-commands.patch
index e58033e..450be3b 100644
--- a/debian/patches/backup-add-pve-monitor-commands.patch
+++ b/debian/patches/backup-add-pve-monitor-commands.patch
@@ -583,8 +583,8 @@ Index: new/hmp.h
--- new.orig/hmp.h 2014-11-20 06:45:05.000000000 +0100
+++ new/hmp.h 2014-11-20 07:47:31.000000000 +0100
@@ -29,6 +29,7 @@
- void hmp_info_migrate(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
+ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
+void hmp_info_backup(Monitor *mon, const QDict *qdict);
void hmp_info_cpus(Monitor *mon, const QDict *qdict);
diff --git a/debian/patches/backup-modify-job-api.patch
b/debian/patches/backup-modify-job-api.patch
index f5e81a7..9b9f234 100644
--- a/debian/patches/backup-modify-job-api.patch
+++ b/debian/patches/backup-modify-job-api.patch
@@ -2,8 +2,8 @@ Index: new/block/backup.c
===================================================================
--- new.orig/block/backup.c 2014-11-20 07:55:31.000000000 +0100
+++ new/block/backup.c 2014-11-20 08:56:23.000000000 +0100
-@@ -39,6 +39,7 @@
- BlockDriverState *target;
+@@ -39,6 +39,7 @@ typedef struct BackupBlockJob
+ BdrvDirtyBitmap *sync_bitmap;
MirrorSyncMode sync_mode;
RateLimit limit;
+ BackupDumpFunc *dump_cb;
@@ -78,7 +78,7 @@ Index: new/block/backup.c
bdrv_add_before_write_notifier(bs, &before_write);
@@ -359,8 +373,10 @@
-
+ }
hbitmap_free(job->bitmap);
- bdrv_iostatus_disable(target);
@@ -91,7 +91,7 @@ Index: new/block/backup.c
data = g_malloc(sizeof(*data));
data->ret = ret;
@@ -370,13 +386,15 @@ for backup_start
- int64_t speed, MirrorSyncMode sync_mode,
+ BdrvDirtyBitmap *sync_bitmap,
BlockdevOnError on_source_error,
BlockdevOnError on_target_error,
+ BackupDumpFunc *dump_cb,
@@ -125,8 +125,8 @@ Index: new/block/backup.c
return;
}
-@@ -397,12 +415,15 @@ in backup_start
- return;
+@@ -397,14 +415,17 @@ in backup_start
+ goto error;
}
- bdrv_op_block_all(target, job->common.blocker);
@@ -138,6 +138,8 @@ Index: new/block/backup.c
job->on_target_error = on_target_error;
job->target = target;
job->sync_mode = sync_mode;
+ job->sync_bitmap = sync_mode == MIRROR_SYNC_MODE_DIRTY_BITMAP ?
+ sync_bitmap : NULL;
+ job->common.paused = paused;
job->common.len = len;
job->common.co = qemu_coroutine_create(backup_run);
@@ -147,20 +149,20 @@ Index: new/blockdev.c
--- new.orig/blockdev.c 2014-11-20 07:55:31.000000000 +0100
+++ new/blockdev.c 2014-11-20 08:48:02.000000000 +0100
@@ -2223,7 +2223,7 @@ qmp_drive_backup
- bdrv_set_aio_context(target_bs, aio_context);
+ }
- backup_start(bs, target_bs, speed, sync, on_source_error, on_target_error,
-- block_job_cb, bs, &local_err);
-+ NULL, block_job_cb, bs, false, &local_err);
+ backup_start(bs, target_bs, speed, sync, bmap,
+- on_source_error, on_target_error,
++ on_source_error, on_target_error, NULL,
+ block_job_cb, bs, &local_err);
if (local_err != NULL) {
bdrv_unref(target_bs);
- error_propagate(errp, local_err);
@@ -2284,7 +2284,7 @@ qmp_blockdev_backup
bdrv_ref(target_bs);
bdrv_set_aio_context(target_bs, aio_context);
- backup_start(bs, target_bs, speed, sync, on_source_error, on_target_error,
-- block_job_cb, bs, &local_err);
-+ NULL, block_job_cb, bs, false, &local_err);
+ backup_start(bs, target_bs, speed, sync, NULL, on_source_error,
+- on_target_error, block_job_cb, bs, &local_err);
++ on_target_error, NULL, block_job_cb, bs, &local_err);
if (local_err != NULL) {
bdrv_unref(target_bs);
error_propagate(errp, local_err);
@@ -179,7 +181,7 @@ Index: new/include/block/block_int.h
BlockDriverState *bs;
int64_t offset;
@@ -583,7 +586,9 @@
- int64_t speed, MirrorSyncMode sync_mode,
+ BdrvDirtyBitmap *sync_bitmap,
BlockdevOnError on_source_error,
BlockdevOnError on_target_error,
+ BackupDumpFunc *dump_cb,
diff --git a/debian/patches/internal-snapshot-async.patch
b/debian/patches/internal-snapshot-async.patch
index e6d8a13..605b5dc 100644
--- a/debian/patches/internal-snapshot-async.patch
+++ b/debian/patches/internal-snapshot-async.patch
@@ -51,7 +51,7 @@ Index: new/hmp-commands.hx
--- new.orig/hmp-commands.hx 2014-11-20 09:13:01.000000000 +0100
+++ new/hmp-commands.hx 2014-11-20 09:16:47.000000000 +0100
@@ -1797,6 +1797,8 @@
- show current migration capabilities
+ show current migration parameters
@item info migrate_cache_size
show current migration XBZRLE cache size
+@item info savevm
@@ -174,7 +174,7 @@ Index: new/hmp.h
+void hmp_info_savevm(Monitor *mon, const QDict *qdict);
void hmp_info_migrate(Monitor *mon, const QDict *qdict);
void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
- void hmp_info_migrate_cache_size(Monitor *mon, const QDict *qdict);
+ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
@@ -85,6 +86,10 @@
void hmp_netdev_del(Monitor *mon, const QDict *qdict);
void hmp_getfd(Monitor *mon, const QDict *qdict);
diff --git a/debian/patches/modify-query-machines.patch
b/debian/patches/modify-query-machines.patch
index d028e3e..5edcdd2 100644
--- a/debian/patches/modify-query-machines.patch
+++ b/debian/patches/modify-query-machines.patch
@@ -13,7 +13,7 @@ Index: new/qapi-schema.json
#
@@ -2400,7 +2402,7 @@
##
- { 'type': 'MachineInfo',
+ { 'struct': 'MachineInfo',
'data': { 'name': 'str', '*alias': 'str',
- '*is-default': 'bool', 'cpu-max': 'int' } }
+ '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int' } }
diff --git a/debian/patches/modify-query-spice.patch
b/debian/patches/modify-query-spice.patch
index c485b03..4e5222d 100644
--- a/debian/patches/modify-query-spice.patch
+++ b/debian/patches/modify-query-spice.patch
@@ -35,7 +35,7 @@ Index: new/qapi-schema.json
+#
# Since: 0.14.0
##
- { 'type': 'SpiceInfo',
+ { 'struct': 'SpiceInfo',
'data': {'enabled': 'bool', 'migrated': 'bool', '*host': 'str', '*port':
'int',
'*tls-port': 'int', '*auth': 'str', '*compiled-version': 'str',
+ '*ticket': 'str',
diff --git a/debian/patches/virtio-balloon-fix-query.patch
b/debian/patches/virtio-balloon-fix-query.patch
index 236a624..b9e5d1f 100644
--- a/debian/patches/virtio-balloon-fix-query.patch
+++ b/debian/patches/virtio-balloon-fix-query.patch
@@ -87,37 +87,31 @@ Index: new/qapi-schema.json
===================================================================
--- new.orig/qapi-schema.json 2014-11-20 06:45:06.000000000 +0100
+++ new/qapi-schema.json 2014-11-20 07:26:23.000000000 +0100
-@@ -983,15 +983,34 @@
-
- ##
- # @BalloonInfo:
--#
-+#
- # Information about the guest balloon device.
+@@ -1084,10 +1084,30 @@
#
# @actual: the number of bytes the balloon currently contains
#
--# Since: 0.14.0
+# @last_update: #optional time when stats got updated from guest
+#
+# @mem_swapped_in: #optional number of pages swapped in within the guest
-+#
++#
+# @mem_swapped_out: #optional number of pages swapped out within the guest
+#
+# @major_page_faults: #optional number of major page faults within the guest
- #
++#
+# @minor_page_faults: #optional number of minor page faults within the guest
-+#
++#
+# @free_mem: #optional amount of memory (in bytes) free in the guest
+#
+# @total_mem: #optional amount of memory (in bytes) visible to the guest
+#
+# @max_mem: amount of memory (in bytes) assigned to the guest
-+#
-+# Since: 0.14.0
++#
+ # Since: 0.14.0
+ #
##
--{ 'type': 'BalloonInfo', 'data': {'actual': 'int' } }
-+{ 'type': 'BalloonInfo',
+-{ 'struct': 'BalloonInfo', 'data': {'actual': 'int' } }
++{ 'struct': 'BalloonInfo',
+ 'data': {'actual': 'int', '*last_update': 'int', '*mem_swapped_in': 'int',
+ '*mem_swapped_out': 'int', '*major_page_faults': 'int',
+ '*minor_page_faults': 'int', '*free_mem': 'int',
--
2.1.4
_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
