refresh all quilt patches

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index 818cb69090429a45be133bc63c6b7ad2bd6f0d83..b616e9a514f6f8d5b4a2d15185588850f8dd58e4 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,8 +1,8 @@
 Index: new/include/net/net.h
 ===================================================================
---- new.orig/include/net/net.h 2014-05-05 07:07:13.000000000 +0200
-+++ new/include/net/net.h      2014-05-05 07:07:23.000000000 +0200
-@@ -195,8 +195,9 @@
+--- 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
+@@ -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-05-05 07:07:13.000000000 +0200
-+++ new/net/tap_int.h  2014-05-05 07:07:23.000000000 +0200
+--- 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
 @@ -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 bc0d0d98b32156505c3c68874b7c876727005326..49bd8153af7afb35eea00d6b518dd4438189e055 100644 (file)
--- a/debian/patches/backup-add-dir-format.patch
+++ b/debian/patches/backup-add-dir-format.patch
@@ -1,7 +1,7 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-12 11:39:32.000000000 +0200
-+++ new/qapi-schema.json       2014-06-12 11:51:17.000000000 +0200
+--- 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 @@
  # @vma: Proxmox vma backup format
  ##
@@ -13,8 +13,8 @@ Index: new/qapi-schema.json
  # @backup:
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-06-12 11:49:28.000000000 +0200
-+++ new/blockdev.c     2014-06-12 12:05:39.000000000 +0200
+--- 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 @@
      uint8_t dev_id;
      //bool started;
@@ -224,8 +224,8 @@ Index: new/blockdev.c
  
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2014-06-12 11:39:32.000000000 +0200
-+++ new/hmp-commands.hx        2014-06-12 11:51:17.000000000 +0200
+--- 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
 @@ -90,9 +90,11 @@
  
     {
@@ -243,8 +243,8 @@ Index: new/hmp-commands.hx
  
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-12 11:39:32.000000000 +0200
-+++ new/hmp.c  2014-06-12 11:51:17.000000000 +0200
+--- 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 @@
  {
      Error *error = NULL;

diff --git a/debian/patches/backup-add-pve-monitor-commands.patch b/debian/patches/backup-add-pve-monitor-commands.patch
index 6f545cd2a59b70840df0dc89a5ccd9c5850ffdc9..4467fe0203d4ed93a7adffed509c85f9ab282f5a 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-06-12 11:39:00.000000000 +0200
-+++ new/blockdev.c     2014-06-12 11:49:28.000000000 +0200
+--- new.orig/blockdev.c        2014-06-17 06:15:06.000000000 +0200
++++ new/blockdev.c     2014-06-17 06:15:07.000000000 +0200
 @@ -44,6 +44,7 @@
  #include "qmp-commands.h"
  #include "trace.h"
@@ -457,8 +457,8 @@ Index: new/blockdev.c
                        bool has_on_error, BlockdevOnError on_error,
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2014-06-12 10:19:18.000000000 +0200
-+++ new/hmp-commands.hx        2014-06-12 11:39:32.000000000 +0200
+--- new.orig/hmp-commands.hx   2014-06-17 06:14:27.000000000 +0200
++++ new/hmp-commands.hx        2014-06-17 06:15:07.000000000 +0200
 @@ -88,6 +88,35 @@
  Copy data from a backing file into a block device.
  ETEXI
@@ -506,8 +506,8 @@ Index: new/hmp-commands.hx
  @item info migrate_capabilities
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-12 10:50:04.000000000 +0200
-+++ new/hmp.c  2014-06-12 11:39:32.000000000 +0200
+--- new.orig/hmp.c     2014-06-17 06:14:58.000000000 +0200
++++ new/hmp.c  2014-06-17 06:15:07.000000000 +0200
 @@ -135,6 +135,44 @@
      qapi_free_MouseInfoList(mice_list);
  }
@@ -585,8 +585,8 @@ Index: new/hmp.c
  {
 Index: new/hmp.h
 ===================================================================
---- new.orig/hmp.h     2014-06-12 10:19:18.000000000 +0200
-+++ new/hmp.h  2014-06-12 11:39:32.000000000 +0200
+--- new.orig/hmp.h     2014-06-17 06:14:27.000000000 +0200
++++ new/hmp.h  2014-06-17 06:15:07.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);
@@ -606,8 +606,8 @@ Index: new/hmp.h
  void hmp_block_job_pause(Monitor *mon, const QDict *qdict);
 Index: new/monitor.c
 ===================================================================
---- new.orig/monitor.c 2014-06-12 10:19:18.000000000 +0200
-+++ new/monitor.c      2014-06-12 11:39:32.000000000 +0200
+--- new.orig/monitor.c 2014-06-17 06:14:27.000000000 +0200
++++ new/monitor.c      2014-06-17 06:15:07.000000000 +0200
 @@ -2897,6 +2897,13 @@
      },
  #endif
