refresh all quilt patches

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index c093d142bcbd8a71a1881ae5882f298387b87061..d3c2189e639a250ec9d1f8f0a3904d5d5658e8a3 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,10 +1,10 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h     2012-03-12 06:44:55.000000000 +0100
-+++ new/net.h  2012-03-13 07:25:07.000000000 +0100
-@@ -173,8 +173,9 @@
- int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
- int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
+--- new.orig/net.h     2012-09-24 07:15:00.000000000 +0200
++++ new/net.h  2012-09-24 07:15:16.000000000 +0200
+@@ -161,8 +161,9 @@
+ void netdev_add(QemuOpts *opts, Error **errp);
+ int qmp_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret);
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
@@ -16,9 +16,9 @@ Index: new/net.h
  
 Index: new/configure
 ===================================================================
---- new.orig/configure 2012-03-12 06:44:55.000000000 +0100
-+++ new/configure      2012-03-13 07:25:07.000000000 +0100
-@@ -169,7 +169,7 @@
+--- new.orig/configure 2012-09-24 07:15:00.000000000 +0200
++++ new/configure      2012-09-24 07:15:16.000000000 +0200
+@@ -195,7 +195,7 @@
  libdir="\${prefix}/lib"
  includedir="\${prefix}/include"
  sysconfdir="\${prefix}/etc"
@@ -29,14 +29,14 @@ Index: new/configure
  fmod_inc=""
 Index: new/net/tap.h
 ===================================================================
---- new.orig/net/tap.h 2012-03-12 06:44:55.000000000 +0100
-+++ new/net/tap.h      2012-03-13 07:25:07.000000000 +0100
+--- new.orig/net/tap.h 2012-09-24 07:15:00.000000000 +0200
++++ new/net/tap.h      2012-09-24 07:15:16.000000000 +0200
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
- #include "qemu-option.h"
+ #include "qapi-types.h"
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
  
- int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
- 
+ int net_init_tap(const NetClientOptions *opts, const char *name,
+                  NetClientState *peer);

diff --git a/debian/patches/ahci-add_migration-support.patch b/debian/patches/ahci-add_migration-support.patch
index 5b24f1fec692f5ffdf223e9d114c329aa7fd7168..a5791f70931ce6f886eab011736987403264cc50 100644 (file)
--- a/debian/patches/ahci-add_migration-support.patch
+++ b/debian/patches/ahci-add_migration-support.patch
@@ -19,11 +19,11 @@ Signed-off-by: Jason Baron <address@hidden>
  hw/ide/ich.c  |   11 +++++++--
  3 files changed, 81 insertions(+), 4 deletions(-)
 
-diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
-index b53c757..e94509b 100644
---- a/hw/ide/ahci.c
-+++ b/hw/ide/ahci.c
-@@ -1204,6 +1204,65 @@ void ahci_reset(AHCIState *s)
+Index: new/hw/ide/ahci.c
+===================================================================
+--- new.orig/hw/ide/ahci.c     2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ahci.c  2012-09-24 07:15:28.000000000 +0200
+@@ -1203,6 +1203,65 @@
      }
  }
  
