[pve-devel] r5621 - in pve-qemu-kvm/pve2: . debian debian/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Feb 25 08:32:45 CET 2011


Author: dietmar
Date: 2011-02-25 08:32:45 +0100 (Fri, 25 Feb 2011)
New Revision: 5621

Added:
   pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff
Modified:
   pve-qemu-kvm/pve2/Makefile
   pve-qemu-kvm/pve2/debian/changelog
   pve-qemu-kvm/pve2/debian/control
   pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff
   pve-qemu-kvm/pve2/debian/patches/fairsched.diff
   pve-qemu-kvm/pve2/debian/patches/keymap.diff
   pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff
   pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
   pve-qemu-kvm/pve2/debian/patches/series
   pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch
   pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff
   pve-qemu-kvm/pve2/debian/rules
Log:
update to 0.14.0


Modified: pve-qemu-kvm/pve2/Makefile
===================================================================
--- pve-qemu-kvm/pve2/Makefile	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/Makefile	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,8 +1,8 @@
 RELEASE=2.0
 
 # also update debian/changelog
-KVMVER=0.13.0
-KVMPKGREL=3
+KVMVER=0.14.0
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

Modified: pve-qemu-kvm/pve2/debian/changelog
===================================================================
--- pve-qemu-kvm/pve2/debian/changelog	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/changelog	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,3 +1,13 @@
+pve-qemu-kvm (0.14.0-1) unstable; urgency=low
+
+  * update to 0.14.0
+
+  * removed kvmtrace (removed from upstream?)
+  
+  * add vnc keyboard fixes for fr-ca (reported by Pierre-Yves)
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 25 Feb 2011 08:17:56 +0100
+
 pve-qemu-kvm (0.13.0-3) unstable; urgency=low
 
   * fix vnc keyboard altgr/shift emulation

Modified: pve-qemu-kvm/pve2/debian/control
===================================================================
--- pve-qemu-kvm/pve2/debian/control	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/control	2011-02-25 07:32:45 UTC (rev 5621)
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 5), autotools-dev, libpci-dev, quilt, texinfo, texi2html, libgnutls-dev, libsdl1.2-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libpci-dev, quilt, texinfo, texi2html, libgnutls-dev, libsdl1.2-dev, check
 Standards-Version: 3.7.2
 
 Package: pve-qemu-kvm

Modified: pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,11 +1,11 @@
 just define MADV_MERGEABLE
 ---
 
-Index: qemu-new/exec.c
+Index: new/exec.c
 ===================================================================
---- qemu-new.orig/exec.c	2010-10-25 12:04:41.000000000 +0200
-+++ qemu-new/exec.c	2010-10-25 12:04:47.000000000 +0200
-@@ -66,6 +66,9 @@
+--- new.orig/exec.c	2011-02-25 08:23:43.000000000 +0100
++++ new/exec.c	2011-02-25 08:28:38.000000000 +0100
+@@ -59,6 +59,9 @@
  #endif
  #endif
  

Modified: pve-qemu-kvm/pve2/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,7 +1,7 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx	2011-02-16 10:54:32.000000000 +0100
-+++ new/qemu-options.hx	2011-02-16 10:54:38.000000000 +0100
+--- new.orig/qemu-options.hx	2011-02-25 08:23:43.000000000 +0100
++++ new/qemu-options.hx	2011-02-25 08:27:35.000000000 +0100
 @@ -74,6 +74,12 @@
  are split equally.
  ETEXI
@@ -17,9 +17,9 @@
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c	2011-02-16 10:54:32.000000000 +0100
-+++ new/vl.c	2011-02-16 10:54:38.000000000 +0100
-@@ -152,6 +152,8 @@
+--- new.orig/vl.c	2011-02-25 08:23:43.000000000 +0100
++++ new/vl.c	2011-02-25 08:28:14.000000000 +0100
+@@ -153,6 +153,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
  
@@ -28,15 +28,15 @@
  #include "disas.h"
  
  #include "qemu_socket.h"
-@@ -202,6 +204,7 @@
+@@ -205,6 +207,7 @@
+ int rtc_td_hack = 0;
+ int usb_enabled = 0;
  int singlestep = 0;
- const char *assigned_devices[MAX_DEV_ASSIGN_CMDLINE];
- int assigned_devices_index;
 +int fairsched_id = 0;
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -1829,6 +1832,7 @@
+@@ -1933,6 +1936,7 @@
  {
      const char *gdbstub_dev = NULL;
      int i;
@@ -44,7 +44,7 @@
      int snapshot, linux_boot;
      const char *icount_option = NULL;
      const char *initrd_filename;
-@@ -2532,6 +2536,20 @@
+@@ -2622,6 +2626,20 @@
                      exit(1);
                  }
                  break;