@@ -624,8 +624,8 @@ Index: new/monitor.c
          .params     = "",
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-12 11:13:26.000000000 +0200
-+++ new/qapi-schema.json       2014-06-12 11:39:32.000000000 +0200
+--- new.orig/qapi-schema.json  2014-06-17 06:15:00.000000000 +0200
++++ new/qapi-schema.json       2014-06-17 06:15:07.000000000 +0200
 @@ -340,6 +340,95 @@
  ##
  { 'command': 'query-events', 'returns': ['EventInfo'] }
@@ -724,8 +724,8 @@ Index: new/qapi-schema.json
  #
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-06-12 10:50:04.000000000 +0200
-+++ new/qmp-commands.hx        2014-06-12 11:39:32.000000000 +0200
+--- new.orig/qmp-commands.hx   2014-06-17 06:14:58.000000000 +0200
++++ new/qmp-commands.hx        2014-06-17 06:15:07.000000000 +0200
 @@ -1080,6 +1080,24 @@
  EQMP
  

diff --git a/debian/patches/backup-add-vma-binary.patch b/debian/patches/backup-add-vma-binary.patch
index dd176e48439f8c011571a0214b8416d59762c864..d9c8abdd5d765ada5b8e48c8a7215bce68ff9dab 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-06-12 10:19:18.000000000 +0200
-+++ new/Makefile       2014-06-12 11:17:40.000000000 +0200
+--- new.orig/Makefile  2014-06-17 06:14:27.000000000 +0200
++++ new/Makefile       2014-06-17 06:15:02.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-06-12 11:17:40.000000000 +0200
++++ new/vma-reader.c   2014-06-17 06:15:02.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-06-12 11:17:40.000000000 +0200
++++ new/vma-writer.c   2014-06-17 06:15:02.000000000 +0200
 @@ -0,0 +1,875 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -1730,7 +1730,7 @@ Index: new/vma-writer.c
 Index: new/vma.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma.c  2014-06-12 11:37:50.000000000 +0200
++++ new/vma.c  2014-06-17 06:15:02.000000000 +0200
 @@ -0,0 +1,583 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -2318,7 +2318,7 @@ Index: new/vma.c
 Index: new/vma.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vma.h  2014-06-12 11:17:40.000000000 +0200
++++ new/vma.h  2014-06-17 06:15:02.000000000 +0200
 @@ -0,0 +1,146 @@
 +/*
 + * VMA: Virtual Machine Archive
@@ -2468,8 +2468,8 @@ Index: new/vma.h
 +#endif /* BACKUP_VMA_H */
 Index: new/Makefile.objs
 ===================================================================
---- new.orig/Makefile.objs     2014-06-12 10:19:18.000000000 +0200
-+++ new/Makefile.objs  2014-06-12 11:17:40.000000000 +0200
+--- new.orig/Makefile.objs     2014-06-17 06:14:27.000000000 +0200
++++ new/Makefile.objs  2014-06-17 06:15:02.000000000 +0200
 @@ -14,6 +14,7 @@
  block-obj-y += block/
  block-obj-y += qapi-types.o qapi-visit.o

diff --git a/debian/patches/backup-add-vma-verify-command.patch b/debian/patches/backup-add-vma-verify-command.patch
index 7219ad52215cb7ba691819ad81355a5cb96dbaa8..d96d1feaaca953a7e831c0de3cbd2b90b72f5453 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-05-05 08:19:03.000000000 +0200
-+++ new/vma-reader.c   2014-05-05 08:21:52.000000000 +0200
+--- 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
 @@ -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-05-05 08:19:03.000000000 +0200
-+++ new/vma.c  2014-05-05 08:21:52.000000000 +0200
+--- new.orig/vma.c     2014-06-17 06:15:02.000000000 +0200
++++ new/vma.c  2014-06-17 06:15:03.000000000 +0200
 @@ -34,6 +34,7 @@
          "vma list <filename>\n"
          "vma create <filename> [-c config] <archive> pathname ...\n"