@@ -89,7 +89,7 @@ index b53c757..e94509b 100644
  typedef struct SysbusAHCIState {
      SysBusDevice busdev;
      AHCIState ahci;
-@@ -1212,7 +1271,10 @@ typedef struct SysbusAHCIState {
+@@ -1211,7 +1270,10 @@
  
  static const VMStateDescription vmstate_sysbus_ahci = {
      .name = "sysbus-ahci",
@@ -101,11 +101,11 @@ index b53c757..e94509b 100644
  };
  
  static void sysbus_ahci_reset(DeviceState *dev)
-diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h
-index 1200a56..7719dbf 100644
---- a/hw/ide/ahci.h
-+++ b/hw/ide/ahci.h
-@@ -307,6 +307,16 @@ typedef struct AHCIPCIState {
+Index: new/hw/ide/ahci.h
+===================================================================
+--- new.orig/hw/ide/ahci.h     2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ahci.h  2012-09-24 07:15:28.000000000 +0200
+@@ -307,6 +307,16 @@
      AHCIState ahci;
  } AHCIPCIState;
  
@@ -122,10 +122,10 @@ index 1200a56..7719dbf 100644
  typedef struct NCQFrame {
      uint8_t fis_type;
      uint8_t c;
-diff --git a/hw/ide/ich.c b/hw/ide/ich.c
-index 272b773..ae6f56f 100644
---- a/hw/ide/ich.c
-+++ b/hw/ide/ich.c
+Index: new/hw/ide/ich.c
+===================================================================
+--- new.orig/hw/ide/ich.c      2012-09-24 07:15:00.000000000 +0200
++++ new/hw/ide/ich.c   2012-09-24 07:15:28.000000000 +0200
 @@ -79,9 +79,14 @@
  #define ICH9_IDP_INDEX          0x10
  #define ICH9_IDP_INDEX_LOG2     0x04
@@ -143,7 +143,7 @@ index 272b773..ae6f56f 100644
  };
  
  static void pci_ich9_reset(DeviceState *dev)
-@@ -152,7 +157,7 @@ static void ich_ahci_class_init(ObjectClass *klass, void *data)
+@@ -152,7 +157,7 @@
      k->device_id = PCI_DEVICE_ID_INTEL_82801IR;
      k->revision = 0x02;
      k->class_id = PCI_CLASS_STORAGE_SATA;
@@ -152,5 +152,3 @@ index 272b773..ae6f56f 100644
      dc->reset = pci_ich9_reset;
  }
  
--- 
-1.7.1

diff --git a/debian/patches/ahci-properly-reset-pxcmd.patch b/debian/patches/ahci-properly-reset-pxcmd.patch
index 238ac0fb298e4e16285db2392587796605512653..8a02f48b37dfefcc1e3adcf827965cb612c3bc6c 100644 (file)
--- a/debian/patches/ahci-properly-reset-pxcmd.patch
+++ b/debian/patches/ahci-properly-reset-pxcmd.patch
@@ -29,11 +29,11 @@ Signed-off-by: Jason Baron <address@hidden>
  hw/ide/ahci.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
-index 9fe89a5..06c236f 100644
---- a/hw/ide/ahci.c
-+++ b/hw/ide/ahci.c
-@@ -1199,6 +1199,7 @@ void ahci_reset(AHCIState *s)
+Index: new/hw/ide/ahci.c
+===================================================================
+--- new.orig/hw/ide/ahci.c     2012-09-24 07:15:28.000000000 +0200
++++ new/hw/ide/ahci.c  2012-09-24 07:15:29.000000000 +0200
+@@ -1199,6 +1199,7 @@
          pr->irq_stat = 0;
          pr->irq_mask = 0;
          pr->scr_ctl = 0;
@@ -41,5 +41,3 @@ index 9fe89a5..06c236f 100644
          ahci_reset_port(s, i);
      }
  }
--- 
-1.7.1

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index d1f1c7a50bcbee242d6582ac3aa7a235eefb6f6c..4d344a707dcdb6deed6bb83f4d428e9e8551f3b2 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   2012-03-12 06:44:56.000000000 +0100
-+++ new/qemu-options.hx        2012-03-13 07:25:22.000000000 +0100
-@@ -95,6 +95,12 @@
+--- new.orig/qemu-options.hx   2012-09-24 07:15:00.000000000 +0200
++++ new/qemu-options.hx        2012-09-24 07:15:20.000000000 +0200
+@@ -102,6 +102,12 @@
  are split equally.
  ETEXI
  
@@ -17,18 +17,18 @@ Index: new/qemu-options.hx
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2012-03-12 06:44:56.000000000 +0100
-+++ new/vl.c   2012-03-13 08:58:16.000000000 +0100
-@@ -153,6 +153,8 @@
- #include "fsdev/qemu-fsdev.h"
+--- new.orig/vl.c      2012-09-24 07:15:00.000000000 +0200
++++ new/vl.c   2012-09-24 07:15:20.000000000 +0200
+@@ -154,6 +154,8 @@
  #endif
