refresh quilt patches

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index b616e9a514f6f8d5b4a2d15185588850f8dd58e4..4420f6b0c7202f858d5c7b36a0d2aede6065af02 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,7 +1,7 @@
 Index: new/include/net/net.h
 ===================================================================
---- new.orig/include/net/net.h 2014-06-17 06:14:28.000000000 +0200
-+++ new/include/net/net.h      2014-06-17 06:14:50.000000000 +0200
+--- new.orig/include/net/net.h 2014-07-16 11:53:56.000000000 +0200
++++ new/include/net/net.h      2014-07-16 12:01:25.000000000 +0200
 @@ -196,8 +196,9 @@
  int net_hub_id_for_client(NetClientState *nc, int *id);
  NetClientState *net_hub_port_find(int hub_id);
@@ -16,8 +16,8 @@ Index: new/include/net/net.h
  
 Index: new/net/tap_int.h
 ===================================================================
---- new.orig/net/tap_int.h     2014-06-17 06:14:28.000000000 +0200
-+++ new/net/tap_int.h  2014-06-17 06:14:50.000000000 +0200
+--- new.orig/net/tap_int.h     2014-07-16 11:53:56.000000000 +0200
++++ new/net/tap_int.h  2014-07-16 12:01:25.000000000 +0200
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
  #include "qapi-types.h"

diff --git a/debian/patches/backup-add-dir-format.patch b/debian/patches/backup-add-dir-format.patch
index 49bd8153af7afb35eea00d6b518dd4438189e055..8922ca414c1d70dd40f7b3882a5d3c2864005b5e 100644 (file)
--- a/debian/patches/backup-add-dir-format.patch
+++ b/debian/patches/backup-add-dir-format.patch
@@ -1,8 +1,8 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-17 06:15:07.000000000 +0200
-+++ new/qapi-schema.json       2014-06-17 06:15:08.000000000 +0200
-@@ -379,7 +379,7 @@
+--- new.orig/qapi-schema.json  2014-07-16 12:01:34.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:35.000000000 +0200
+@@ -388,7 +388,7 @@
  # @vma: Proxmox vma backup format
  ##
  { 'enum': 'BackupFormat',
@@ -13,9 +13,9 @@ Index: new/qapi-schema.json
  # @backup:
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-06-17 06:15:07.000000000 +0200
-+++ new/blockdev.c     2014-06-17 06:15:08.000000000 +0200
-@@ -1902,6 +1902,8 @@
+--- new.orig/blockdev.c        2014-07-16 12:01:34.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:35.000000000 +0200
+@@ -1895,6 +1895,8 @@
      uint8_t dev_id;
      //bool started;
      bool completed;
@@ -24,7 +24,7 @@ Index: new/blockdev.c
  } PVEBackupDevInfo;
  
  static void pvebackup_run_next_job(void);
-@@ -1970,8 +1972,6 @@
+@@ -1963,8 +1965,6 @@
  {
      PVEBackupDevInfo *di = opaque;
  
@@ -33,7 +33,7 @@ Index: new/blockdev.c
      di->completed = true;
  
      if (ret < 0 && !backup_state.error) {
-@@ -1982,8 +1982,11 @@
+@@ -1975,8 +1975,11 @@
      BlockDriverState *bs = di->bs;
  
      di->bs = NULL;
@@ -46,7 +46,7 @@ Index: new/blockdev.c
  
      block_job_cb(bs, ret);
  
-@@ -2060,6 +2063,7 @@
+@@ -2054,6 +2057,7 @@
                      bool has_speed, int64_t speed, Error **errp)
  {
      BlockDriverState *bs;
@@ -54,7 +54,7 @@ Index: new/blockdev.c
      Error *local_err = NULL;
      uuid_t uuid;
      VmaWriter *vmaw = NULL;
-@@ -2076,11 +2080,6 @@
+@@ -2070,11 +2074,6 @@
      /* Todo: try to auto-detect format based on file name */
      format = has_format ? format : BACKUP_FORMAT_VMA;
  
@@ -66,7 +66,7 @@ Index: new/blockdev.c
      if (has_devlist) {
          devs = g_strsplit_set(devlist, ",;:", -1);
  
-@@ -2147,27 +2146,63 @@
+@@ -2141,27 +2140,63 @@
  
      uuid_generate(uuid);
  
@@ -146,7 +146,7 @@ Index: new/blockdev.c
      }
  
      /* add configuration file to archive */
-@@ -2180,12 +2215,27 @@
+@@ -2174,12 +2209,27 @@
              goto err;
          }
  
@@ -179,7 +179,7 @@ Index: new/blockdev.c
          g_free(cdata);
      }
  
-@@ -2225,10 +2275,11 @@
+@@ -2219,10 +2269,11 @@
          PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
          l = g_list_next(l);
  
@@ -192,7 +192,7 @@ Index: new/blockdev.c
          if (local_err != NULL) {
              error_setg(&backup_state.error, "backup_job_create failed");
              pvebackup_cancel(NULL);
-@@ -2245,8 +2296,17 @@
+@@ -2239,8 +2290,17 @@
  
      l = di_list;
      while (l) {
@@ -211,7 +211,7 @@ Index: new/blockdev.c
      }
      g_list_free(di_list);
  
-@@ -2260,6 +2320,10 @@
+@@ -2254,6 +2314,10 @@
          unlink(backup_file);
      }
  