@@ -296,7 +296,7 @@ Index: new/vma.c
  typedef struct BackupJob {
      BlockDriverState *bs;
      int64_t len;
-@@ -572,6 +625,8 @@
+@@ -576,6 +629,8 @@
          return create_archive(argc, argv);
      } else if (!strcmp(cmdname, "extract")) {
          return extract_content(argc, argv);
@@ -307,8 +307,8 @@ Index: new/vma.c
      help();
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-05-05 08:19:03.000000000 +0200
-+++ new/vma.h  2014-05-05 08:21:52.000000000 +0200
+--- new.orig/vma.h     2014-06-17 06:15:02.000000000 +0200
++++ new/vma.h  2014-06-17 06:15:03.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 283cb311d0f8330bf01ae0572777d996e94e58b8..1d095431027f2582009759a75e94c67e0a92e36c 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-05-05 09:36:50.000000000 +0200
-+++ new/blockdev.c     2014-05-05 09:40:22.000000000 +0200
-@@ -1862,6 +1862,11 @@
+--- 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 @@
  {
      PVEBackupDevInfo *di = opaque;
  
@@ -20,7 +20,7 @@ Index: new/blockdev.c
      if (sector_num & 0x7f) {
          if (!backup_state.error) {
              error_setg(&backup_state.error,
-@@ -1872,7 +1877,6 @@
+@@ -1924,7 +1929,6 @@
      }
  
      int64_t cluster_num = sector_num >> 7;
@@ -28,7 +28,7 @@ Index: new/blockdev.c
  
      int ret = -1;
  
-@@ -1880,17 +1884,27 @@
+@@ -1932,17 +1936,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)
-@@ -1962,7 +1976,7 @@
+@@ -2014,7 +2028,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 50e3ae04ad1bfb289c4f0993e7a4538d5fe1aadf..f6f79539cd574cb938b6e94e810943d7eb2deb90 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-05-05 06:55:25.000000000 +0200
-+++ new/block/backup.c 2014-05-05 09:24:11.000000000 +0200
+--- new.orig/block/backup.c    2014-06-17 06:14:27.000000000 +0200
++++ new/block/backup.c 2014-06-17 06:15:06.000000000 +0200
 @@ -39,6 +39,7 @@
      BlockDriverState *target;
      MirrorSyncMode sync_mode;
@@ -122,9 +122,9 @@ Index: new/block/backup.c
      qemu_coroutine_enter(job->common.co, job);
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-05-05 06:55:26.000000000 +0200
-+++ new/blockdev.c     2014-05-05 09:16:48.000000000 +0200
-@@ -2030,7 +2030,7 @@
+--- new.orig/blockdev.c        2014-06-17 06:14:27.000000000 +0200
++++ new/blockdev.c     2014-06-17 06:15:06.000000000 +0200
+@@ -2089,7 +2089,7 @@
      }
  
      backup_start(bs, target_bs, speed, sync, on_source_error, on_target_error,
@@ -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-05-05 06:55:26.000000000 +0200
-+++ new/include/block/block_int.h      2014-05-05 09:16:48.000000000 +0200
+--- new.orig/include/block/block_int.h 2014-06-17 06:14:27.000000000 +0200
++++ new/include/block/block_int.h      2014-06-17 06:15:06.000000000 +0200
 @@ -55,6 +55,9 @@
  #define BLOCK_OPT_ADAPTER_TYPE      "adapter_type"
  #define BLOCK_OPT_REDUNDANCY        "redundancy"
@@ -147,7 +147,7 @@ Index: new/include/block/block_int.h
  typedef struct BdrvTrackedRequest {
      BlockDriverState *bs;
      int64_t offset;
-@@ -496,7 +499,9 @@
+@@ -532,7 +535,9 @@
                    int64_t speed, MirrorSyncMode sync_mode,
                    BlockdevOnError on_source_error,
                    BlockdevOnError on_target_error,

diff --git a/debian/patches/backup-vma-add-dump-config.patch b/debian/patches/backup-vma-add-dump-config.patch
index 9947deed1ad27a8e987c9552b3a1d987192f9d79..8b8337e20a3b4fc9ae5bcfb1ec326852f37d0a22 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     2013-12-04 10:47:53.000000000 +0100
-+++ new/vma.c  2013-12-04 10:47:57.000000000 +0100
+--- new.orig/vma.c     2014-06-17 06:15:03.000000000 +0200
++++ new/vma.c  2014-06-17 06:15:04.000000000 +0200
 @@ -32,6 +32,7 @@
          "usage: vma command [command options]\n"
          "\n"
@@ -10,7 +10,7 @@ Index: new/vma.c
          "vma create <filename> [-c config] <archive> pathname ...\n"
          "vma extract <filename> [-r <fifo>] <targetdir>\n"
          "vma verify <filename> [-v]\n"
-@@ -601,6 +602,67 @@
+@@ -605,6 +606,67 @@
      return 0;
  }
  
@@ -78,7 +78,7 @@ Index: new/vma.c
  int main(int argc, char **argv)
  {
      const char *cmdname;
-@@ -627,6 +689,8 @@
+@@ -631,6 +693,8 @@
          return extract_content(argc, argv);
      } else if (!strcmp(cmdname, "verify")) {
          return verify_content(argc, argv);

diff --git a/debian/patches/backup-vma-allow-empty-backups.patch b/debian/patches/backup-vma-allow-empty-backups.patch
index 10a9082390008f6c3b071ecb603662497a7bcbc8..18edae2ded83748d84d4acb5f039cacf1b9b62dd 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-05-05 09:15:31.000000000 +0200
-+++ new/vma-reader.c   2014-05-05 09:45:24.000000000 +0200
+--- 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
 @@ -334,11 +334,6 @@
          }
      }
@@ -52,8 +52,8 @@ Index: new/vma-reader.c
      return ret;
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-05-05 09:41:57.000000000 +0200
-+++ new/vma-writer.c   2014-05-05 09:45:24.000000000 +0200
+--- 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 @@
      }
  
@@ -114,8 +114,8 @@ Index: new/vma-writer.c
      return open_drives;
 Index: new/vma.c
 ===================================================================
---- new.orig/vma.c     2014-05-05 08:22:49.000000000 +0200
-+++ new/vma.c  2014-05-05 09:45:24.000000000 +0200
+--- new.orig/vma.c     2014-06-17 06:15:04.000000000 +0200
++++ new/vma.c  2014-06-17 06:15:13.000000000 +0200
 @@ -33,7 +33,7 @@
          "\n"
          "vma list <filename>\n"
@@ -168,8 +168,8 @@ Index: new/vma.c
 +        path = extract_devname(path, &devname, devcount++);
  
          BlockDriver *drv = NULL;
-         BlockDriverState *bs = bdrv_new(devname);
-@@ -546,37 +558,42 @@
+         Error *errp = NULL;
+@@ -550,37 +562,42 @@
      int percent = 0;
      int last_percent = -1;
  
@@ -240,8 +240,8 @@ Index: new/vma.c
      bdrv_drain_all();
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-05-05 09:41:01.000000000 +0200
-+++ new/vma.h  2014-05-05 09:45:24.000000000 +0200
+--- new.orig/vma.h     2014-06-17 06:15:09.000000000 +0200
++++ new/vma.h  2014-06-17 06:15:13.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 a87f663e3ff78f4ac2f1a9e1234378997b31ed24..a46bc3c89b5cccd2a1e35ce6265bb9a933838825 100644 (file)
--- a/debian/patches/backup-vma-correctly-propagate-error.patch
+++ b/debian/patches/backup-vma-correctly-propagate-error.patch
@@ -1,7 +1,7 @@
 Index: new/vma-writer.c
 ===================================================================
---- new.orig/vma-writer.c      2014-05-05 08:19:03.000000000 +0200
-+++ new/vma-writer.c   2014-05-05 09:41:01.000000000 +0200
+--- 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 @@
      return transferred;
  }