@@ -63,9 +63,9 @@
 +                }
 +                break;
  	    case QEMU_OPTION_vnc:
-                 display_type = DT_VNC;
+                 display_remote++;
  		vnc_display = optarg;
-@@ -2851,6 +2869,39 @@
+@@ -2972,6 +2990,39 @@
      if (ram_size == 0)
          ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
  
@@ -108,7 +108,7 @@
 Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ new/vzsyscalls.h	2011-02-16 10:54:38.000000000 +0100
++++ new/vzsyscalls.h	2011-02-25 08:27:35.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

Added: pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff	                        (rev 0)
+++ pve-qemu-kvm/pve2/debian/patches/fr-ca-keymap-corrections.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -0,0 +1,36 @@
+Index: new/pc-bios/keymaps/fr-ca
+===================================================================
+--- new.orig/pc-bios/keymaps/fr-ca	2011-02-25 07:01:03.000000000 +0100
++++ new/pc-bios/keymaps/fr-ca	2011-02-25 07:07:08.000000000 +0100
+@@ -14,22 +14,31 @@
+ twosuperior 0x9 altgr
+ threesuperior 0xa altgr
+ onequarter 0xb altgr
++minus 0x0c
+ onehalf 0xc altgr
++equal 0xd
+ threequarters 0xd altgr
+ section 0x18 altgr
+ paragraph 0x19 altgr
+ bracketleft 0x1a altgr
+ bracketright 0x1b altgr
++semicolon 0x27
++colon 0x27 shift
+ asciitilde 0x27 altgr
+ braceleft 0x28 altgr
++numbersign 0x29
+ braceright 0x2b altgr
+ less 0x2b
+ greater 0x2b shift
+ guillemotleft 0x56
+ guillemotright 0x56 shift
+ degree 0x56 altgr
++comma 0x33
+ mu 0x32 altgr
++apostrophe 0x33 shift
++period 0x34 shift
+ eacute 0x35
++Eacute 0x35 shift
+ dead_acute 0x35 altgr
+ dead_grave 0x28
+ dead_circumflex 0x1a

Modified: pve-qemu-kvm/pve2/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/keymap.diff	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/keymap.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,8 +1,8 @@
-Index: qemu-new/ui/vnc.c
+Index: new/ui/vnc.c
 ===================================================================
---- qemu-new.orig/ui/vnc.c	2010-10-25 13:19:55.000000000 +0200
-+++ qemu-new/ui/vnc.c	2010-12-07 11:52:24.000000000 +0100
-@@ -1472,6 +1472,10 @@
+--- new.orig/ui/vnc.c	2011-02-25 08:23:43.000000000 +0100
++++ new/ui/vnc.c	2011-02-25 08:28:27.000000000 +0100
+@@ -1476,6 +1476,10 @@
  
  static void do_key_event(VncState *vs, int down, int keycode, int sym)
  {
@@ -13,7 +13,7 @@
      /* QEMU console switch */
      switch(keycode) {
      case 0x2a:                          /* Left Shift */
-@@ -1542,12 +1546,42 @@
+@@ -1546,12 +1550,42 @@
      }
  
      if (is_graphic_console()) {
@@ -56,7 +56,7 @@
      } else {
          /* QEMU console emulation */
          if (down) {
-@@ -1655,7 +1689,8 @@
+@@ -1659,7 +1693,8 @@
          lsym = lsym - 'A' + 'a';
      }
  

Modified: pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,8 +1,8 @@
-Index: qemu-new/arch_init.c
+Index: new/arch_init.c
 ===================================================================
---- qemu-new.orig/arch_init.c	2010-10-25 12:13:41.000000000 +0200
-+++ qemu-new/arch_init.c	2010-10-25 12:32:51.000000000 +0200
-@@ -215,9 +215,10 @@
+--- new.orig/arch_init.c	2011-02-25 08:23:43.000000000 +0100
++++ new/arch_init.c	2011-02-25 08:28:34.000000000 +0100
+@@ -249,9 +249,10 @@
  int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
  {
      ram_addr_t addr;
@@ -14,7 +14,7 @@
  
      if (stage < 0) {
          cpu_physical_memory_set_dirty_tracking(0);
-@@ -256,10 +257,10 @@
+@@ -291,10 +292,10 @@
              qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));
              qemu_put_be64(f, block->length);
          }
@@ -27,7 +27,7 @@
  
      while (!qemu_file_rate_limit(f)) {
          int bytes_sent;
-@@ -271,8 +272,8 @@
+@@ -306,8 +307,8 @@
          }
      }
  