@@ -224,8 +224,8 @@ Index: new/blockdev.c
  
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2014-06-17 06:15:07.000000000 +0200
-+++ new/hmp-commands.hx        2014-06-17 06:15:08.000000000 +0200
+--- new.orig/hmp-commands.hx   2014-07-16 12:01:34.000000000 +0200
++++ new/hmp-commands.hx        2014-07-16 12:01:35.000000000 +0200
 @@ -90,9 +90,11 @@
  
     {
@@ -243,9 +243,9 @@ Index: new/hmp-commands.hx
  
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-17 06:15:07.000000000 +0200
-+++ new/hmp.c  2014-06-17 06:15:08.000000000 +0200
-@@ -1258,11 +1258,13 @@
+--- new.orig/hmp.c     2014-07-16 12:01:34.000000000 +0200
++++ new/hmp.c  2014-07-16 12:01:35.000000000 +0200
+@@ -1262,11 +1262,13 @@
  {
      Error *error = NULL;
  

diff --git a/debian/patches/backup-add-pve-monitor-commands.patch b/debian/patches/backup-add-pve-monitor-commands.patch
index 7c0b050d64e10f78d647ad09d71891bd34195dc9..4bb528a3204a73f4ae6c96cf1ad4121eecf2ee32 100644 (file)
--- a/debian/patches/backup-add-pve-monitor-commands.patch
+++ b/debian/patches/backup-add-pve-monitor-commands.patch
@@ -1,7 +1,7 @@
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-07-16 11:10:45.000000000 +0200
-+++ new/blockdev.c     2014-07-16 11:25:41.000000000 +0200
+--- new.orig/blockdev.c        2014-07-16 12:01:34.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:34.000000000 +0200
 @@ -44,6 +44,7 @@
  #include "qmp-commands.h"
  #include "trace.h"
@@ -458,8 +458,8 @@ Index: new/blockdev.c
                        bool has_backing_file, const char *backing_file,
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2014-07-16 10:22:25.000000000 +0200
-+++ new/hmp-commands.hx        2014-07-16 11:17:01.000000000 +0200
+--- new.orig/hmp-commands.hx   2014-07-16 11:53:55.000000000 +0200
++++ new/hmp-commands.hx        2014-07-16 12:01:34.000000000 +0200
 @@ -88,6 +88,35 @@
  Copy data from a backing file into a block device.
  ETEXI
@@ -507,8 +507,8 @@ Index: new/hmp-commands.hx
  @item info migrate_capabilities
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-07-16 10:22:25.000000000 +0200
-+++ new/hmp.c  2014-07-16 11:17:01.000000000 +0200
+--- new.orig/hmp.c     2014-07-16 12:01:29.000000000 +0200
++++ new/hmp.c  2014-07-16 12:01:34.000000000 +0200
 @@ -137,6 +137,44 @@
      qapi_free_MouseInfoList(mice_list);
  }
@@ -586,8 +586,8 @@ Index: new/hmp.c
  {
 Index: new/hmp.h
 ===================================================================
---- new.orig/hmp.h     2014-07-16 10:22:25.000000000 +0200
-+++ new/hmp.h  2014-07-16 11:17:01.000000000 +0200
+--- new.orig/hmp.h     2014-07-16 11:53:55.000000000 +0200
++++ new/hmp.h  2014-07-16 12:01:34.000000000 +0200
 @@ -29,6 +29,7 @@
  void hmp_info_migrate(Monitor *mon, const QDict *qdict);
  void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
@@ -607,8 +607,8 @@ Index: new/hmp.h
  void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
 Index: new/monitor.c
 ===================================================================
---- new.orig/monitor.c 2014-07-16 10:22:25.000000000 +0200
-+++ new/monitor.c      2014-07-16 11:17:01.000000000 +0200
+--- new.orig/monitor.c 2014-07-16 11:53:55.000000000 +0200
++++ new/monitor.c      2014-07-16 12:01:34.000000000 +0200
 @@ -2848,6 +2848,13 @@
      },
  #endif
@@ -625,8 +625,8 @@ Index: new/monitor.c
          .params     = "",
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-07-16 10:22:25.000000000 +0200
-+++ new/qapi-schema.json       2014-07-16 11:17:01.000000000 +0200
+--- new.orig/qapi-schema.json  2014-07-16 12:01:31.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:34.000000000 +0200
 @@ -349,6 +349,95 @@
  ##
  { 'command': 'query-events', 'returns': ['EventInfo'] }
@@ -725,8 +725,8 @@ Index: new/qapi-schema.json
  #
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-07-16 10:22:25.000000000 +0200
-+++ new/qmp-commands.hx        2014-07-16 11:17:01.000000000 +0200
+--- new.orig/qmp-commands.hx   2014-07-16 12:01:29.000000000 +0200
++++ new/qmp-commands.hx        2014-07-16 12:01:34.000000000 +0200
 @@ -1098,6 +1098,24 @@
  EQMP
  

diff --git a/debian/patches/backup-add-vma-binary.patch b/debian/patches/backup-add-vma-binary.patch
index 304e202a4cfa5215ab4a31f345a4f40047bf7de3..d30e59a16ea9d67fdaafa6f2e48b7e099672aa08 100644 (file)
--- a/debian/patches/backup-add-vma-binary.patch
+++ b/debian/patches/backup-add-vma-binary.patch
@@ -24,8 +24,8 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 
 Index: new/Makefile
 ===================================================================
---- new.orig/Makefile  2014-07-16 10:40:17.000000000 +0200
-+++ new/Makefile       2014-07-16 10:51:34.000000000 +0200
+--- new.orig/Makefile  2014-07-16 11:53:56.000000000 +0200
++++ new/Makefile       2014-07-16 12:01:32.000000000 +0200
 @@ -146,7 +146,7 @@
  include $(SRC_PATH)/libcacard/Makefile
  endif
@@ -46,7 +46,7 @@ Index: new/Makefile
 Index: new/vma-reader.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma-reader.c   2014-07-16 10:51:34.000000000 +0200
++++ new/vma-reader.c   2014-07-16 12:01:32.000000000 +0200
 @@ -0,0 +1,799 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -850,7 +850,7 @@ Index: new/vma-reader.c
 Index: new/vma-writer.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma-writer.c   2014-07-16 11:03:00.000000000 +0200
++++ new/vma-writer.c   2014-07-16 12:01:32.000000000 +0200
 @@ -0,0 +1,876 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -1731,7 +1731,7 @@ Index: new/vma-writer.c
 Index: new/vma.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma.c  2014-07-16 10:51:34.000000000 +0200
++++ new/vma.c  2014-07-16 12:01:32.000000000 +0200
 @@ -0,0 +1,583 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -2319,7 +2319,7 @@ Index: new/vma.c
 Index: new/vma.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma.h  2014-07-16 10:51:34.000000000 +0200
++++ new/vma.h  2014-07-16 12:01:32.000000000 +0200
 @@ -0,0 +1,146 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -2469,8 +2469,8 @@ Index: new/vma.h
 +#endif /* BACKUP_VMA_H */
 Index: new/Makefile.objs
 ===================================================================
---- new.orig/Makefile.objs     2014-07-16 10:40:17.000000000 +0200
-+++ new/Makefile.objs  2014-07-16 10:51:34.000000000 +0200
+--- new.orig/Makefile.objs     2014-07-16 11:53:56.000000000 +0200
++++ new/Makefile.objs  2014-07-16 12:01:32.000000000 +0200
 @@ -14,6 +14,7 @@
  block-obj-y += block/
  block-obj-y += qapi-types.o qapi-visit.o qapi-event.o

diff --git a/debian/patches/backup-add-vma-verify-command.patch b/debian/patches/backup-add-vma-verify-command.patch
index d96d1feaaca953a7e831c0de3cbd2b90b72f5453..42ceb6cf9165f1e696d6d2224faf58fcb05a2145 100644 (file)
--- a/debian/patches/backup-add-vma-verify-command.patch
+++ b/debian/patches/backup-add-vma-verify-command.patch
@@ -20,8 +20,8 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 
 Index: new/vma-reader.c
 ===================================================================
---- new.orig/vma-reader.c      2014-06-17 06:15:02.000000000 +0200
-+++ new/vma-reader.c   2014-06-17 06:15:03.000000000 +0200
+--- new.orig/vma-reader.c      2014-07-16 12:01:32.000000000 +0200
++++ new/vma-reader.c   2014-07-16 12:01:32.000000000 +0200
 @@ -53,6 +53,8 @@
      time_t start_time;
      int64_t cluster_count;
@@ -227,8 +227,8 @@ Index: new/vma-reader.c
 +
 Index: new/vma.c
 ===================================================================
---- new.orig/vma.c     2014-06-17 06:15:02.000000000 +0200
-+++ new/vma.c  2014-06-17 06:15:03.000000000 +0200
+--- new.orig/vma.c     2014-07-16 12:01:32.000000000 +0200
++++ new/vma.c  2014-07-16 12:01:32.000000000 +0200
 @@ -34,6 +34,7 @@
          "vma list <filename>\n"
          "vma create <filename> [-c config] <archive> pathname ...\n"
@@ -307,8 +307,8 @@ Index: new/vma.c
      help();
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-06-17 06:15:02.000000000 +0200
-+++ new/vma.h  2014-06-17 06:15:03.000000000 +0200
+--- new.orig/vma.h     2014-07-16 12:01:32.000000000 +0200
++++ new/vma.h  2014-07-16 12:01:32.000000000 +0200
 @@ -142,5 +142,6 @@
                             Error **errp);
  int vma_reader_restore(VmaReader *vmar, int vmstate_fd, bool verbose,

diff --git a/debian/patches/backup-do-not-return-errors-in-dump-callback.patch b/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
index 1d095431027f2582009759a75e94c67e0a92e36c..3c35fa21e9b9e8f1f91ef428755fa20176e3e9ec 100644 (file)
--- a/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
+++ b/debian/patches/backup-do-not-return-errors-in-dump-callback.patch
@@ -6,9 +6,9 @@ We simply report success and cancel the backup job instead.
 
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-06-17 06:15:08.000000000 +0200
-+++ new/blockdev.c     2014-06-17 06:15:09.000000000 +0200
-@@ -1914,6 +1914,11 @@
+--- new.orig/blockdev.c        2014-07-16 12:01:35.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:35.000000000 +0200
+@@ -1907,6 +1907,11 @@
  {
      PVEBackupDevInfo *di = opaque;
  
@@ -20,7 +20,7 @@ Index: new/blockdev.c
      if (sector_num & 0x7f) {
          if (!backup_state.error) {
              error_setg(&backup_state.error,
-@@ -1924,7 +1929,6 @@
+@@ -1917,7 +1922,6 @@
      }
  
      int64_t cluster_num = sector_num >> 7;
@@ -28,7 +28,7 @@ Index: new/blockdev.c
  
      int ret = -1;
  
-@@ -1932,17 +1936,27 @@
+@@ -1925,17 +1929,27 @@
          size_t zero_bytes = 0;
          ret = vma_writer_write(backup_state.vmaw, di->dev_id, cluster_num,
                                 buf, &zero_bytes);
@@ -60,7 +60,7 @@ Index: new/blockdev.c
  }
  
  static void pvebackup_cleanup(void)
-@@ -2014,7 +2028,7 @@
+@@ -2007,7 +2021,7 @@
              BlockJob *job = di->bs->job;
              if (job) {
                  if (!di->completed) {

diff --git a/debian/patches/backup-modify-job-api.patch b/debian/patches/backup-modify-job-api.patch
index 8e007c6ec69302b8e11b421e8066a055bc0088c9..ff854a49a1415f138e530bf7b8fd7c7981d6f121 100644 (file)
--- a/debian/patches/backup-modify-job-api.patch
+++ b/debian/patches/backup-modify-job-api.patch
@@ -1,7 +1,7 @@
 Index: new/block/backup.c
 ===================================================================
---- new.orig/block/backup.c    2014-07-16 11:09:01.000000000 +0200
-+++ new/block/backup.c 2014-07-16 11:16:47.000000000 +0200
+--- new.orig/block/backup.c    2014-07-16 11:53:56.000000000 +0200
++++ new/block/backup.c 2014-07-16 12:01:34.000000000 +0200
 @@ -39,6 +39,7 @@
      BlockDriverState *target;
      MirrorSyncMode sync_mode;
@@ -122,8 +122,8 @@ Index: new/block/backup.c
      qemu_coroutine_enter(job->common.co, job);
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-07-16 11:09:01.000000000 +0200
-+++ new/blockdev.c     2014-07-16 11:10:45.000000000 +0200
+--- new.orig/blockdev.c        2014-07-16 11:53:56.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:34.000000000 +0200
 @@ -2115,7 +2115,7 @@
      }
  
@@ -135,8 +135,8 @@ Index: new/blockdev.c
          error_propagate(errp, local_err);
 Index: new/include/block/block_int.h
 ===================================================================
---- new.orig/include/block/block_int.h 2014-07-16 11:09:01.000000000 +0200
-+++ new/include/block/block_int.h      2014-07-16 11:10:45.000000000 +0200
+--- new.orig/include/block/block_int.h 2014-07-16 11:53:56.000000000 +0200
++++ new/include/block/block_int.h      2014-07-16 12:01:34.000000000 +0200
 @@ -56,6 +56,9 @@
  #define BLOCK_OPT_REDUNDANCY        "redundancy"
  #define BLOCK_OPT_NOCOW             "nocow"

diff --git a/debian/patches/backup-vma-add-dump-config.patch b/debian/patches/backup-vma-add-dump-config.patch
index 8b8337e20a3b4fc9ae5bcfb1ec326852f37d0a22..6f7d8a29032a75360b9aa7385f33f303392dd0dd 100644 (file)
--- a/debian/patches/backup-vma-add-dump-config.patch
+++ b/debian/patches/backup-vma-add-dump-config.patch
@@ -1,7 +1,7 @@
 Index: new/vma.c
 ===================================================================
---- new.orig/vma.c     2014-06-17 06:15:03.000000000 +0200
-+++ new/vma.c  2014-06-17 06:15:04.000000000 +0200
+--- new.orig/vma.c     2014-07-16 12:01:32.000000000 +0200
++++ new/vma.c  2014-07-16 12:01:33.000000000 +0200
 @@ -32,6 +32,7 @@
          "usage: vma command [command options]\n"
          "\n"

diff --git a/debian/patches/backup-vma-allow-empty-backups.patch b/debian/patches/backup-vma-allow-empty-backups.patch
index 18edae2ded83748d84d4acb5f039cacf1b9b62dd..a730f456003c9d69948566bbc2cdcb587b240b84 100644 (file)
--- a/debian/patches/backup-vma-allow-empty-backups.patch
+++ b/debian/patches/backup-vma-allow-empty-backups.patch
@@ -5,8 +5,8 @@ user set backup=no to all VM disks.
 
 Index: new/vma-reader.c
 ===================================================================
---- new.orig/vma-reader.c      2014-06-17 06:15:05.000000000 +0200
-+++ new/vma-reader.c   2014-06-17 06:15:13.000000000 +0200
+--- new.orig/vma-reader.c      2014-07-16 12:01:33.000000000 +0200
++++ new/vma-reader.c   2014-07-16 12:01:39.000000000 +0200
 @@ -334,11 +334,6 @@
          }
      }
@@ -52,9 +52,9 @@ Index: new/vma-reader.c
      return ret;
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-06-17 06:15:10.000000000 +0200
-+++ new/vma-writer.c   2014-06-17 06:15:13.000000000 +0200
-@@ -257,7 +257,7 @@
+--- new.orig/vma-writer.c      2014-07-16 12:01:36.000000000 +0200
++++ new/vma-writer.c   2014-07-16 12:01:39.000000000 +0200
+@@ -258,7 +258,7 @@
      }
  
      vmaw->co_writer = NULL;
@@ -63,7 +63,7 @@ Index: new/vma-writer.c
      return (done == bytes) ? bytes : -1;
  }
  