@@ -18,8 +18,8 @@ Index: new/vma-writer.c
      g_assert(vmaw != NULL);
 Index: new/vma.h
 ===================================================================
---- new.orig/vma.h     2014-05-05 08:21:52.000000000 +0200
-+++ new/vma.h  2014-05-05 09:41:01.000000000 +0200
+--- new.orig/vma.h     2014-06-17 06:15:03.000000000 +0200
++++ new/vma.h  2014-06-17 06:15:09.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-05-05 09:40:22.000000000 +0200
-+++ new/blockdev.c     2014-05-05 09:41:01.000000000 +0200
-@@ -1886,7 +1886,7 @@
+--- 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 @@
                                 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 52e82e2cf7af312bae98763bc49c5cab73eb6d57..924c6b5ebf789cfb3e4aacab6d2268ca6d33404f 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-05-05 09:41:01.000000000 +0200
-+++ new/vma-writer.c   2014-05-05 09:41:57.000000000 +0200
+--- new.orig/vma-writer.c      2014-06-17 06:15:09.000000000 +0200
++++ new/vma-writer.c   2014-06-17 06:15:10.000000000 +0200
 @@ -33,14 +33,8 @@
      do { if (DEBUG_VMA) { printf("vma: " fmt, ## __VA_ARGS__); } } while (0)
  
@@ -285,9 +285,9 @@ Index: new/vma-writer.c
  }
 Index: new/blockdev.c
 ===================================================================
---- new.orig/blockdev.c        2014-05-05 09:41:01.000000000 +0200
-+++ new/blockdev.c     2014-05-05 09:41:57.000000000 +0200
-@@ -1965,6 +1965,11 @@
+--- new.orig/blockdev.c        2014-06-17 06:15:09.000000000 +0200
++++ new/blockdev.c     2014-06-17 06:15:10.000000000 +0200
+@@ -2017,6 +2017,11 @@
          error_setg(&backup_state.error, "backup cancelled");
      }
  
@@ -299,7 +299,7 @@ Index: new/blockdev.c
      /* drain all i/o (awake jobs waiting for aio) */
      bdrv_drain_all();
  
-@@ -1977,6 +1982,7 @@
+@@ -2029,6 +2034,7 @@
              if (job) {
                  if (!di->completed) {
                       block_job_cancel_sync(job);

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 2e76dae8c197a90132155d391bfa4491564bcb43..f6c226741b087d24b2f6432a32310c1ae7653f4e 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
@@ -9,11 +9,11 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
  vma-reader.c |    8 +++++++-
  1 files changed, 7 insertions(+), 1 deletions(-)
 
-diff --git a/vma-reader.c b/vma-reader.c
-index a740f04..69e7578 100644
---- a/vma-reader.c
-+++ b/vma-reader.c
-@@ -465,7 +465,13 @@ int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id, BlockDriverState *bs,
+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
+@@ -465,7 +465,13 @@
      assert(vmar->rstate[dev_id].bs == NULL);
  
      int64_t size = bdrv_getlength(bs);
@@ -28,6 +28,3 @@ index a740f04..69e7578 100644
          error_setg(errp, "vma_reader_register_bs for stream %s failed - "
                     "unexpected size %zd != %zd", vmar->devinfo[dev_id].devname,
                     size, vmar->devinfo[dev_id].size);
--- 
-1.7.2.5
-

diff --git a/debian/patches/disable-efi-enable-pxe-roms.patch b/debian/patches/disable-efi-enable-pxe-roms.patch
index 9218e239a2ed1981528119e26e1813a51d963423..3503abe955ea764135dbdbc83cdec05dad81e38c 100644 (file)
--- a/debian/patches/disable-efi-enable-pxe-roms.patch
+++ b/debian/patches/disable-efi-enable-pxe-roms.patch
@@ -1,20 +1,20 @@
 Index: new/hw/net/e1000.c
 ===================================================================
---- new.orig/hw/net/e1000.c    2014-05-05 06:55:25.000000000 +0200
-+++ new/hw/net/e1000.c 2014-05-05 10:05:59.000000000 +0200
-@@ -1571,7 +1571,7 @@
+--- 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 @@
  
      k->init = pci_e1000_init;
      k->exit = pci_e1000_uninit;
 -    k->romfile = "efi-e1000.rom";
 +    k->romfile = "pxe-e1000.rom";
      k->vendor_id = PCI_VENDOR_ID_INTEL;
-     k->device_id = E1000_DEVID;
-     k->revision = 0x03;
+     k->device_id = info->device_id;
+     k->revision = info->revision;
 Index: new/hw/net/ne2000.c
 ===================================================================
---- new.orig/hw/net/ne2000.c   2014-05-05 06:55:25.000000000 +0200
-+++ new/hw/net/ne2000.c        2014-05-05 10:05:59.000000000 +0200
+--- 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 @@
  
      k->init = pci_ne2000_init;
@@ -26,8 +26,8 @@ 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-05-05 06:55:25.000000000 +0200
-+++ new/hw/net/pcnet-pci.c     2014-05-05 10:05:59.000000000 +0200
+--- 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 @@
  
      k->init = pci_pcnet_init;
@@ -39,8 +39,8 @@ Index: new/hw/net/pcnet-pci.c
      k->revision = 0x10;
 Index: new/hw/net/rtl8139.c
 ===================================================================
---- new.orig/hw/net/rtl8139.c  2014-05-05 06:55:25.000000000 +0200
-+++ new/hw/net/rtl8139.c       2014-05-05 10:05:59.000000000 +0200
+--- 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 @@
  
      k->init = pci_rtl8139_init;
@@ -52,8 +52,8 @@ 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-05-05 06:55:25.000000000 +0200
-+++ new/hw/virtio/virtio-pci.c 2014-05-05 10:05:59.000000000 +0200
+--- 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 @@
      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 d766e9bf7978186b188660e1b8ce58494120c64c..95dc4ff4688e1d802a8a09e697bbef8ac9bef706 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-05-05 07:24:10.000000000 +0200
-+++ new/vl.c   2014-05-05 07:34:04.000000000 +0200
-@@ -2729,8 +2729,8 @@
+--- 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 @@
  
      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 1db01a32430f098febc1df0c4496c5be3352a4fb..417687844b24280e55e5a9a61db2399cad7bd78c 100644 (file)
--- a/debian/patches/fairsched.diff
+++ b/debian/patches/fairsched.diff
@@ -1,8 +1,8 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2014-05-05 07:07:11.000000000 +0200
-+++ new/qemu-options.hx        2014-05-05 07:13:45.000000000 +0200
-@@ -363,6 +363,12 @@
+--- new.orig/qemu-options.hx   2014-06-17 06:14:28.000000000 +0200
++++ new/qemu-options.hx        2014-06-17 06:14:52.000000000 +0200
+@@ -366,6 +366,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-05-05 07:07:11.000000000 +0200
-+++ new/vl.c   2014-05-05 07:13:45.000000000 +0200
+--- new.orig/vl.c      2014-06-17 06:14:28.000000000 +0200
++++ new/vl.c   2014-06-17 06:14:52.000000000 +0200
 @@ -102,6 +102,8 @@
  #endif
  #include "sysemu/qtest.h"
@@ -36,7 +36,7 @@ Index: new/vl.c
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -2930,6 +2933,9 @@
+@@ -2956,6 +2959,9 @@
  int main(int argc, char **argv, char **envp)
  {
      int i;
@@ -46,7 +46,7 @@ Index: new/vl.c
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -3677,6 +3683,21 @@
+@@ -3731,6 +3737,21 @@
                      exit(1);
                  }
                  break;
@@ -68,7 +68,7 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -4268,6 +4289,39 @@
+@@ -4332,6 +4353,39 @@
          }
      }
  
@@ -111,7 +111,7 @@ Index: new/vl.c
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2014-05-05 07:13:45.000000000 +0200
++++ new/vzsyscalls.h   2014-06-17 06:14:52.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 a5028c29c090bf65fe8be024dfc07be1fe778906..70f29cb5ce438ac3509fae0494acabfdb0877b72 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-05-05 06:55:26.000000000 +0200
-+++ new/qemu-img.c     2014-05-05 07:33:18.000000000 +0200
-@@ -1897,7 +1897,8 @@
+--- 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 @@
  
      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 c6e96069afd90ee6113fc47d30fc6b29c52465f1..40e1b5437f33406b80fbeab567a859555abaaa7a 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     2012-09-24 07:15:00.000000000 +0200
-+++ new/pc-bios/keymaps/fr-ca  2012-09-24 07:15:04.000000000 +0200
+--- 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
 @@ -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 2245794f631507ff3eaa9810d940ab84e557f212..a7ab9875b4e8a5acd436031df858a8b99a7f5fdb 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-12 11:17:40.000000000 +0200
-+++ new/Makefile.objs  2014-06-12 12:08:10.000000000 +0200
+--- new.orig/Makefile.objs     2014-06-17 06:15:02.000000000 +0200
++++ new/Makefile.objs  2014-06-17 06:15:11.000000000 +0200
 @@ -57,6 +57,7 @@
  common-obj-y += qemu-char.o #aio.o
  common-obj-y += block-migration.o
@@ -35,8 +35,8 @@ Index: new/Makefile.objs
  
 Index: new/block.c
 ===================================================================
---- new.orig/block.c   2014-06-12 10:19:18.000000000 +0200
-+++ new/block.c        2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
      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-12 11:51:17.000000000 +0200
-+++ new/hmp-commands.hx        2014-06-12 12:08:10.000000000 +0200
+--- 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
 @@ -1803,6 +1803,8 @@
  show current migration capabilities
  @item info migrate_cache_size
@@ -97,8 +97,8 @@ Index: new/hmp-commands.hx
 +    },
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2014-06-12 11:51:17.000000000 +0200
-+++ new/hmp.c  2014-06-12 12:08:10.000000000 +0200
+--- 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);
@@ -162,8 +162,8 @@ Index: new/hmp.c
 +}
 Index: new/hmp.h
 ===================================================================
