include updates from upstream

diff --git a/Makefile b/Makefile
index cf1e1679710097ffe3a3e104d46a7e74935a3c77..d93e9a0e2627f8513086f33f8593f5a66fd82029 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.0
 
 # also update debian/changelog
 KVMVER=1.0
-KVMPKGREL=1
+KVMPKGREL=2
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -16,7 +16,7 @@ all: ${KVM_DEB} ${KVMDIR}-src.tar.gz
 ${KVMDIR}.org/README:
        rm -rf ${KVMDIR}.org
        git clone git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git ${KVMDIR}.org
-       cd ${KVMDIR}.org; git checkout -b local qemu-kvm-${KVMVER}
+       # cd ${KVMDIR}.org; git checkout -b local qemu-kvm-${KVMVER}
        touch $@
 
 ${KVMDIR}-src.tar.gz: ${KVMDIR}.org/README

diff --git a/debian/changelog b/debian/changelog
index 4caa80f5f5b982a987376c9ce2de6367705f919f..ec3cd06b77c9bfd5d330592a33a8342a52fa4717 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pve-qemu-kvm (1.0-2) unstable; urgency=low
+
+  * include post 1.0 changes from master
+  
+  * remove live-migration-fixes.diff: seem nobody needs that.
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 09 Feb 2012 13:15:14 +0100
+
 pve-qemu-kvm (1.0-1) unstable; urgency=low
 
   * update to upstream 1.0

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index ff744fcd49d7ef267ea564d163794afe60e92def..59c6305675204ad3506f0a0678f829cdee0be29a 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,7 +1,7 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h     2011-12-07 10:05:50.000000000 +0100
-+++ new/net.h  2011-12-07 10:09:32.000000000 +0100
+--- new.orig/net.h     2012-02-09 13:22:23.000000000 +0100
++++ new/net.h  2012-02-09 13:22:30.000000000 +0100
 @@ -172,8 +172,8 @@
  int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
  int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
@@ -15,9 +15,9 @@ Index: new/net.h
  
 Index: new/configure
 ===================================================================
---- new.orig/configure 2011-12-07 10:05:50.000000000 +0100
-+++ new/configure      2011-12-07 10:08:48.000000000 +0100
-@@ -161,7 +161,7 @@
+--- new.orig/configure 2012-02-09 13:22:23.000000000 +0100
++++ new/configure      2012-02-09 13:22:30.000000000 +0100
+@@ -166,7 +166,7 @@
  libdir="\${prefix}/lib"
  includedir="\${prefix}/include"
  sysconfdir="\${prefix}/etc"
@@ -28,8 +28,8 @@ Index: new/configure
  fmod_inc=""
 Index: new/net/tap.h
 ===================================================================
---- new.orig/net/tap.h 2011-12-07 10:05:50.000000000 +0100
-+++ new/net/tap.h      2011-12-07 10:08:48.000000000 +0100
+--- new.orig/net/tap.h 2012-02-09 13:22:23.000000000 +0100
++++ new/net/tap.h      2012-02-09 13:22:30.000000000 +0100
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
  #include "qemu-option.h"

diff --git a/debian/patches/fairsched.diff b/debian/patches/fairsched.diff
index d5dd86e5ec329555d97cf3dcda74ff04df556905..dd1069b46193c8109316f5d4b6aa79b5c2db3cd4 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   2011-12-07 10:05:50.000000000 +0100
-+++ new/qemu-options.hx        2011-12-07 10:10:11.000000000 +0100
-@@ -89,6 +89,12 @@
+--- new.orig/qemu-options.hx   2012-02-09 13:15:26.000000000 +0100
++++ new/qemu-options.hx        2012-02-09 13:22:39.000000000 +0100
+@@ -92,6 +92,12 @@
  are split equally.
  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      2011-12-07 10:05:50.000000000 +0100
-+++ new/vl.c   2011-12-07 10:11:50.000000000 +0100
+--- new.orig/vl.c      2012-02-09 13:15:26.000000000 +0100
++++ new/vl.c   2012-02-09 13:22:39.000000000 +0100
 @@ -153,6 +153,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