+ #include "qtest.h"
  
 +#include "vzsyscalls.h"
 +
  #include "disas.h"
  
  #include "qemu_socket.h"
-@@ -203,6 +205,7 @@
+@@ -205,6 +207,7 @@
  int win2k_install_hack = 0;
  int usb_enabled = 0;
  int singlestep = 0;
@@ -36,7 +36,7 @@ Index: new/vl.c
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -2045,7 +2048,7 @@
+@@ -2135,7 +2138,7 @@
  }
  
  static int debugcon_parse(const char *devname)
@@ -45,7 +45,7 @@ Index: new/vl.c
      QemuOpts *opts;
  
      if (!qemu_chr_new("debugcon", devname, NULL)) {
-@@ -2258,6 +2261,9 @@
+@@ -2345,6 +2348,9 @@
  int main(int argc, char **argv, char **envp)
  {
      int i;
@@ -55,7 +55,7 @@ Index: new/vl.c
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -3022,6 +3028,21 @@
+@@ -3120,6 +3126,21 @@
                      exit(1);
                  }
                  break;
@@ -77,7 +77,7 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -3093,8 +3114,8 @@
+@@ -3191,8 +3212,8 @@
                        }
                        p += 8;
                        os_set_proc_name(p);
@@ -88,7 +88,7 @@ Index: new/vl.c
                  break;
              case QEMU_OPTION_prom_env:
                  if (nb_prom_envs >= MAX_PROM_ENVS) {
-@@ -3411,6 +3432,39 @@
+@@ -3552,6 +3573,39 @@
          }
      }
  
@@ -131,7 +131,7 @@ Index: new/vl.c
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2012-03-13 07:25:22.000000000 +0100
++++ new/vzsyscalls.h   2012-09-24 07:15:20.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 14a2eaa2ec76c61186675498eb97ac21d23f5c58..172f1b35895078dff13bb68ff337a101f25ae5f6 100644 (file)
--- a/debian/patches/fix-qemu-img-snapshot-removal.patch
+++ b/debian/patches/fix-qemu-img-snapshot-removal.patch
@@ -1,7 +1,7 @@
 Index: new/qemu-img.c
 ===================================================================
---- new.orig/qemu-img.c        2012-09-14 11:03:04.000000000 +0200
-+++ new/qemu-img.c     2012-09-14 11:13:39.000000000 +0200
+--- new.orig/qemu-img.c        2012-09-24 07:15:00.000000000 +0200
++++ new/qemu-img.c     2012-09-24 07:15:31.000000000 +0200
 @@ -1288,7 +1288,9 @@
              error_report("Could not delete snapshot '%s': %d (%s)",
                  snapshot_name, ret, strerror(-ret));

diff --git a/debian/patches/fr-ca-keymap-corrections.diff b/debian/patches/fr-ca-keymap-corrections.diff
index 89dcc27b8d8a158bd28d77ae7c0e01f7ece23ac7..c6e96069afd90ee6113fc47d30fc6b29c52465f1 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     2011-08-11 10:04:51.000000000 +0200
-+++ new/pc-bios/keymaps/fr-ca  2011-08-11 10:09:38.000000000 +0200
+--- 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
 @@ -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 795b0c07b914eca2d8e0a33eb9a6c5631e34c7f0..c85a817d34f2baa4d0d641653f41f1da00fe7c88 100644 (file)
--- a/debian/patches/internal-snapshot-async.patch
+++ b/debian/patches/internal-snapshot-async.patch
@@ -1,7 +1,7 @@
 Index: new/qapi-schema.json
 ===================================================================