---- new.orig/hmp.h     2014-06-12 11:39:32.000000000 +0200
-+++ new/hmp.h  2014-06-12 12:08:10.000000000 +0200
+--- new.orig/hmp.h     2014-06-17 06:15:07.000000000 +0200
++++ new/hmp.h  2014-06-17 06:15:11.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,8 +185,8 @@ 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-12 10:19:18.000000000 +0200
-+++ new/include/block/block.h  2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
      const char *backing_file);
  int bdrv_get_backing_file_depth(BlockDriverState *bs);
@@ -197,8 +197,8 @@ 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-12 10:19:18.000000000 +0200
-+++ new/include/sysemu/sysemu.h        2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
  
  void do_savevm(Monitor *mon, const QDict *qdict);
@@ -221,8 +221,8 @@ Index: new/include/sysemu/sysemu.h
  int qemu_loadvm_state(QEMUFile *f);
 Index: new/monitor.c
 ===================================================================
---- new.orig/monitor.c 2014-06-12 11:39:32.000000000 +0200
-+++ new/monitor.c      2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
          .mhandler.cmd = hmp_info_migrate_cache_size,
      },
@@ -239,8 +239,8 @@ Index: new/monitor.c
          .params     = "",
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-12 11:51:17.000000000 +0200
-+++ new/qapi-schema.json       2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
             '*downtime': 'int',
             '*setup-time': 'int'} }