@@ -36,7 +36,7 @@ Index: new/vl.c
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -1949,7 +1952,7 @@
+@@ -1959,7 +1962,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)) {
-@@ -2165,6 +2168,7 @@
+@@ -2175,6 +2178,7 @@
  {
      const char *gdbstub_dev = NULL;
      int i;
@@ -53,7 +53,7 @@ Index: new/vl.c
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -2903,6 +2907,20 @@
+@@ -2923,6 +2927,20 @@
                      exit(1);
                  }
                  break;
@@ -74,7 +74,7 @@ Index: new/vl.c
            case QEMU_OPTION_vnc:
  #ifdef CONFIG_VNC
                  display_remote++;
-@@ -2976,8 +2994,8 @@
+@@ -2997,8 +3015,8 @@
                        }
                        p += 8;
                        os_set_proc_name(p);
@@ -85,7 +85,7 @@ Index: new/vl.c
                  break;
              case QEMU_OPTION_prom_env:
                  if (nb_prom_envs >= MAX_PROM_ENVS) {
-@@ -3293,6 +3311,39 @@
+@@ -3309,6 +3327,39 @@
          }
      }
  
@@ -128,7 +128,7 @@ Index: new/vl.c
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h   2011-12-07 10:10:11.000000000 +0100
++++ new/vzsyscalls.h   2012-02-09 13:22:39.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

diff --git a/debian/patches/live-migration-fixes.diff b/debian/patches/live-migration-fixes.diff
index ea3b517e51351ea9a1efcedbe996fbcb3aa00ae5..a7a2729c315cdc51b1d5e945bf4db0b5491e56fc 100644 (file)
--- a/debian/patches/live-migration-fixes.diff
+++ b/debian/patches/live-migration-fixes.diff
@@ -1,8 +1,8 @@
 Index: new/arch_init.c
 ===================================================================
---- new.orig/arch_init.c       2011-12-07 10:05:50.000000000 +0100
-+++ new/arch_init.c    2011-12-07 10:14:09.000000000 +0100
-@@ -256,6 +256,8 @@
+--- new.orig/arch_init.c       2012-02-09 13:15:26.000000000 +0100
++++ new/arch_init.c    2012-02-09 13:22:53.000000000 +0100
+@@ -264,6 +264,8 @@
      uint64_t bytes_transferred_last;
      double bwidth = 0;
      uint64_t expected_time = 0;
@@ -11,7 +11,7 @@ Index: new/arch_init.c
      int ret;
  
      if (stage < 0) {
-@@ -296,10 +298,10 @@
+@@ -299,10 +301,10 @@
              qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));
              qemu_put_be64(f, block->length);
          }
@@ -24,7 +24,7 @@ Index: new/arch_init.c
  
      while ((ret = qemu_file_rate_limit(f)) == 0) {
          int bytes_sent;
-@@ -315,8 +317,8 @@
+@@ -318,8 +320,8 @@
          return ret;
      }
  
@@ -35,7 +35,7 @@ Index: new/arch_init.c
  
      /* if we haven't transferred anything this round, force expected_time to a
       * a very high value, but without crashing */
-@@ -337,6 +339,10 @@
+@@ -340,6 +342,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

diff --git a/debian/patches/pve-auth.patch b/debian/patches/pve-auth.patch
index 43f8e6f1552a4f36f16d820cf26f5c0667f5122c..f737bd1e483db41f62e6275374d0bb9deb279fcc 100644 (file)
--- a/debian/patches/pve-auth.patch
+++ b/debian/patches/pve-auth.patch
@@ -1,7 +1,7 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c  2011-12-07 10:12:06.000000000 +0100
-+++ new/ui/vnc.c       2011-12-07 10:18:26.000000000 +0100
+--- new.orig/ui/vnc.c  2012-02-09 13:22:48.000000000 +0100
++++ new/ui/vnc.c       2012-02-09 13:23:09.000000000 +0100
 @@ -42,6 +42,125 @@
  #include "vnc_keysym.h"
  #include "d3des.h"
@@ -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);
-@@ -2760,7 +2879,7 @@
+@@ -2754,7 +2873,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);
  }
  
-@@ -2809,6 +2928,7 @@
+@@ -2803,6 +2922,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 */
-@@ -2831,10 +2951,12 @@
+@@ -2825,10 +2945,12 @@
                  }
                  g_free(path);
              } else {
@@ -180,7 +180,7 @@ Index: new/ui/vnc.c
              }
  #endif
  #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
-@@ -2887,10 +3009,10 @@
+@@ -2881,10 +3003,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    2011-12-07 10:05:50.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c 2011-12-07 10:33:37.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c    2012-02-09 13:15:26.000000000 +0100
++++ new/ui/vnc-auth-vencrypt.c 2012-02-09 13:23:09.000000000 +0100
 @@ -25,7 +25,107 @@
   */
  