---- new.orig/qapi-schema.json  2012-09-24 06:12:15.000000000 +0200
-+++ new/qapi-schema.json       2012-09-24 06:14:10.000000000 +0200
+--- new.orig/qapi-schema.json  2012-09-24 07:15:00.000000000 +0200
++++ new/qapi-schema.json       2012-09-24 07:15:34.000000000 +0200
 @@ -358,6 +358,40 @@
             '*total-time': 'int'} }
  
@@ -58,8 +58,8 @@ Index: new/qapi-schema.json
 +{ 'command': 'savevm-end' }
 Index: new/qmp-commands.hx
 ===================================================================
---- new.orig/qmp-commands.hx   2012-09-24 06:12:15.000000000 +0200
-+++ new/qmp-commands.hx        2012-09-24 06:15:13.000000000 +0200
+--- new.orig/qmp-commands.hx   2012-09-24 07:15:00.000000000 +0200
++++ new/qmp-commands.hx        2012-09-24 07:15:34.000000000 +0200
 @@ -2514,3 +2514,27 @@
          .args_type  = "",
          .mhandler.cmd_new = qmp_marshal_input_query_target,
@@ -90,8 +90,8 @@ Index: new/qmp-commands.hx
 +    },
 Index: new/hmp.c
 ===================================================================
---- new.orig/hmp.c     2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp.c  2012-09-24 06:21:35.000000000 +0200
+--- new.orig/hmp.c     2012-09-24 07:15:00.000000000 +0200
++++ new/hmp.c  2012-09-24 07:15:34.000000000 +0200
 @@ -1102,3 +1102,60 @@
      qmp_closefd(fdname, &errp);
      hmp_handle_error(mon, &errp);
@@ -155,8 +155,8 @@ Index: new/hmp.c
 +}
 Index: new/hmp.h
 ===================================================================
---- new.orig/hmp.h     2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp.h  2012-09-24 06:23:00.000000000 +0200
+--- new.orig/hmp.h     2012-09-24 07:15:00.000000000 +0200
++++ new/hmp.h  2012-09-24 07:15:34.000000000 +0200
 @@ -25,6 +25,7 @@
  void hmp_info_uuid(Monitor *mon);
  void hmp_info_chardev(Monitor *mon);
@@ -177,8 +177,8 @@ Index: new/hmp.h
  #endif
 Index: new/hmp-commands.hx
 ===================================================================
---- new.orig/hmp-commands.hx   2012-09-24 06:12:15.000000000 +0200
-+++ new/hmp-commands.hx        2012-09-24 06:16:14.000000000 +0200
+--- new.orig/hmp-commands.hx   2012-09-24 07:15:00.000000000 +0200
++++ new/hmp-commands.hx        2012-09-24 07:15:34.000000000 +0200
 @@ -1468,6 +1468,8 @@
  show current migration capabilities
  @item info migrate_cache_size
@@ -227,7 +227,7 @@ Index: new/hmp-commands.hx
 Index: new/savevm-async.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/savevm-async.c 2012-09-24 06:19:58.000000000 +0200
++++ new/savevm-async.c 2012-09-24 07:15:34.000000000 +0200
 @@ -0,0 +1,441 @@
 +#include "qemu-common.h"
 +#include "qerror.h"
@@ -672,8 +672,8 @@ Index: new/savevm-async.c
 +}
 Index: new/Makefile.objs
 ===================================================================
---- new.orig/Makefile.objs     2012-09-24 06:12:15.000000000 +0200
-+++ new/Makefile.objs  2012-09-24 06:12:21.000000000 +0200
+--- new.orig/Makefile.objs     2012-09-24 07:15:00.000000000 +0200
++++ new/Makefile.objs  2012-09-24 07:15:34.000000000 +0200
 @@ -78,6 +78,7 @@
  common-obj-y += pflib.o
  common-obj-y += bitmap.o bitops.o
@@ -684,8 +684,8 @@ Index: new/Makefile.objs
  common-obj-$(CONFIG_WIN32) += version.o
 Index: new/sysemu.h
 ===================================================================