@@ -305,8 +305,8 @@ Index: new/qapi-schema.json
  #
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2014-06-12 10:39:20.000000000 +0200
-+++ new/qemu-options.hx        2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
  Start right away with a saved state (@code{loadvm} in monitor)
  ETEXI
@@ -329,8 +329,8 @@ 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-12 11:39:32.000000000 +0200
-+++ new/qmp-commands.hx        2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
                     } } ] }
  
@@ -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-12 12:38:38.000000000 +0200
++++ new/savevm-async.c 2014-06-17 06:15:11.000000000 +0200
 @@ -0,0 +1,486 @@
 +#include "qemu-common.h"
 +#include "qapi/qmp/qerror.h"
@@ -859,8 +859,8 @@ Index: new/savevm-async.c
 +}
 Index: new/savevm.c
 ===================================================================
---- new.orig/savevm.c  2014-06-12 10:19:18.000000000 +0200
-+++ new/savevm.c       2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
      return false;
  }
@@ -911,8 +911,8 @@ 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-12 11:09:49.000000000 +0200
-+++ new/vl.c   2014-06-12 12:08:10.000000000 +0200
+--- 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 @@
      int optind;
      const char *optarg;

diff --git a/debian/patches/keymap.diff b/debian/patches/keymap.diff
index d996c43fa3951e12fb1347bfcbff5891801163c3..5a4206d0089735bbddf316dc57011806c4d16c1f 100644 (file)
--- a/debian/patches/keymap.diff
+++ b/debian/patches/keymap.diff
@@ -1,7 +1,7 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2014-06-12 10:19:19.000000000 +0200
-+++ new/ui/vnc.c       2014-06-12 10:47:24.000000000 +0200
+--- 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 @@
  
  static void do_key_event(VncState *vs, int down, int keycode, int sym)