-@@ -381,10 +381,6 @@
+@@ -382,10 +382,6 @@
      time_t ctime = time(NULL);
      head->ctime = GUINT64_TO_BE(ctime);
  
@@ -74,7 +74,7 @@ Index: new/vma-writer.c
      for (i = 0; i < VMA_MAX_CONFIGS; i++) {
          head->config_names[i] = GUINT32_TO_BE(vmaw->config_names[i]);
          head->config_data[i] = GUINT32_TO_BE(vmaw->config_data[i]);
-@@ -501,6 +497,23 @@
+@@ -502,6 +498,23 @@
      return open_drives;
  }
  
@@ -98,7 +98,7 @@ Index: new/vma-writer.c
  /**
   * all jobs should call this when there is no more data
   * Returns: number of remaining stream (0 ==> finished)
-@@ -528,12 +541,7 @@
+@@ -529,12 +542,7 @@
  
      if (open_drives <= 0) {
          DPRINTF("vma_writer_set_status all drives completed\n");
@@ -114,8 +114,8 @@ Index: new/vma-writer.c
      return open_drives;
 Index: new/vma.c
 ===================================================================
---- new.orig/vma.c     2014-06-17 06:15:04.000000000 +0200
-+++ new/vma.c  2014-06-17 06:15:13.000000000 +0200
+--- new.orig/vma.c     2014-07-16 12:01:33.000000000 +0200
++++ new/vma.c  2014-07-16 12:01:39.000000000 +0200
 @@ -33,7 +33,7 @@
          "\n"
          "vma list <filename>\n"
@@ -240,8 +240,8 @@ Index: new/vma.c
      bdrv_drain_all();
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-06-17 06:15:09.000000000 +0200
-+++ new/vma.h  2014-06-17 06:15:13.000000000 +0200
+--- new.orig/vma.h     2014-07-16 12:01:35.000000000 +0200
++++ new/vma.h  2014-07-16 12:01:39.000000000 +0200
 @@ -128,6 +128,7 @@
                                        size_t *zero_bytes);
  

diff --git a/debian/patches/backup-vma-correctly-propagate-error.patch b/debian/patches/backup-vma-correctly-propagate-error.patch
index a46bc3c89b5cccd2a1e35ce6265bb9a933838825..076e86f9e7f2c4ccbae620b817f790193ae0d66a 100644 (file)
--- a/debian/patches/backup-vma-correctly-propagate-error.patch
+++ b/debian/patches/backup-vma-correctly-propagate-error.patch
@@ -1,8 +1,8 @@
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-06-17 06:15:02.000000000 +0200
-+++ new/vma-writer.c   2014-06-17 06:15:09.000000000 +0200
-@@ -797,6 +797,13 @@
+--- new.orig/vma-writer.c      2014-07-16 12:01:32.000000000 +0200
++++ new/vma-writer.c   2014-07-16 12:01:35.000000000 +0200
+@@ -798,6 +798,13 @@
      return transferred;
  }
  
@@ -18,8 +18,8 @@ Index: new/vma-writer.c
      g_assert(vmaw != NULL);
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-06-17 06:15:03.000000000 +0200
-+++ new/vma.h  2014-06-17 06:15:09.000000000 +0200
+--- new.orig/vma.h     2014-07-16 12:01:32.000000000 +0200
++++ new/vma.h  2014-07-16 12:01:35.000000000 +0200
 @@ -116,6 +116,7 @@
  
  VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp);
@@ -30,9 +30,9 @@ Index: new/vma.h
                            size_t len);
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-06-17 06:15:09.000000000 +0200
-+++ new/blockdev.c     2014-06-17 06:15:09.000000000 +0200
-@@ -1938,7 +1938,7 @@
+--- new.orig/blockdev.c        2014-07-16 12:01:35.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:35.000000000 +0200
+@@ -1931,7 +1931,7 @@
                                 buf, &zero_bytes);
          if (ret < 0) {
              if (!backup_state.error) {

diff --git a/debian/patches/backup-vma-remove-async-queue.patch b/debian/patches/backup-vma-remove-async-queue.patch
index d813d52c543481308190ba9142cc8d06a9ac244b..ec5a8af1ce3564e2adee252f510be527cac77259 100644 (file)
--- a/debian/patches/backup-vma-remove-async-queue.patch
+++ b/debian/patches/backup-vma-remove-async-queue.patch
@@ -5,8 +5,8 @@ Also, previous code produced segmentation faults in qemu_co_mutex_lock().
 
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-07-16 11:35:17.000000000 +0200
-+++ new/vma-writer.c   2014-07-16 11:49:27.000000000 +0200
+--- new.orig/vma-writer.c      2014-07-16 12:01:35.000000000 +0200
++++ new/vma-writer.c   2014-07-16 12:01:36.000000000 +0200
 @@ -34,14 +34,8 @@
      do { if (DEBUG_VMA) { printf("vma: " fmt, ## __VA_ARGS__); } } while (0)
  
@@ -285,8 +285,8 @@ Index: new/vma-writer.c
  }
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-07-16 11:35:17.000000000 +0200
-+++ new/blockdev.c     2014-07-16 11:45:01.000000000 +0200
+--- new.orig/blockdev.c        2014-07-16 12:01:35.000000000 +0200
++++ new/blockdev.c     2014-07-16 12:01:36.000000000 +0200
 @@ -2010,6 +2010,11 @@
          error_setg(&backup_state.error, "backup cancelled");
      }

diff --git a/debian/patches/backup-vma-restore-tolerate-a-size-difference-up-to-4M.patch b/debian/patches/backup-vma-restore-tolerate-a-size-difference-up-to-4M.patch
index f6c226741b087d24b2f6432a32310c1ae7653f4e..779d4c6a19ae2ad29aadc30cb55613b009e56cab 100644 (file)
--- a/debian/patches/backup-vma-restore-tolerate-a-size-difference-up-to-4M.patch
+++ b/debian/patches/backup-vma-restore-tolerate-a-size-difference-up-to-4M.patch
@@ -11,8 +11,8 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 
 Index: new/vma-reader.c
 ===================================================================
---- new.orig/vma-reader.c      2014-06-17 06:15:03.000000000 +0200
-+++ new/vma-reader.c   2014-06-17 06:15:05.000000000 +0200
+--- new.orig/vma-reader.c      2014-07-16 12:01:32.000000000 +0200
++++ new/vma-reader.c   2014-07-16 12:01:33.000000000 +0200
 @@ -465,7 +465,13 @@
      assert(vmar->rstate[dev_id].bs == NULL);
  

diff --git a/debian/patches/disable-efi-enable-pxe-roms.patch b/debian/patches/disable-efi-enable-pxe-roms.patch
index 3503abe955ea764135dbdbc83cdec05dad81e38c..7d43f91459b37cbb263714ebd095c1950a3fff01 100644 (file)
--- a/debian/patches/disable-efi-enable-pxe-roms.patch
+++ b/debian/patches/disable-efi-enable-pxe-roms.patch
@@ -1,8 +1,8 @@
 Index: new/hw/net/e1000.c
 ===================================================================
---- new.orig/hw/net/e1000.c    2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/net/e1000.c 2014-06-17 06:15:12.000000000 +0200
-@@ -1583,7 +1583,7 @@
+--- new.orig/hw/net/e1000.c    2014-07-16 11:53:55.000000000 +0200
++++ new/hw/net/e1000.c 2014-07-16 12:01:38.000000000 +0200
+@@ -1590,7 +1590,7 @@
  
      k->init = pci_e1000_init;
      k->exit = pci_e1000_uninit;
@@ -13,9 +13,9 @@ Index: new/hw/net/e1000.c
      k->revision = info->revision;
 Index: new/hw/net/ne2000.c
 ===================================================================
---- new.orig/hw/net/ne2000.c   2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/net/ne2000.c        2014-06-17 06:15:12.000000000 +0200
-@@ -767,7 +767,7 @@
+--- new.orig/hw/net/ne2000.c   2014-07-16 11:53:55.000000000 +0200
++++ new/hw/net/ne2000.c        2014-07-16 12:01:38.000000000 +0200
+@@ -765,7 +765,7 @@
  
      k->init = pci_ne2000_init;
      k->exit = pci_ne2000_exit;
@@ -26,9 +26,9 @@ Index: new/hw/net/ne2000.c
      k->class_id = PCI_CLASS_NETWORK_ETHERNET;
 Index: new/hw/net/pcnet-pci.c
 ===================================================================
---- new.orig/hw/net/pcnet-pci.c        2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/net/pcnet-pci.c     2014-06-17 06:15:12.000000000 +0200
-@@ -359,7 +359,7 @@
+--- new.orig/hw/net/pcnet-pci.c        2014-07-16 11:53:55.000000000 +0200
++++ new/hw/net/pcnet-pci.c     2014-07-16 12:01:38.000000000 +0200
+@@ -358,7 +358,7 @@
  
      k->init = pci_pcnet_init;
      k->exit = pci_pcnet_uninit;
@@ -39,9 +39,9 @@ Index: new/hw/net/pcnet-pci.c
      k->revision = 0x10;
 Index: new/hw/net/rtl8139.c
 ===================================================================
---- new.orig/hw/net/rtl8139.c  2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/net/rtl8139.c       2014-06-17 06:15:12.000000000 +0200
-@@ -3560,7 +3560,7 @@
+--- new.orig/hw/net/rtl8139.c  2014-07-16 11:53:55.000000000 +0200
++++ new/hw/net/rtl8139.c       2014-07-16 12:01:38.000000000 +0200
+@@ -3557,7 +3557,7 @@
  
      k->init = pci_rtl8139_init;
      k->exit = pci_rtl8139_uninit;
@@ -52,9 +52,9 @@ Index: new/hw/net/rtl8139.c
      k->revision = RTL8139_PCI_REVID; /* >=0x20 is for 8139C+ */
 Index: new/hw/virtio/virtio-pci.c
 ===================================================================