---- new.orig/sysemu.h  2012-09-24 06:12:15.000000000 +0200
-+++ new/sysemu.h       2012-09-24 06:12:21.000000000 +0200
+--- new.orig/sysemu.h  2012-09-24 07:15:00.000000000 +0200
++++ new/sysemu.h       2012-09-24 07:15:34.000000000 +0200
 @@ -72,6 +72,7 @@
  
  void do_savevm(Monitor *mon, const QDict *qdict);
@@ -696,8 +696,8 @@ Index: new/sysemu.h
  
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx   2012-09-24 06:12:21.000000000 +0200
-+++ new/qemu-options.hx        2012-09-24 06:12:21.000000000 +0200
+--- new.orig/qemu-options.hx   2012-09-24 07:15:20.000000000 +0200
++++ new/qemu-options.hx        2012-09-24 07:15:34.000000000 +0200
 @@ -2477,6 +2477,19 @@
  Start right away with a saved state (@code{loadvm} in monitor)
  ETEXI
@@ -720,8 +720,8 @@ Index: new/qemu-options.hx
      "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2012-09-24 06:12:21.000000000 +0200
-+++ new/vl.c   2012-09-24 06:12:21.000000000 +0200
+--- new.orig/vl.c      2012-09-24 07:15:24.000000000 +0200
++++ new/vl.c   2012-09-24 07:15:34.000000000 +0200
 @@ -2364,6 +2364,7 @@
      int optind;
      const char *optarg;

diff --git a/debian/patches/keymap.diff b/debian/patches/keymap.diff
index 0d1690fe3539a83511e06846bf6040a84bbf3e6e..3b315ff98e50e6f908c533cab0e00197f24630bc 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  2012-03-12 06:44:56.000000000 +0100
-+++ new/ui/vnc.c       2012-03-13 07:25:34.000000000 +0100
-@@ -1501,6 +1501,10 @@
+--- new.orig/ui/vnc.c  2012-09-24 07:15:00.000000000 +0200
++++ new/ui/vnc.c       2012-09-24 07:15:22.000000000 +0200
+@@ -1496,6 +1496,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 */
-@@ -1571,12 +1575,42 @@
+@@ -1566,12 +1570,42 @@
      }
  
      if (is_graphic_console()) {
@@ -56,7 +56,7 @@ Index: new/ui/vnc.c
      } else {
          bool numlock = vs->modifiers_state[0x45];
          bool control = (vs->modifiers_state[0x1d] ||
-@@ -1713,7 +1747,8 @@
+@@ -1708,7 +1742,8 @@
          lsym = lsym - 'A' + 'a';
      }
  

diff --git a/debian/patches/move-bdrv-snapshot-find.patch b/debian/patches/move-bdrv-snapshot-find.patch
index 371a60e3e3582c0762a9b34de741206fe2b082fd..fa592dfe272f3f276ea27b36a2d7884e1e2db636 100644 (file)
--- a/debian/patches/move-bdrv-snapshot-find.patch
+++ b/debian/patches/move-bdrv-snapshot-find.patch
@@ -1,7 +1,7 @@
 Index: new/block.c
 ===================================================================
---- new.orig/block.c   2012-09-19 12:47:55.000000000 +0200
-+++ new/block.c        2012-09-19 12:51:07.000000000 +0200
+--- new.orig/block.c   2012-09-24 07:15:00.000000000 +0200
++++ new/block.c        2012-09-24 07:15:32.000000000 +0200
 @@ -2724,6 +2724,28 @@
      return -ENOTSUP;
  }
@@ -33,8 +33,8 @@ Index: new/block.c
  {
 Index: new/block.h
 ===================================================================
---- new.orig/block.h   2012-09-19 12:46:56.000000000 +0200
-+++ new/block.h        2012-09-19 12:51:07.000000000 +0200
+--- new.orig/block.h   2012-09-24 07:15:00.000000000 +0200
++++ new/block.h        2012-09-24 07:15:32.000000000 +0200
 @@ -302,6 +302,8 @@
  int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id);
  int bdrv_snapshot_list(BlockDriverState *bs,
@@ -46,9 +46,9 @@ Index: new/block.h
  char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn);
 Index: new/savevm.c
 ===================================================================