diff --git a/debian/patches/modify-query-machines.patch b/debian/patches/modify-query-machines.patch
index e759f2c8a4ae5d87349722a86f58604c65840afd..6dc8e218f184a9bff3ef7e3a8557676ff5918208 100644 (file)
--- a/debian/patches/modify-query-machines.patch
+++ b/debian/patches/modify-query-machines.patch
@@ -1,7 +1,7 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2014-06-12 10:50:04.000000000 +0200
-+++ new/qapi-schema.json       2014-06-12 10:53:30.000000000 +0200
+--- 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 @@
  #
  # @default: #optional whether the machine is default
@@ -22,8 +22,8 @@ Index: new/qapi-schema.json
  # @query-machines:
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2014-06-12 10:49:25.000000000 +0200
-+++ new/vl.c   2014-06-12 11:09:49.000000000 +0200
+--- 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 @@
          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 bef442a03a12e7adf5d02c916d3d1706c6aca207..261c9abd3052254b25543392156871abc35cade8 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-05-05 07:53:16.000000000 +0200
-+++ new/ui/spice-core.c        2014-05-05 07:59:10.000000000 +0200
-@@ -540,6 +540,11 @@
+--- 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 @@
      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-05-05 07:57:11.000000000 +0200
-+++ new/qapi-schema.json       2014-05-05 07:58:20.000000000 +0200
-@@ -1320,11 +1320,14 @@
+--- 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 @@
  #
  # @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 bf39a51adcddff155fac16bdde0e9ff8550ce6a4..808bba97f7b56d51c14891612958c6b6b7100286 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-05-05 06:55:26.000000000 +0200