---- new.orig/hw/virtio/virtio-pci.c    2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/virtio/virtio-pci.c 2014-06-17 06:15:12.000000000 +0200
-@@ -1445,7 +1445,7 @@
+--- new.orig/hw/virtio/virtio-pci.c    2014-07-16 11:53:55.000000000 +0200
++++ new/hw/virtio/virtio-pci.c 2014-07-16 12:01:38.000000000 +0200
+@@ -1444,7 +1444,7 @@
      PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
      VirtioPCIClass *vpciklass = VIRTIO_PCI_CLASS(klass);
  

diff --git a/debian/patches/enable-kvm-by-default.patch b/debian/patches/enable-kvm-by-default.patch
index 95dc4ff4688e1d802a8a09e697bbef8ac9bef706..d4b7382b86b50b7603380532cf795bbbc37f6195 100644 (file)
--- a/debian/patches/enable-kvm-by-default.patch
+++ b/debian/patches/enable-kvm-by-default.patch
@@ -1,8 +1,8 @@
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-17 06:14:54.000000000 +0200
-+++ new/vl.c   2014-06-17 06:14:57.000000000 +0200
-@@ -2754,8 +2754,8 @@
+--- new.orig/vl.c      2014-07-16 12:01:28.000000000 +0200
++++ new/vl.c   2014-07-16 12:01:29.000000000 +0200
+@@ -2687,8 +2687,8 @@
  
      p = qemu_opt_get(qemu_get_machine_opts(), "accel");
      if (p == NULL) {

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index 502038af0ddf4b06469599f657fe326a152144ef..002f2e81919205d4750840d2304899bada885833 100644 (file)
--- a/debian/patches/fairsched.diff
+++ b/debian/patches/fairsched.diff
@@ -1,7 +1,7 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2014-07-16 09:54:13.000000000 +0200
-+++ new/qemu-options.hx        2014-07-16 09:55:58.000000000 +0200
+--- new.orig/qemu-options.hx   2014-07-16 11:53:56.000000000 +0200
++++ new/qemu-options.hx        2014-07-16 12:01:27.000000000 +0200
 @@ -379,6 +379,12 @@
  @table @option
  ETEXI
@@ -17,8 +17,8 @@ Index: new/qemu-options.hx
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-07-16 09:54:13.000000000 +0200
-+++ new/vl.c   2014-07-16 10:01:14.000000000 +0200
+--- new.orig/vl.c      2014-07-16 11:53:56.000000000 +0200
++++ new/vl.c   2014-07-16 12:01:27.000000000 +0200
 @@ -101,6 +101,8 @@
  #endif
  #include "sysemu/qtest.h"
@@ -112,7 +112,7 @@ Index: new/vl.c
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2014-07-16 09:55:58.000000000 +0200
++++ new/vzsyscalls.h   2014-07-16 12:01:27.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

diff --git a/debian/patches/fix-qemu-img-snapshot-removal.patch b/debian/patches/fix-qemu-img-snapshot-removal.patch
index 70f29cb5ce438ac3509fae0494acabfdb0877b72..1053880eaea9bf930f9b9c24f5d8b42b65623da3 100644 (file)
--- a/debian/patches/fix-qemu-img-snapshot-removal.patch
+++ b/debian/patches/fix-qemu-img-snapshot-removal.patch
@@ -1,8 +1,8 @@
 Index: new/qemu-img.c
 ===================================================================
---- new.orig/qemu-img.c        2014-06-17 06:14:28.000000000 +0200
-+++ new/qemu-img.c     2014-06-17 06:14:56.000000000 +0200
-@@ -1939,7 +1939,8 @@
+--- new.orig/qemu-img.c        2014-07-16 11:53:56.000000000 +0200
++++ new/qemu-img.c     2014-07-16 12:01:29.000000000 +0200
+@@ -1931,7 +1931,8 @@
  
      list = collect_image_info_list(filename, fmt, chain);
      if (!list) {

diff --git a/debian/patches/fr-ca-keymap-corrections.diff b/debian/patches/fr-ca-keymap-corrections.diff
index 40e1b5437f33406b80fbeab567a859555abaaa7a..a1a3941e473e2fdcf676ce11fea1cc6e8731720e 100644 (file)
--- a/debian/patches/fr-ca-keymap-corrections.diff
+++ b/debian/patches/fr-ca-keymap-corrections.diff
@@ -1,7 +1,7 @@
 Index: new/pc-bios/keymaps/fr-ca
 ===================================================================
---- new.orig/pc-bios/keymaps/fr-ca     2014-06-17 06:14:28.000000000 +0200
-+++ new/pc-bios/keymaps/fr-ca  2014-06-17 06:14:35.000000000 +0200
+--- new.orig/pc-bios/keymaps/fr-ca     2014-07-16 11:53:56.000000000 +0200
++++ new/pc-bios/keymaps/fr-ca  2014-07-16 12:01:20.000000000 +0200
 @@ -14,22 +14,31 @@
  twosuperior 0x9 altgr
  threesuperior 0xa altgr

diff --git a/debian/patches/internal-snapshot-async.patch b/debian/patches/internal-snapshot-async.patch
index a7ab9875b4e8a5acd436031df858a8b99a7f5fdb..803cc9482f7a6887ef38257d61bd83d0773dcbaf 100644 (file)
--- a/debian/patches/internal-snapshot-async.patch
+++ b/debian/patches/internal-snapshot-async.patch
@@ -23,8 +23,8 @@ Subject: [PATCH] internal-snapshot-async-qemu1.7.patch
 
 Index: new/Makefile.objs
 ===================================================================
---- new.orig/Makefile.objs     2014-06-17 06:15:02.000000000 +0200
-+++ new/Makefile.objs  2014-06-17 06:15:11.000000000 +0200
+--- new.orig/Makefile.objs     2014-07-16 12:01:32.000000000 +0200
++++ new/Makefile.objs  2014-07-16 12:01:37.000000000 +0200
 @@ -57,6 +57,7 @@
  common-obj-y += qemu-char.o #aio.o
  common-obj-y += block-migration.o
@@ -35,9 +35,9 @@ Index: new/Makefile.objs
  
 Index: new/block.c
 ===================================================================
---- new.orig/block.c   2014-06-17 06:14:27.000000000 +0200
-+++ new/block.c        2014-06-17 06:15:11.000000000 +0200
-@@ -2077,7 +2077,7 @@
+--- new.orig/block.c   2014-07-16 11:53:55.000000000 +0200
++++ new/block.c        2014-07-16 12:01:37.000000000 +0200
+@@ -2070,7 +2070,7 @@
      bdrv_set_backing_hd(bs_top, bs_new);
  }
  
@@ -48,8 +48,8 @@ Index: new/block.c
      assert(!bs->job);
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2014-06-17 06:15:08.000000000 +0200
-+++ new/hmp-commands.hx        2014-06-17 06:15:11.000000000 +0200
+--- new.orig/hmp-commands.hx   2014-07-16 12:01:35.000000000 +0200
++++ new/hmp-commands.hx        2014-07-16 12:01:37.000000000 +0200
 @@ -1803,6 +1803,8 @@
  show current migration capabilities
  @item info migrate_cache_size
@@ -97,11 +97,11 @@ Index: new/hmp-commands.hx
 +    },
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-17 06:15:08.000000000 +0200
-+++ new/hmp.c  2014-06-17 06:15:11.000000000 +0200
-@@ -1767,3 +1767,60 @@
-     qmp_object_del(id, &err);
-     hmp_handle_error(mon, &err);
+--- new.orig/hmp.c     2014-07-16 12:01:35.000000000 +0200
++++ new/hmp.c  2014-07-16 12:01:37.000000000 +0200
+@@ -1805,3 +1805,60 @@
+ 
+     monitor_printf(mon, "\n");
  }
 +
 +void hmp_savevm_start(Monitor *mon, const QDict *qdict)