---- new.orig/savevm.c  2012-09-19 12:50:39.000000000 +0200
-+++ new/savevm.c       2012-09-19 12:51:07.000000000 +0200
-@@ -2045,28 +2045,6 @@
+--- new.orig/savevm.c  2012-09-24 07:15:00.000000000 +0200
++++ new/savevm.c       2012-09-24 07:15:32.000000000 +0200
+@@ -2015,28 +2015,6 @@
      return ret;
  }
  

diff --git a/debian/patches/pve-auth.patch b/debian/patches/pve-auth.patch
index 5574efd42fb39e19327e2b80b73243874965411b..341912e159c578329e329388be86acde94f16c83 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  2012-03-13 08:10:11.000000000 +0100
-+++ new/ui/vnc.c       2012-03-13 08:10:20.000000000 +0100
-@@ -42,6 +42,125 @@
+--- new.orig/ui/vnc.c  2012-09-24 07:15:22.000000000 +0200
++++ new/ui/vnc.c       2012-09-24 07:15:24.000000000 +0200
+@@ -43,6 +43,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 DisplayChangeListener *dcl;
  
-@@ -1896,7 +2015,7 @@
+@@ -1891,7 +2010,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
      if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -137,7 +137,7 @@ Index: new/ui/vnc.c
          !memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
          vs->write_pixels = vnc_write_pixels_copy;
          vnc_hextile_set_pixel_conversion(vs, 0);
-@@ -1982,7 +2101,7 @@
+@@ -1980,7 +2099,7 @@
          vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -146,7 +146,7 @@ Index: new/ui/vnc.c
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_unlock_output(vs);
-@@ -2873,7 +2992,7 @@
+@@ -2875,7 +2994,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -155,7 +155,7 @@ Index: new/ui/vnc.c
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
-@@ -2923,6 +3042,7 @@
+@@ -2934,6 +3053,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -163,7 +163,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 */
-@@ -2945,10 +3065,12 @@
+@@ -2956,10 +3076,12 @@
                  }
                  g_free(path);
              } else {
@@ -180,7 +180,7 @@ Index: new/ui/vnc.c
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -3014,10 +3136,10 @@
+@@ -3025,10 +3147,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -195,8 +195,8 @@ Index: new/ui/vnc.c
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c    2012-03-13 07:26:50.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c 2012-03-13 08:10:20.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c    2012-09-24 07:15:00.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c 2012-09-24 07:15:24.000000000 +0200
 @@ -25,7 +25,107 @@
   */
  
@@ -320,9 +320,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  2012-03-13 07:26:50.000000000 +0100
-+++ new/ui/vnc.h       2012-03-13 08:10:20.000000000 +0100
-@@ -276,6 +276,8 @@
+--- new.orig/ui/vnc.h  2012-09-24 07:15:00.000000000 +0200
++++ new/ui/vnc.h       2012-09-24 07:15:24.000000000 +0200
+@@ -263,6 +263,8 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
      int subauth; /* Used by VeNCrypt */
@@ -331,7 +331,7 @@ Index: new/ui/vnc.h
      VncStateTLS tls;
  #endif
  #ifdef CONFIG_VNC_SASL
-@@ -569,4 +571,6 @@
+@@ -554,4 +556,6 @@
  int vnc_zywrle_send_framebuffer_update(VncState *vs, int x, int y, int w, int h);
  void vnc_zrle_clear(VncState *vs);
  
@@ -340,8 +340,8 @@ Index: new/ui/vnc.h
  #endif /* __QEMU_VNC_H */
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c      2012-03-13 07:26:50.000000000 +0100
-+++ new/ui/vnc-tls.c   2012-03-13 08:10:20.000000000 +0100
+--- new.orig/ui/vnc-tls.c      2012-09-24 07:15:00.000000000 +0200
++++ new/ui/vnc-tls.c   2012-09-24 07:15:24.000000000 +0200
 @@ -302,6 +302,14 @@
  
  static int vnc_set_gnutls_priority(gnutls_session_t s, int x509)
@@ -396,8 +396,8 @@ Index: new/ui/vnc-tls.c
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h      2012-03-13 07:26:50.000000000 +0100
-+++ new/ui/vnc-tls.h   2012-03-13 08:10:20.000000000 +0100
+--- new.orig/ui/vnc-tls.h      2012-09-24 07:15:00.000000000 +0200
++++ new/ui/vnc-tls.h   2012-09-24 07:15:24.000000000 +0200
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);
@@ -409,9 +409,9 @@ Index: new/ui/vnc-tls.h
  
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c      2012-03-13 08:09:04.000000000 +0100
-+++ new/vl.c   2012-03-13 08:11:15.000000000 +0100
-@@ -3033,6 +3033,7 @@
+--- new.orig/vl.c      2012-09-24 07:15:20.000000000 +0200
++++ new/vl.c   2012-09-24 07:15:24.000000000 +0200
+@@ -3133,6 +3133,7 @@
                    fprintf(stderr, "Invalid ID\n");
                    exit(1);
                }