@@ -38,7 +38,7 @@
  
      /* if we haven't transferred anything this round, force expected_time to a
       * a very high value, but without crashing */
-@@ -293,6 +294,10 @@
+@@ -328,6 +329,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

Modified: pve-qemu-kvm/pve2/debian/patches/pve-auth.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/pve-auth.patch	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,7 +1,7 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-02-16 10:57:41.000000000 +0100
-+++ new/ui/vnc.c	2011-02-23 11:47:56.000000000 +0100
+--- new.orig/ui/vnc.c	2011-02-25 08:28:27.000000000 +0100
++++ new/ui/vnc.c	2011-02-25 08:29:06.000000000 +0100
 @@ -31,6 +31,8 @@
  #include "qemu-timer.h"
  #include "acl.h"
@@ -137,7 +137,7 @@
  static VncDisplay *vnc_display; /* needed for info vnc */
  static DisplayChangeListener *dcl;
  
-@@ -1825,7 +1946,7 @@
+@@ -1829,7 +1950,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
      if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -146,7 +146,7 @@
          !memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
          vs->write_pixels = vnc_write_pixels_copy;
          vnc_hextile_set_pixel_conversion(vs, 0);
-@@ -1911,7 +2032,7 @@
+@@ -1915,7 +2036,7 @@
          vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -155,7 +155,7 @@
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_unlock_output(vs);
-@@ -2541,7 +2662,7 @@
+@@ -2572,7 +2693,7 @@
  char *vnc_display_local_addr(DisplayState *ds)
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
@@ -164,7 +164,7 @@
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
-@@ -2588,6 +2709,7 @@
+@@ -2621,6 +2742,7 @@
              tls = 1; /* Require TLS */
          } else if (strncmp(options, "x509", 4) == 0) {
              char *start, *end;
@@ -172,7 +172,7 @@
              x509 = 1; /* Require x509 certificates */
              if (strncmp(options, "x509verify", 10) == 0)
                  vs->tls.x509verify = 1; /* ...and verify client certs */
-@@ -2610,10 +2732,12 @@
+@@ -2643,10 +2765,12 @@
                  }
                  qemu_free(path);
              } else {
@@ -188,8 +188,8 @@
 +		}
              }
  #endif