@@ -162,8 +162,8 @@ Index: new/hmp.c
 +}
 Index: new/hmp.h
 ===================================================================
---- new.orig/hmp.h     2014-06-17 06:15:07.000000000 +0200
-+++ new/hmp.h  2014-06-17 06:15:11.000000000 +0200
+--- new.orig/hmp.h     2014-07-16 12:01:34.000000000 +0200
++++ new/hmp.h  2014-07-16 12:01:37.000000000 +0200
 @@ -26,6 +26,7 @@
  void hmp_info_uuid(Monitor *mon, const QDict *qdict);
  void hmp_info_chardev(Monitor *mon, const QDict *qdict);
@@ -185,9 +185,9 @@ Index: new/hmp.h
  void hmp_nbd_server_start(Monitor *mon, const QDict *qdict);
 Index: new/include/block/block.h
 ===================================================================
---- new.orig/include/block/block.h     2014-06-17 06:14:27.000000000 +0200
-+++ new/include/block/block.h  2014-06-17 06:15:11.000000000 +0200
-@@ -279,6 +279,7 @@
+--- new.orig/include/block/block.h     2014-07-16 11:53:55.000000000 +0200
++++ new/include/block/block.h  2014-07-16 12:01:37.000000000 +0200
+@@ -275,6 +275,7 @@
      const char *backing_file);
  int bdrv_get_backing_file_depth(BlockDriverState *bs);
  int bdrv_truncate(BlockDriverState *bs, int64_t offset);