@@ -421,9 +421,9 @@ Index: new/vl.c
                  cpuunits = atoi(optarg);
 Index: new/console.h
 ===================================================================
---- new.orig/console.h 2012-03-13 07:26:50.000000000 +0100
-+++ new/console.h      2012-03-13 08:10:20.000000000 +0100
-@@ -371,6 +371,7 @@
+--- new.orig/console.h 2012-09-24 07:15:00.000000000 +0200
++++ new/console.h      2012-09-24 07:15:24.000000000 +0200
+@@ -374,6 +374,7 @@
  void cocoa_display_init(DisplayState *ds, int full_screen);
  
  /* vnc.c */

diff --git a/debian/patches/series b/debian/patches/series
index 3d864ef234210d795f5ac76a1bd838cc4db2646b..b5208b007b18bd4433e81398a4e2d205055d9faf 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@ ahci-properly-reset-pxcmd.patch
 sheepdog-fix-savevm-loadvm.patch
 fix-qemu-img-snapshot-removal.patch
 move-bdrv-snapshot-find.patch
-internal-snapshot-async.patch
\ No newline at end of file
+internal-snapshot-async.patch

diff --git a/debian/patches/set-max-nics.patch b/debian/patches/set-max-nics.patch
index c31541d2ea43f091b96d8daedf7ba51315166b7b..99a286959875259fd993744fddac5691e093c6bf 100644 (file)
--- a/debian/patches/set-max-nics.patch
+++ b/debian/patches/set-max-nics.patch
@@ -1,8 +1,8 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h     2012-03-13 07:25:07.000000000 +0100
-+++ new/net.h  2012-03-13 07:25:40.000000000 +0100
-@@ -127,7 +127,7 @@
+--- new.orig/net.h     2012-09-24 07:15:16.000000000 +0200
++++ new/net.h  2012-09-24 07:15:23.000000000 +0200
+@@ -116,7 +116,7 @@
  
  /* NIC info */
  

diff --git a/debian/patches/sheepdog-fix-savevm-loadvm.patch b/debian/patches/sheepdog-fix-savevm-loadvm.patch
index d8460754c20909f679e28aaf82fec1c8c5c40712..3877924d605abb6fee255c3d6302d772a6ade96d 100644 (file)
--- a/debian/patches/sheepdog-fix-savevm-loadvm.patch
+++ b/debian/patches/sheepdog-fix-savevm-loadvm.patch
@@ -12,11 +12,11 @@ Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  block/sheepdog.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
 