-         } else if (strncmp(options, "acl", 3) == 0) {
-@@ -2662,10 +2786,10 @@
+ #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
+@@ -2697,10 +2821,10 @@
              vs->auth = VNC_AUTH_VENCRYPT;
              if (x509) {
                  VNC_DEBUG("Initializing VNC server with x509 password auth\n");
@@ -204,8 +204,8 @@
  #endif /* CONFIG_VNC_TLS */
 Index: new/ui/vnc-auth-vencrypt.c
 ===================================================================
---- new.orig/ui/vnc-auth-vencrypt.c	2011-02-16 10:54:31.000000000 +0100
-+++ new/ui/vnc-auth-vencrypt.c	2011-02-23 11:45:52.000000000 +0100
+--- new.orig/ui/vnc-auth-vencrypt.c	2011-02-25 08:23:43.000000000 +0100
++++ new/ui/vnc-auth-vencrypt.c	2011-02-25 08:29:06.000000000 +0100
 @@ -25,7 +25,107 @@
   */
  
@@ -329,9 +329,9 @@
         VNC_DEBUG("Start TLS auth VNC\n");
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h	2011-02-16 10:54:31.000000000 +0100
-+++ new/ui/vnc.h	2011-02-16 10:57:41.000000000 +0100
-@@ -216,6 +216,8 @@
+--- new.orig/ui/vnc.h	2011-02-25 08:23:43.000000000 +0100
++++ new/ui/vnc.h	2011-02-25 08:29:06.000000000 +0100
+@@ -217,6 +217,8 @@
  
      char challenge[VNC_AUTH_CHALLENGE_SIZE];
  #ifdef CONFIG_VNC_TLS
@@ -342,8 +342,8 @@
  #ifdef CONFIG_VNC_SASL
 Index: new/ui/vnc-tls.c
 ===================================================================
---- new.orig/ui/vnc-tls.c	2011-02-16 10:54:31.000000000 +0100
-+++ new/ui/vnc-tls.c	2011-02-16 10:57:41.000000000 +0100
+--- new.orig/ui/vnc-tls.c	2011-02-25 08:23:43.000000000 +0100
++++ new/ui/vnc-tls.c	2011-02-25 08:29:06.000000000 +0100
 @@ -291,6 +291,14 @@
      static const int kx_anon[] = {GNUTLS_KX_ANON_DH, 0};
      static const int kx_x509[] = {GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0};
@@ -400,8 +400,8 @@
                                 const char *certdir)
 Index: new/ui/vnc-tls.h
 ===================================================================
---- new.orig/ui/vnc-tls.h	2011-02-16 10:54:31.000000000 +0100
-+++ new/ui/vnc-tls.h	2011-02-16 10:57:41.000000000 +0100
+--- new.orig/ui/vnc-tls.h	2011-02-25 08:23:43.000000000 +0100
++++ new/ui/vnc-tls.h	2011-02-25 08:29:06.000000000 +0100
 @@ -68,6 +68,8 @@
  
  int vnc_tls_validate_certificate(VncState *vs);
@@ -413,9 +413,9 @@
  
 Index: new/vl.c
 ===================================================================
---- new.orig/vl.c	2011-02-16 10:54:38.000000000 +0100
-+++ new/vl.c	2011-02-16 10:57:41.000000000 +0100
-@@ -2538,6 +2538,7 @@
+--- new.orig/vl.c	2011-02-25 08:28:14.000000000 +0100
++++ new/vl.c	2011-02-25 08:29:06.000000000 +0100
+@@ -2628,6 +2628,7 @@
                  break;
              case QEMU_OPTION_id:
                  fairsched_id = atoi(optarg);

Modified: pve-qemu-kvm/pve2/debian/patches/series
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/series	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/series	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,3 +1,4 @@
+fr-ca-keymap-corrections.diff
 adjust-path.diff
 fairsched.diff
 keymap.diff
@@ -6,3 +7,4 @@
 set-max-nics.patch
 use-local-linux-kvm-h.diff
 pve-auth.patch
+

Modified: pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/set-max-nics.patch	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,8 +1,8 @@
-Index: qemu-kvm/net.h
+Index: new/net.h
 ===================================================================
---- qemu-kvm.orig/net.h	2010-10-21 14:25:42.000000000 +0200
-+++ qemu-kvm/net.h	2010-10-21 14:28:08.000000000 +0200
-@@ -122,7 +122,7 @@
+--- new.orig/net.h	2011-02-25 08:27:21.000000000 +0100
++++ new/net.h	2011-02-25 08:28:42.000000000 +0100
+@@ -124,7 +124,7 @@
  
  /* NIC info */
  

Modified: pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/patches/use-local-linux-kvm-h.diff	2011-02-25 07:32:45 UTC (rev 5621)
@@ -1,10 +1,10 @@
 
 Alway use our own version.
 
-Index: qemu-new/kvm/libkvm/libkvm.h
+Index: new/kvm/libkvm/libkvm.h
 ===================================================================
---- qemu-new.orig/kvm/libkvm/libkvm.h	2010-10-25 12:53:18.000000000 +0200
-+++ qemu-new/kvm/libkvm/libkvm.h	2010-10-25 12:54:02.000000000 +0200
+--- new.orig/kvm/libkvm/libkvm.h	2011-02-25 08:23:43.000000000 +0100
++++ new/kvm/libkvm/libkvm.h	2011-02-25 08:28:45.000000000 +0100
 @@ -15,7 +15,7 @@
  #define __user /* temporary, until installed via make headers_install */
  #endif

Modified: pve-qemu-kvm/pve2/debian/rules
===================================================================
--- pve-qemu-kvm/pve2/debian/rules	2011-02-25 07:05:32 UTC (rev 5620)
+++ pve-qemu-kvm/pve2/debian/rules	2011-02-25 07:32:45 UTC (rev 5621)
@@ -34,7 +34,6 @@
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure --prefix=/usr --datadir=/usr/share/kvm --docdir=/usr/share/doc/pve-qemu-kvm --sysconfdir=/etc --disable-xen --disable-blobs --enable-vnc-tls --enable-sdl
-	cd kvm/test && ./configure --prefix=/usr
 
 build: patch build-stamp
 
@@ -43,8 +42,6 @@
 
 	# Add here commands to compile the package.
 	$(MAKE) V=1
-	$(MAKE) -C kvm/libkvm
-	$(MAKE) -C kvm/test kvmtrace kvmtrace_format
 
 	#docbook-to-man debian/kvm.sgml > kvm.1
 
@@ -80,11 +77,8 @@
 	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 kvm/test/kvmtrace kvm/test/kvmtrace_format $(destdir)/usr/bin/
+	install -m 0755 kvm/kvm_stat $(destdir)/usr/bin/
 
-	# file `formats' is needed for kvmtrace_format	
-	install -Dp -m0644 kvm/test/formats $(destdir)/usr/share/kvm/formats
-
 	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
 



More information about the pve-devel mailing list