@@ -197,9 +197,9 @@ Index: new/include/block/block.h
  void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
 Index: new/include/sysemu/sysemu.h
 ===================================================================
---- new.orig/include/sysemu/sysemu.h   2014-06-17 06:14:27.000000000 +0200
-+++ new/include/sysemu/sysemu.h        2014-06-17 06:15:11.000000000 +0200
-@@ -73,16 +73,17 @@
+--- new.orig/include/sysemu/sysemu.h   2014-07-16 11:53:55.000000000 +0200
++++ new/include/sysemu/sysemu.h        2014-07-16 12:01:37.000000000 +0200
+@@ -76,16 +76,17 @@
  
  void do_savevm(Monitor *mon, const QDict *qdict);
  int load_vmstate(const char *name);
@@ -221,9 +221,9 @@ Index: new/include/sysemu/sysemu.h
  int qemu_loadvm_state(QEMUFile *f);
 Index: new/monitor.c
 ===================================================================
---- new.orig/monitor.c 2014-06-17 06:15:07.000000000 +0200
-+++ new/monitor.c      2014-06-17 06:15:11.000000000 +0200
-@@ -2925,6 +2925,13 @@
+--- new.orig/monitor.c 2014-07-16 12:01:34.000000000 +0200
++++ new/monitor.c      2014-07-16 12:01:37.000000000 +0200
+@@ -2876,6 +2876,13 @@
          .mhandler.cmd = hmp_info_migrate_cache_size,
      },
      {
@@ -239,9 +239,9 @@ Index: new/monitor.c
          .params     = "",
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-17 06:15:08.000000000 +0200
-+++ new/qapi-schema.json       2014-06-17 06:15:11.000000000 +0200
-@@ -538,6 +538,42 @@
+--- new.orig/qapi-schema.json  2014-07-16 12:01:35.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:37.000000000 +0200
+@@ -547,6 +547,42 @@
             '*downtime': 'int',
             '*setup-time': 'int'} }
  
@@ -284,7 +284,7 @@ Index: new/qapi-schema.json
  ##
  # @query-migrate
  #
-@@ -2497,8 +2533,18 @@
+@@ -2644,8 +2680,18 @@
  #
  # Since: 1.2.0
  ##
@@ -305,9 +305,9 @@ Index: new/qapi-schema.json
  #
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2014-06-17 06:14:52.000000000 +0200
-+++ new/qemu-options.hx        2014-06-17 06:15:11.000000000 +0200
-@@ -2838,6 +2838,19 @@
+--- new.orig/qemu-options.hx   2014-07-16 12:01:27.000000000 +0200
++++ new/qemu-options.hx        2014-07-16 12:01:37.000000000 +0200
+@@ -2951,6 +2951,19 @@
  Start right away with a saved state (@code{loadvm} in monitor)
  ETEXI
  
@@ -329,10 +329,10 @@ Index: new/qemu-options.hx
      "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-06-17 06:15:07.000000000 +0200
-+++ new/qmp-commands.hx        2014-06-17 06:15:11.000000000 +0200
-@@ -3603,3 +3603,34 @@
-                    } } ] }
+--- new.orig/qmp-commands.hx   2014-07-16 12:01:34.000000000 +0200
++++ new/qmp-commands.hx        2014-07-16 12:01:37.000000000 +0200
+@@ -3786,3 +3786,34 @@
+ <- { "return": {} }
  
  EQMP
 +
@@ -369,7 +369,7 @@ Index: new/qmp-commands.hx
 Index: new/savevm-async.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/savevm-async.c 2014-06-17 06:15:11.000000000 +0200
++++ new/savevm-async.c 2014-07-16 12:01:37.000000000 +0200
 @@ -0,0 +1,486 @@
 +#include "qemu-common.h"
 +#include "qapi/qmp/qerror.h"
@@ -859,9 +859,9 @@ Index: new/savevm-async.c
 +}
 Index: new/savevm.c
 ===================================================================
---- new.orig/savevm.c  2014-06-17 06:14:27.000000000 +0200
-+++ new/savevm.c       2014-06-17 06:15:11.000000000 +0200
-@@ -461,11 +461,11 @@
+--- new.orig/savevm.c  2014-07-16 11:53:55.000000000 +0200
++++ new/savevm.c       2014-07-16 12:01:37.000000000 +0200
+@@ -596,11 +596,11 @@
      return false;
  }
  
@@ -875,7 +875,7 @@ Index: new/savevm.c
  
      trace_savevm_state_begin();
      QTAILQ_FOREACH(se, &savevm_handlers, entry) {
-@@ -507,6 +507,7 @@
+@@ -642,6 +642,7 @@
              break;
          }
      }
@@ -883,7 +883,7 @@ Index: new/savevm.c
  }
  
  /*
-@@ -555,7 +556,7 @@
+@@ -690,7 +691,7 @@
      return ret;
  }
  
@@ -892,7 +892,7 @@ Index: new/savevm.c
  {
      SaveStateEntry *se;
      int ret;
-@@ -582,7 +583,7 @@
+@@ -717,7 +718,7 @@
          trace_savevm_section_end(se->idstr, se->section_id);
          if (ret < 0) {
              qemu_file_set_error(f, ret);
@@ -901,7 +901,7 @@ Index: new/savevm.c
          }
      }
  
-@@ -611,6 +612,7 @@
+@@ -746,6 +747,7 @@
  
      qemu_put_byte(f, QEMU_VM_EOF);
      qemu_fflush(f);
@@ -911,9 +911,9 @@ Index: new/savevm.c
  uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-17 06:15:00.000000000 +0200
-+++ new/vl.c   2014-06-17 06:15:11.000000000 +0200
-@@ -2979,6 +2979,7 @@
+--- new.orig/vl.c      2014-07-16 12:01:30.000000000 +0200
++++ new/vl.c   2014-07-16 12:01:37.000000000 +0200
+@@ -2920,6 +2920,7 @@
      int optind;
      const char *optarg;
      const char *loadvm = NULL;
@@ -921,7 +921,7 @@ Index: new/vl.c
      MachineClass *machine_class;
      const char *cpu_model;
      const char *vga_model = NULL;
-@@ -3628,6 +3629,9 @@
+@@ -3614,6 +3615,9 @@
            case QEMU_OPTION_loadvm:
                loadvm = optarg;
                break;
@@ -931,7 +931,7 @@ Index: new/vl.c
              case QEMU_OPTION_full_screen:
                  full_screen = 1;
                  break;
-@@ -4599,6 +4603,10 @@
+@@ -4558,6 +4562,10 @@
          if (load_vmstate(loadvm) < 0) {
              autostart = 0;
          }

diff --git a/debian/patches/keymap.diff b/debian/patches/keymap.diff
index 5a4206d0089735bbddf316dc57011806c4d16c1f..28bb19462b23c6450d20a0e0c379212bfca78fd4 100644 (file)
--- a/debian/patches/keymap.diff
+++ b/debian/patches/keymap.diff
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc.c       2014-06-17 06:14:54.000000000 +0200
-@@ -1626,6 +1626,10 @@
+--- new.orig/ui/vnc.c  2014-07-16 11:53:56.000000000 +0200
++++ new/ui/vnc.c       2014-07-16 12:01:27.000000000 +0200
+@@ -1631,6 +1631,10 @@
  
  static void do_key_event(VncState *vs, int down, int keycode, int sym)
  {
@@ -13,7 +13,7 @@ Index: new/ui/vnc.c
      /* QEMU console switch */
      switch(keycode) {
      case 0x2a:                          /* Left Shift */
-@@ -1705,7 +1709,24 @@
+@@ -1710,7 +1714,24 @@
      }
  
      if (qemu_console_is_graphic(NULL)) {
@@ -38,7 +38,7 @@ Index: new/ui/vnc.c
      } else {
          bool numlock = vs->modifiers_state[0x45];
          bool control = (vs->modifiers_state[0x1d] ||
-@@ -1844,7 +1865,8 @@
+@@ -1849,7 +1870,8 @@
          lsym = lsym - 'A' + 'a';
      }
  
@@ -48,7 +48,7 @@ Index: new/ui/vnc.c
      trace_vnc_key_event_map(down, sym, keycode, code2name(keycode));
      do_key_event(vs, down, keycode, sym);
  }