-diff --git a/block/sheepdog.c b/block/sheepdog.c
-index df4f441..e0753ee 100644
---- a/block/sheepdog.c
-+++ b/block/sheepdog.c
-@@ -1986,7 +1986,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
+Index: new/block/sheepdog.c
+===================================================================
+--- new.orig/block/sheepdog.c  2012-09-24 07:15:00.000000000 +0200
++++ new/block/sheepdog.c       2012-09-24 07:15:30.000000000 +0200
+@@ -1986,7 +1986,7 @@
          vdi_index = pos / SD_DATA_OBJ_SIZE;
          offset = pos % SD_DATA_OBJ_SIZE;
  
@@ -25,7 +25,7 @@ index df4f441..e0753ee 100644
  
          vmstate_oid = vid_to_vmstate_oid(s->inode.vdi_id, vdi_index);
  
-@@ -2007,6 +2007,7 @@ static int do_load_save_vmstate(BDRVSheepdogState *s, uint8_t *data,
+@@ -2007,6 +2007,7 @@
          }
  
          pos += data_len;
@@ -33,5 +33,3 @@ index df4f441..e0753ee 100644
          remaining -= data_len;
      }
      ret = size;
--- 
-1.7.0.4

diff --git a/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch b/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch
index 6bacc671d799bed0c89f6f589b273f386f29ad12..cad6b659a831eb5cd03cedee59246afa189e8dd5 100644 (file)
--- a/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch
+++ b/debian/patches/update-cpus-x86_64.conf-to-rhel6.2-version.patch
@@ -9,10 +9,10 @@ Signed-off-by: Derumier Alexandre <aderumier@odiso.com>
  sysconfigs/target/cpus-x86_64.conf |   36 ++++++++++++++++++++++++++++++---
  1 files changed, 32 insertions(+), 4 deletions(-)
 
-diff --git a/sysconfigs/target/cpus-x86_64.conf b/sysconfigs/target/cpus-x86_64.conf
-index d050380..39a9a37 100644
---- a/sysconfigs/target/cpus-x86_64.conf
-+++ b/sysconfigs/target/cpus-x86_64.conf
+Index: new/sysconfigs/target/cpus-x86_64.conf
+===================================================================
+--- new.orig/sysconfigs/target/cpus-x86_64.conf        2012-09-24 07:15:00.000000000 +0200
++++ new/sysconfigs/target/cpus-x86_64.conf     2012-09-24 07:15:25.000000000 +0200
 @@ -1,11 +1,39 @@
  # x86 CPU MODELS
  
@@ -81,6 +81,3 @@ index d050380..39a9a37 100644
     vendor = "GenuineIntel"
     family = "6"
     model = "44"
--- 
-1.7.2.5
-

diff --git a/debian/patches/vencrypt-auth-plain.patch b/debian/patches/vencrypt-auth-plain.patch
index cd2e8e85eebe008670d0f96972f63081b5c6d944..d8844e4412ad2b321bdc865470b284aa6076f73b 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    2012-08-09 10:02:20.000000000 +0200
-+++ new/ui/vnc-auth-vencrypt.c 2012-08-09 10:03:01.000000000 +0200
+--- new.orig/ui/vnc-auth-vencrypt.c    2012-09-24 07:15:24.000000000 +0200
++++ new/ui/vnc-auth-vencrypt.c 2012-09-24 07:15:27.000000000 +0200
 @@ -143,6 +143,11 @@
         vnc_read_when(vs, protocol_client_auth_plain_start, 8);
         break;
@@ -14,7 +14,7 @@ Index: new/ui/vnc-auth-vencrypt.c
      case VNC_AUTH_VENCRYPT_TLSVNC:
      case VNC_AUTH_VENCRYPT_X509VNC:
         VNC_DEBUG("Start TLS auth VNC\n");
-@@ -226,25 +231,32 @@
+@@ -227,25 +232,32 @@
  {
      int auth = read_u32(data, 0);
  
@@ -60,7 +60,7 @@ Index: new/ui/vnc-auth-vencrypt.c
          }
      }
      return 0;
-@@ -259,10 +271,11 @@
+@@ -260,10 +272,11 @@
          vnc_flush(vs);
          vnc_client_error(vs);
      } else {