@@ -320,8 +320,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  2011-12-07 10:05:50.000000000 +0100
-+++ new/ui/vnc.h       2011-12-07 10:58:21.000000000 +0100
+--- new.orig/ui/vnc.h  2012-02-09 13:15:26.000000000 +0100
++++ new/ui/vnc.h       2012-02-09 13:23:09.000000000 +0100
 @@ -260,6 +260,8 @@
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
@@ -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      2011-12-07 10:05:50.000000000 +0100
-+++ new/ui/vnc-tls.c   2011-12-07 11:04:31.000000000 +0100
+--- new.orig/ui/vnc-tls.c      2012-02-09 13:15:26.000000000 +0100
++++ new/ui/vnc-tls.c   2012-02-09 13:23:09.000000000 +0100
 @@ -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      2011-12-07 10:05:50.000000000 +0100
-+++ new/ui/vnc-tls.h   2011-12-07 10:14:41.000000000 +0100
+--- new.orig/ui/vnc-tls.h      2012-02-09 13:15:26.000000000 +0100
++++ new/ui/vnc-tls.h   2012-02-09 13:23:09.000000000 +0100
 @@ -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      2011-12-07 10:11:50.000000000 +0100
-+++ new/vl.c   2011-12-07 10:14:41.000000000 +0100
-@@ -2909,6 +2909,7 @@
+--- new.orig/vl.c      2012-02-09 13:22:39.000000000 +0100
++++ new/vl.c   2012-02-09 13:23:09.000000000 +0100
+@@ -2929,6 +2929,7 @@
                  break;
              case QEMU_OPTION_id:
                  fairsched_id = atoi(optarg);
@@ -419,3 +419,15 @@ Index: new/vl.c
                if (fairsched_id < 100 || fairsched_id >= 1000000) {
                    fprintf(stderr, "Invalid ID\n");
                    exit(1);
+Index: new/console.h
+===================================================================
+--- new.orig/console.h 2012-02-09 13:30:11.000000000 +0100
++++ new/console.h      2012-02-09 13:30:20.000000000 +0100
+@@ -371,6 +371,7 @@
+ void cocoa_display_init(DisplayState *ds, int full_screen);
+ 
+ /* vnc.c */
++void pve_auth_setup(int vmid);
+ void vnc_display_init(DisplayState *ds);
+ void vnc_display_close(DisplayState *ds);
+ int vnc_display_open(DisplayState *ds, const char *display);

diff --git a/debian/patches/series b/debian/patches/series
index b934d608a6bb02adc1d5186cbe06096f85cc41f6..d2988da4bcb601c8b27389efbda1b954efb4cfa0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,6 @@ fr-ca-keymap-corrections.diff
 adjust-path.diff
 fairsched.diff
 keymap.diff
-live-migration-fixes.diff
 set-max-nics.patch
-use-local-linux-kvm-h.diff
 pve-auth.patch
 update-target-x86_64.conf-to-rhel6.2-version.patch

diff --git a/debian/patches/set-max-nics.patch b/debian/patches/set-max-nics.patch
index 3e3da10f03a4c90bfd860ea087d0382327f52a11..f6352bca0081bd7d2ab7c68b8727a7081b680e3c 100644 (file)
--- a/debian/patches/set-max-nics.patch
+++ b/debian/patches/set-max-nics.patch
@@ -1,7 +1,7 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h     2011-12-07 10:09:32.000000000 +0100
-+++ new/net.h  2011-12-07 10:14:23.000000000 +0100
+--- new.orig/net.h     2012-02-09 13:22:30.000000000 +0100
++++ new/net.h  2012-02-09 13:23:03.000000000 +0100
 @@ -126,7 +126,7 @@
  
  /* NIC info */

diff --git a/debian/rules b/debian/rules
index 4967b671d4ecd8ac61a192180f719fadf373dd38..474f5eca9238703fa5f7d41da48b7e3a59680aa6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ install: build
        mv $(destdir)/usr/share/man/man1/qemu.1 $(destdir)/usr/share/man/man1/kvm.1
 
        # Install the userspace utilities
-       install -m 0755 kvm/kvm_stat $(destdir)/usr/bin/
+       install -m 0755 scripts/kvm/kvm_stat $(destdir)/usr/bin/
 
        install -D -m 0755 $(CURDIR)/debian/kvm-ifup $(destdir)/etc/kvm/kvm-ifup
        install -D -m 0755 $(CURDIR)/debian/kvm-ifdown $(destdir)/etc/kvm/kvm-ifdown