-@@ -3036,7 +3058,7 @@
+@@ -3032,7 +3054,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = vnc_display;

diff --git a/debian/patches/modify-query-machines.patch b/debian/patches/modify-query-machines.patch
index 6dc8e218f184a9bff3ef7e3a8557676ff5918208..81556a439d6489f8b77d4867fc65823008e5eb93 100644 (file)
--- a/debian/patches/modify-query-machines.patch
+++ b/debian/patches/modify-query-machines.patch
@@ -1,8 +1,8 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-17 06:14:58.000000000 +0200
-+++ new/qapi-schema.json       2014-06-17 06:15:00.000000000 +0200
-@@ -2241,6 +2241,8 @@
+--- new.orig/qapi-schema.json  2014-07-16 12:01:29.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:30.000000000 +0200
+@@ -2388,6 +2388,8 @@
  #
  # @default: #optional whether the machine is default
  #
@@ -11,7 +11,7 @@ Index: new/qapi-schema.json
  # @cpu-max: maximum number of CPUs supported by the machine type
  #           (since 1.5.0)
  #
-@@ -2248,7 +2250,7 @@
+@@ -2395,7 +2397,7 @@
  ##
  { 'type': 'MachineInfo',
    'data': { 'name': 'str', '*alias': 'str',
@@ -22,9 +22,9 @@ Index: new/qapi-schema.json
  # @query-machines:
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-17 06:14:57.000000000 +0200
-+++ new/vl.c   2014-06-17 06:15:00.000000000 +0200
-@@ -1699,6 +1699,11 @@
+--- new.orig/vl.c      2014-07-16 12:01:29.000000000 +0200
++++ new/vl.c   2014-07-16 12:01:30.000000000 +0200
+@@ -1660,6 +1660,11 @@
          info->name = g_strdup(mc->name);
          info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;
  

diff --git a/debian/patches/modify-query-spice.patch b/debian/patches/modify-query-spice.patch
index 261c9abd3052254b25543392156871abc35cade8..468dcbe23d55e5c2558d635dcdef5f463f679541 100644 (file)
--- a/debian/patches/modify-query-spice.patch
+++ b/debian/patches/modify-query-spice.patch
@@ -9,9 +9,9 @@ Limits: This only works for a single spice session.
 
 Index: new/ui/spice-core.c
 ===================================================================
---- new.orig/ui/spice-core.c   2014-06-17 06:14:27.000000000 +0200
-+++ new/ui/spice-core.c        2014-06-17 06:15:00.000000000 +0200
-@@ -541,6 +541,11 @@
+--- new.orig/ui/spice-core.c   2014-07-16 11:53:56.000000000 +0200
++++ new/ui/spice-core.c        2014-07-16 12:01:31.000000000 +0200
+@@ -544,6 +544,11 @@
      micro = SPICE_SERVER_VERSION & 0xff;
      info->compiled_version = g_strdup_printf("%d.%d.%d", major, minor, micro);
  
@@ -25,9 +25,9 @@ Index: new/ui/spice-core.c
          info->port = port;
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-17 06:15:00.000000000 +0200
-+++ new/qapi-schema.json       2014-06-17 06:15:00.000000000 +0200
-@@ -795,11 +795,14 @@
+--- new.orig/qapi-schema.json  2014-07-16 12:01:30.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:31.000000000 +0200
+@@ -865,11 +865,14 @@
  #
  # @channels: a list of @SpiceChannel for each active spice channel
  #

diff --git a/debian/patches/pve-auth.patch b/debian/patches/pve-auth.patch
index 808bba97f7b56d51c14891612958c6b6b7100286..3670ddda2dbfdbeff6bf2e8515d58e50a0992043 100644 (file)
--- a/debian/patches/pve-auth.patch
+++ b/debian/patches/pve-auth.patch
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2014-06-17 06:14:54.000000000 +0200
-+++ new/ui/vnc.c       2014-06-17 06:14:54.000000000 +0200
-@@ -45,6 +45,125 @@
+--- new.orig/ui/vnc.c  2014-07-16 12:01:27.000000000 +0200
++++ new/ui/vnc.c       2014-07-16 12:01:28.000000000 +0200
+@@ -46,6 +46,125 @@
  #include "vnc_keysym.h"
  #include "d3des.h"
  
@@ -128,7 +128,7 @@ Index: new/ui/vnc.c
  static VncDisplay *vnc_display; /* needed for info vnc */
  
  static int vnc_cursor_define(VncState *vs);
-@@ -3146,6 +3265,7 @@
+@@ -3142,6 +3261,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -136,7 +136,7 @@ Index: new/ui/vnc.c
              x509 = 1; /* Require x509 certificates */
              if (strncmp(options, "x509verify", 10) == 0)
                  vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -3166,8 +3286,10 @@
+@@ -3162,8 +3282,10 @@
                  }
                  g_free(path);
              } else {
@@ -149,7 +149,7 @@ Index: new/ui/vnc.c
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -3240,10 +3362,10 @@
+@@ -3236,10 +3358,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -164,8 +164,8 @@ Index: new/ui/vnc.c
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c    2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc-auth-vencrypt.c 2014-06-17 06:14:54.000000000 +0200
+--- new.orig/ui/vnc-auth-vencrypt.c    2014-07-16 11:53:56.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c 2014-07-16 12:01:28.000000000 +0200
 @@ -26,6 +26,107 @@
  
  #include "vnc.h"
@@ -289,9 +289,9 @@ Index: new/ui/vnc-auth-vencrypt.c
         VNC_DEBUG("Start TLS auth VNC\n");
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h  2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc.h       2014-06-17 06:14:54.000000000 +0200
-@@ -279,6 +279,8 @@
+--- new.orig/ui/vnc.h  2014-07-16 11:53:56.000000000 +0200
++++ new/ui/vnc.h       2014-07-16 12:01:28.000000000 +0200
+@@ -281,6 +281,8 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
      int subauth; /* Used by VeNCrypt */
@@ -300,7 +300,7 @@ Index: new/ui/vnc.h
      VncStateTLS tls;
  #endif
  #ifdef CONFIG_VNC_SASL
-@@ -594,4 +596,6 @@
+@@ -596,4 +598,6 @@
  int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
  void vnc_zrle_clear(VncState *vs);
  
@@ -309,8 +309,8 @@ Index: new/ui/vnc.h
  #endif /* __QEMU_VNC_H */
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c      2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc-tls.c   2014-06-17 06:14:54.000000000 +0200
+--- new.orig/ui/vnc-tls.c      2014-07-16 11:53:56.000000000 +0200
++++ new/ui/vnc-tls.c   2014-07-16 12:01:28.000000000 +0200
 @@ -302,6 +302,14 @@
  
  static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
@@ -338,7 +338,7 @@ Index: new/ui/vnc-tls.c
      rc = gnutls_kx_set_priority(s, x509 ? kx_x509 : kx_anon);
      if (rc != GNUTLS_E_SUCCESS) {
          return -1;
-@@ -466,6 +479,24 @@
+@@ -464,6 +477,24 @@
      return 0;
  }
  
@@ -365,8 +365,8 @@ Index: new/ui/vnc-tls.c
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h      2014-06-17 06:14:28.000000000 +0200
-+++ new/ui/vnc-tls.h   2014-06-17 06:14:54.000000000 +0200
+--- new.orig/ui/vnc-tls.h      2014-07-16 11:53:56.000000000 +0200
++++ new/ui/vnc-tls.h   2014-07-16 12:01:28.000000000 +0200
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);
@@ -378,9 +378,9 @@ Index: new/ui/vnc-tls.h
  
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-17 06:14:52.000000000 +0200
-+++ new/vl.c   2014-06-17 06:14:54.000000000 +0200
-@@ -3744,6 +3744,7 @@
+--- new.orig/vl.c      2014-07-16 12:01:27.000000000 +0200
++++ new/vl.c   2014-07-16 12:01:28.000000000 +0200
+@@ -3730,6 +3730,7 @@
                    fprintf(stderr, "Invalid ID\n");
                    exit(1);
                }