-+++ new/ui/vnc.c       2014-05-05 07:24:10.000000000 +0200
-@@ -44,6 +44,125 @@
+--- 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 @@
  #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);
-@@ -3125,6 +3244,7 @@
+@@ -3146,6 +3265,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 */
-@@ -3145,8 +3265,10 @@
+@@ -3166,8 +3286,10 @@
                  }
                  g_free(path);
              } else {
@@ -149,7 +149,7 @@ Index: new/ui/vnc.c
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -3219,10 +3341,10 @@
+@@ -3240,10 +3362,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-05-05 06:55:26.000000000 +0200
-+++ new/ui/vnc-auth-vencrypt.c 2014-05-05 07:24:10.000000000 +0200
+--- 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
 @@ -26,6 +26,107 @@
  
  #include "vnc.h"
@@ -289,8 +289,8 @@ 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-05-05 06:55:26.000000000 +0200
-+++ new/ui/vnc.h       2014-05-05 07:24:10.000000000 +0200
+--- 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 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
@@ -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-05-05 06:55:26.000000000 +0200
-+++ new/ui/vnc-tls.c   2014-05-05 07:24:10.000000000 +0200
+--- 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
 @@ -302,6 +302,14 @@
  
  static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
@@ -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-05-05 06:55:26.000000000 +0200
-+++ new/ui/vnc-tls.h   2014-05-05 07:24:10.000000000 +0200
+--- 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
 @@ -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-05-05 07:13:45.000000000 +0200
-+++ new/vl.c   2014-05-05 07:24:10.000000000 +0200
-@@ -3690,6 +3690,7 @@
+--- 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 @@
                    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-05-05 06:55:26.000000000 +0200
-+++ new/include/ui/console.h   2014-05-05 07:24:10.000000000 +0200
-@@ -319,6 +319,7 @@
+--- 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 @@
  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 c28cbd4cba29d5d4ff759ce068692ea065bed423..dd37a6c0c9e850c41228545ff11d4682c3071189 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-05-05 06:55:25.000000000 +0200
-+++ new/hw/i386/pc.c   2014-05-05 07:35:55.000000000 +0200
-@@ -997,9 +997,9 @@
+--- 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 @@
      /* 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 c67b8d9330891bdc6ffadc3ad375e32fc56f6b50..65b61f74b26af098fb6176d427f3bcad8df3602f 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-05-05 07:42:02.000000000 +0200
-+++ new/ui/spice-core.c        2014-05-05 07:42:34.000000000 +0200
-@@ -671,32 +671,35 @@
+--- 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 @@
  
      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 143123d4d6c7329b97c160e32888cf1ae605870d..b068ba0639331b4c8dfddb241d950e63a80086dd 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    2013-11-26 11:47:41.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c 2013-11-26 11:48:13.000000000 +0100
+--- 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
 @@ -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 1bf9d2c1ed7064a8baa8b9aff00393fcf15ac8aa..649211c1e98bf9a1ef1a9a88daca758c93a36cb5 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-05-05 06:55:26.000000000 +0200
-+++ new/hmp.c  2014-05-05 07:34:43.000000000 +0200
-@@ -526,7 +526,35 @@
+--- 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 @@
          return;
      }
  
@@ -41,9 +41,9 @@ Index: new/hmp.c
  }
 Index: new/hw/virtio/virtio-balloon.c
 ===================================================================
---- new.orig/hw/virtio/virtio-balloon.c        2014-05-05 06:55:25.000000000 +0200
-+++ new/hw/virtio/virtio-balloon.c     2014-05-05 07:34:43.000000000 +0200
-@@ -291,6 +291,35 @@
+--- 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 @@
      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-05-05 06:55:26.000000000 +0200
-+++ new/qapi-schema.json       2014-05-05 07:34:43.000000000 +0200
-@@ -1340,15 +1340,34 @@
+--- 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 @@
  
  ##
  # @BalloonInfo:
@@ -123,9 +123,9 @@ Index: new/qapi-schema.json
  # @query-balloon:
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2014-05-05 06:55:26.000000000 +0200
-+++ new/qmp-commands.hx        2014-05-05 07:34:43.000000000 +0200
-@@ -3152,6 +3152,13 @@
+--- 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 @@
  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:
  
-@@ -3159,6 +3166,12 @@
+@@ -3169,6 +3176,12 @@
  <- {
        "return":{
           "actual":1073741824,