@@ -390,9 +390,9 @@ Index: new/vl.c
                  cpuunits = atoi(optarg);
 Index: new/include/ui/console.h
 ===================================================================
---- new.orig/include/ui/console.h      2014-06-17 06:14:28.000000000 +0200
-+++ new/include/ui/console.h   2014-06-17 06:14:54.000000000 +0200
-@@ -322,6 +322,7 @@
+--- new.orig/include/ui/console.h      2014-07-16 11:53:56.000000000 +0200
++++ new/include/ui/console.h   2014-07-16 12:01:28.000000000 +0200
+@@ -317,6 +317,7 @@
  void cocoa_display_init(DisplayState *ds, int full_screen);
  
  /* vnc.c */

diff --git a/debian/patches/set-cpu-model-to-kvm64.patch b/debian/patches/set-cpu-model-to-kvm64.patch
index dd37a6c0c9e850c41228545ff11d4682c3071189..a83069e64d447624010228397f23b8024f11f406 100644 (file)
--- a/debian/patches/set-cpu-model-to-kvm64.patch
+++ b/debian/patches/set-cpu-model-to-kvm64.patch
@@ -1,8 +1,8 @@
 Index: new/hw/i386/pc.c
 ===================================================================
---- new.orig/hw/i386/pc.c      2014-06-17 06:14:27.000000000 +0200
-+++ new/hw/i386/pc.c   2014-06-17 06:14:59.000000000 +0200
-@@ -1021,9 +1021,9 @@
+--- new.orig/hw/i386/pc.c      2014-07-16 11:53:56.000000000 +0200
++++ new/hw/i386/pc.c   2014-07-16 12:01:30.000000000 +0200
+@@ -1023,9 +1023,9 @@
      /* init CPUs */
      if (cpu_model == NULL) {
  #ifdef TARGET_X86_64

diff --git a/debian/patches/spice-use-pve-certs.patch b/debian/patches/spice-use-pve-certs.patch
index 65b61f74b26af098fb6176d427f3bcad8df3602f..f1cf37fa1df339ff0a9e7e8b0c199992b16493dc 100644 (file)
--- a/debian/patches/spice-use-pve-certs.patch
+++ b/debian/patches/spice-use-pve-certs.patch
@@ -1,8 +1,8 @@
 Index: new/ui/spice-core.c
 ===================================================================
---- new.orig/ui/spice-core.c   2014-06-17 06:15:00.000000000 +0200
-+++ new/ui/spice-core.c        2014-06-17 06:15:01.000000000 +0200
-@@ -679,32 +679,35 @@
+--- new.orig/ui/spice-core.c   2014-07-16 12:01:31.000000000 +0200
++++ new/ui/spice-core.c        2014-07-16 12:01:31.000000000 +0200
+@@ -682,32 +682,35 @@
  
      if (tls_port) {
          x509_dir = qemu_opt_get(opts, "x509-dir");

diff --git a/debian/patches/vencrypt-auth-plain.patch b/debian/patches/vencrypt-auth-plain.patch
index b068ba0639331b4c8dfddb241d950e63a80086dd..c9d45029a17443289439c3b8d9b211b86510379f 100644 (file)
--- a/debian/patches/vencrypt-auth-plain.patch
+++ b/debian/patches/vencrypt-auth-plain.patch
@@ -1,7 +1,7 @@
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c    2014-06-17 06:14:54.000000000 +0200
-+++ new/ui/vnc-auth-vencrypt.c 2014-06-17 06:14:55.000000000 +0200
+--- new.orig/ui/vnc-auth-vencrypt.c    2014-07-16 12:01:28.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c 2014-07-16 12:01:28.000000000 +0200
 @@ -144,6 +144,11 @@
         vnc_read_when(vs, protocol_client_auth_plain_start, 8);
         break;

diff --git a/debian/patches/virtio-balloon-fix-query.patch b/debian/patches/virtio-balloon-fix-query.patch
index 649211c1e98bf9a1ef1a9a88daca758c93a36cb5..fd21ed24d65bc25432c1446470c2d10bb5ebc0f6 100644 (file)
--- a/debian/patches/virtio-balloon-fix-query.patch
+++ b/debian/patches/virtio-balloon-fix-query.patch
@@ -1,8 +1,8 @@
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-17 06:14:28.000000000 +0200
-+++ new/hmp.c  2014-06-17 06:14:58.000000000 +0200
-@@ -536,7 +536,35 @@
+--- new.orig/hmp.c     2014-07-16 11:53:56.000000000 +0200
++++ new/hmp.c  2014-07-16 12:01:29.000000000 +0200
+@@ -539,7 +539,35 @@
          return;
      }
  
@@ -41,9 +41,9 @@ Index: new/hmp.c
  }
 Index: new/hw/virtio/virtio-balloon.c
 ===================================================================
---- new.orig/hw/virtio/virtio-balloon.c        2014-06-17 06:14:28.000000000 +0200
-+++ new/hw/virtio/virtio-balloon.c     2014-06-17 06:14:58.000000000 +0200
-@@ -305,6 +305,35 @@
+--- new.orig/hw/virtio/virtio-balloon.c        2014-07-16 11:53:56.000000000 +0200
++++ new/hw/virtio/virtio-balloon.c     2014-07-16 12:01:29.000000000 +0200
+@@ -309,6 +309,35 @@
      VirtIOBalloon *dev = opaque;
      info->actual = ram_size - ((uint64_t) dev->actual <<
                                 VIRTIO_BALLOON_PFN_SHIFT);
@@ -81,9 +81,9 @@ Index: new/hw/virtio/virtio-balloon.c
  static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-17 06:14:28.000000000 +0200
-+++ new/qapi-schema.json       2014-06-17 06:14:58.000000000 +0200
-@@ -815,15 +815,34 @@
+--- new.orig/qapi-schema.json  2014-07-16 11:53:56.000000000 +0200
++++ new/qapi-schema.json       2014-07-16 12:01:29.000000000 +0200
+@@ -885,15 +885,34 @@
  
  ##
  # @BalloonInfo:
@@ -123,9 +123,9 @@ Index: new/qapi-schema.json
  # @query-balloon:
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-06-17 06:14:28.000000000 +0200
-+++ new/qmp-commands.hx        2014-06-17 06:14:58.000000000 +0200
-@@ -3162,6 +3162,13 @@
+--- new.orig/qmp-commands.hx   2014-07-16 11:53:56.000000000 +0200
++++ new/qmp-commands.hx        2014-07-16 12:01:29.000000000 +0200
+@@ -3235,6 +3235,13 @@
  json-object will be returned containing the following data:
  
  - "actual": current balloon value in bytes (json-int)
@@ -139,7 +139,7 @@ Index: new/qmp-commands.hx
  
  Example:
  
-@@ -3169,6 +3176,12 @@
+@@ -3242,6 +3249,12 @@
  <- {
        "return":{
           "actual":1073741824,