[pve-devel] r6455 - in pve-qemu-kvm/trunk: . debian debian/patches

svn-commits at proxmox.com svn-commits at proxmox.com
Thu Aug 11 08:03:50 CEST 2011


Author: dietmar
Date: 2011-08-11 08:03:50 +0200 (Thu, 11 Aug 2011)
New Revision: 6455

Modified:
   pve-qemu-kvm/trunk/Makefile
   pve-qemu-kvm/trunk/debian/changelog
   pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
   pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
   pve-qemu-kvm/trunk/debian/patches/fairsched.diff
   pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff
   pve-qemu-kvm/trunk/debian/patches/keymap.diff
   pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff
   pve-qemu-kvm/trunk/debian/patches/msix-eventfd-fix.patch
   pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch
   pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff
   pve-qemu-kvm/trunk/debian/patches/vncticket.diff
Log:
update to 0.15.0


Modified: pve-qemu-kvm/trunk/Makefile
===================================================================
--- pve-qemu-kvm/trunk/Makefile	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/Makefile	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 # also update debian/changelog
-KVMVER=0.14.1
+KVMVER=0.15.0
 KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm

Modified: pve-qemu-kvm/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/changelog	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,3 +1,9 @@
+pve-qemu-kvm (0.15.0-1) unstable; urgency=low
+
+  * update to upstream 0.15.0
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 11 Aug 2011 07:41:20 +0200
+
 pve-qemu-kvm (0.14.1-1) unstable; urgency=low
 
   * update to upstream 0.14.1

Modified: pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/net.h	2011-02-25 06:40:58.000000000 +0100
-@@ -169,8 +169,8 @@
+--- new.orig/net.h	2011-08-11 07:43:50.000000000 +0200
++++ new/net.h	2011-08-11 07:46:51.000000000 +0200
+@@ -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,11 +15,11 @@
  #else
 Index: new/configure
 ===================================================================
---- new.orig/configure	2011-02-25 06:39:52.000000000 +0100
-+++ new/configure	2011-02-25 06:40:58.000000000 +0100
-@@ -155,7 +155,7 @@
- docdir="\${prefix}/share/doc/qemu"
+--- new.orig/configure	2011-08-11 07:43:50.000000000 +0200
++++ new/configure	2011-08-11 07:46:51.000000000 +0200
+@@ -157,7 +157,7 @@
  bindir="\${prefix}/bin"
+ libdir="\${prefix}/lib"
  sysconfdir="\${prefix}/etc"
 -confsuffix="/qemu"
 +confsuffix="/kvm"
@@ -28,8 +28,8 @@
  fmod_inc=""
 Index: new/net/tap.h
 ===================================================================
---- new.orig/net/tap.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/net/tap.h	2011-02-25 06:40:58.000000000 +0100
+--- new.orig/net/tap.h	2011-08-11 07:43:50.000000000 +0200
++++ new/net/tap.h	2011-08-11 07:46:51.000000000 +0200
 @@ -29,8 +29,6 @@
  #include "qemu-common.h"
  #include "qemu-option.h"

Modified: pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/osdep.h
 ===================================================================
---- new.orig/osdep.h	2011-04-07 06:12:48.000000000 +0200
-+++ new/osdep.h	2011-04-07 06:22:27.000000000 +0200
-@@ -94,6 +94,12 @@
+--- new.orig/osdep.h	2011-08-11 07:43:50.000000000 +0200
++++ new/osdep.h	2011-08-11 07:57:35.000000000 +0200
+@@ -97,6 +97,12 @@
  
  #if defined(CONFIG_MADVISE)
  

Modified: pve-qemu-kvm/trunk/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/fairsched.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/fairsched.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/qemu-options.hx
 ===================================================================
---- new.orig/qemu-options.hx	2011-02-25 06:39:51.000000000 +0100
-+++ new/qemu-options.hx	2011-02-25 06:41:23.000000000 +0100
-@@ -74,6 +74,12 @@
+--- new.orig/qemu-options.hx	2011-08-11 07:43:51.000000000 +0200
++++ new/qemu-options.hx	2011-08-11 07:47:08.000000000 +0200
+@@ -89,6 +89,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-25 06:39:52.000000000 +0100
-+++ new/vl.c	2011-02-25 06:42:28.000000000 +0100
-@@ -153,6 +153,8 @@
+--- new.orig/vl.c	2011-08-11 07:43:51.000000000 +0200
++++ new/vl.c	2011-08-11 07:47:08.000000000 +0200
+@@ -150,6 +150,8 @@
  #include "fsdev/qemu-fsdev.h"
  #endif
  
@@ -28,7 +28,7 @@
  #include "disas.h"
  
  #include "qemu_socket.h"
-@@ -205,6 +207,7 @@
+@@ -203,6 +205,7 @@
  int rtc_td_hack = 0;
  int usb_enabled = 0;
  int singlestep = 0;
@@ -36,7 +36,7 @@
  int smp_cpus = 1;
  int max_cpus = 0;
  int smp_cores = 1;
-@@ -1933,6 +1936,7 @@
+@@ -2074,6 +2077,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;
-@@ -2622,6 +2626,20 @@
+@@ -2768,6 +2772,20 @@
                      exit(1);
                  }
                  break;
@@ -63,9 +63,9 @@
 +                }
 +                break;
  	    case QEMU_OPTION_vnc:
+ #ifdef CONFIG_VNC
                  display_remote++;
- 		vnc_display = optarg;
-@@ -2972,6 +2990,39 @@
+@@ -3141,6 +3159,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-25 06:41:23.000000000 +0100
++++ new/vzsyscalls.h	2011-08-11 07:47:08.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

Modified: pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,7 +1,7 @@
 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
+--- new.orig/pc-bios/keymaps/fr-ca	2011-08-11 07:43:50.000000000 +0200
++++ new/pc-bios/keymaps/fr-ca	2011-08-11 07:58:05.000000000 +0200
 @@ -14,22 +14,31 @@
  twosuperior 0x9 altgr
  threesuperior 0xa altgr

Modified: pve-qemu-kvm/trunk/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/keymap.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/keymap.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-02-25 06:51:48.000000000 +0100
-+++ new/ui/vnc.c	2011-02-25 06:58:10.000000000 +0100
-@@ -1476,6 +1476,10 @@
+--- new.orig/ui/vnc.c	2011-08-11 07:53:23.000000000 +0200
++++ new/ui/vnc.c	2011-08-11 07:57:23.000000000 +0200
+@@ -1444,6 +1444,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 */
-@@ -1546,12 +1550,42 @@
+@@ -1514,12 +1518,42 @@
      }
  
      if (is_graphic_console()) {
@@ -56,7 +56,7 @@
      } else {
          /* QEMU console emulation */
          if (down) {
-@@ -1659,7 +1693,8 @@
+@@ -1627,7 +1661,8 @@
          lsym = lsym - 'A' + 'a';
      }
  

Modified: pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/arch_init.c
 ===================================================================
---- new.orig/arch_init.c	2011-02-25 06:39:51.000000000 +0100
-+++ new/arch_init.c	2011-02-25 06:59:09.000000000 +0100
-@@ -249,9 +249,10 @@
+--- new.orig/arch_init.c	2011-08-11 07:43:50.000000000 +0200
++++ new/arch_init.c	2011-08-11 07:57:29.000000000 +0200
+@@ -251,9 +251,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);
-@@ -291,10 +292,10 @@
+@@ -293,10 +294,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;
-@@ -306,8 +307,8 @@
+@@ -308,8 +309,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 */
-@@ -328,6 +329,10 @@
+@@ -330,6 +331,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

Modified: pve-qemu-kvm/trunk/debian/patches/msix-eventfd-fix.patch
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/msix-eventfd-fix.patch	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/msix-eventfd-fix.patch	2011-08-11 06:03:50 UTC (rev 6455)
@@ -4,8 +4,8 @@
 
 Index: new/hw/event_notifier.c
 ===================================================================
---- new.orig/hw/event_notifier.c	2011-03-01 12:16:30.000000000 +0100
-+++ new/hw/event_notifier.c	2011-03-01 12:36:02.000000000 +0100
+--- new.orig/hw/event_notifier.c	2011-08-11 07:43:50.000000000 +0200
++++ new/hw/event_notifier.c	2011-08-11 07:58:12.000000000 +0200
 @@ -14,6 +14,13 @@
  #include "event_notifier.h"
  #ifdef CONFIG_EVENTFD

Modified: pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,8 +1,8 @@
 Index: new/net.h
 ===================================================================
---- new.orig/net.h	2011-02-25 06:40:58.000000000 +0100
-+++ new/net.h	2011-02-25 06:59:30.000000000 +0100
-@@ -124,7 +124,7 @@
+--- new.orig/net.h	2011-08-11 07:46:51.000000000 +0200
++++ new/net.h	2011-08-11 07:57:48.000000000 +0200
+@@ -126,7 +126,7 @@
  
  /* NIC info */
  
@@ -10,4 +10,4 @@
 +#define MAX_NICS 32
  
  struct NICInfo {
-     uint8_t macaddr[6];
+     MACAddr macaddr;

Modified: pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -3,8 +3,8 @@
 
 Index: new/kvm/libkvm/libkvm.h
 ===================================================================
---- new.orig/kvm/libkvm/libkvm.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/kvm/libkvm/libkvm.h	2011-02-25 06:59:36.000000000 +0100
+--- new.orig/kvm/libkvm/libkvm.h	2011-08-11 07:43:50.000000000 +0200
++++ new/kvm/libkvm/libkvm.h	2011-08-11 07:57:55.000000000 +0200
 @@ -15,7 +15,7 @@
  #define __user /* temporary, until installed via make headers_install */
  #endif

Modified: pve-qemu-kvm/trunk/debian/patches/vncticket.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/vncticket.diff	2011-08-11 05:37:04 UTC (rev 6454)
+++ pve-qemu-kvm/trunk/debian/patches/vncticket.diff	2011-08-11 06:03:50 UTC (rev 6455)
@@ -1,21 +1,21 @@
 Index: new/console.h
 ===================================================================
---- new.orig/console.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/console.h	2011-02-25 07:22:17.000000000 +0100
-@@ -368,7 +368,7 @@
- void vnc_display_init(DisplayState *ds);
- void vnc_display_close(DisplayState *ds);
- int vnc_display_open(DisplayState *ds, const char *display);
+--- new.orig/console.h	2011-08-11 07:43:50.000000000 +0200
++++ new/console.h	2011-08-11 07:50:24.000000000 +0200
+@@ -376,7 +376,7 @@
+ int vnc_display_disable_login(DisplayState *ds);
+ char *vnc_display_local_addr(DisplayState *ds);
+ #ifdef CONFIG_VNC
 -int vnc_display_password(DisplayState *ds, const char *password);
 +int vnc_display_password(DisplayState *ds, const char *password, int limit);
- int vnc_display_disable_login(DisplayState *ds);
  int vnc_display_pw_expire(DisplayState *ds, time_t expires);
  void do_info_vnc_print(Monitor *mon, const QObject *data);
+ void do_info_vnc(Monitor *mon, QObject **ret_data);
 Index: new/ui/vnc.c
 ===================================================================
---- new.orig/ui/vnc.c	2011-02-25 06:39:51.000000000 +0100
-+++ new/ui/vnc.c	2011-02-25 07:38:07.000000000 +0100
-@@ -1794,7 +1794,7 @@
+--- new.orig/ui/vnc.c	2011-08-11 07:43:50.000000000 +0200
++++ new/ui/vnc.c	2011-08-11 07:53:23.000000000 +0200
+@@ -1775,7 +1775,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
      if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -24,7 +24,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);
-@@ -1880,7 +1880,7 @@
+@@ -1861,7 +1861,7 @@
          vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -33,7 +33,7 @@
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_unlock_output(vs);
-@@ -2084,7 +2084,10 @@
+@@ -2065,7 +2065,10 @@
      unsigned char key[8];
      time_t now = time(NULL);
  
@@ -45,28 +45,28 @@
          VNC_DEBUG("No password configured on server");
          goto reject;
      }
-@@ -2502,7 +2505,7 @@
+@@ -2653,7 +2656,7 @@
      return 0;
  }
  
 -int vnc_display_password(DisplayState *ds, const char *password)
 +int vnc_display_password(DisplayState *ds, const char *password, int limit)
  {
+     int ret = 0;
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
- 
-@@ -2522,6 +2525,7 @@
+@@ -2676,6 +2679,7 @@
      }
      vs->password = qemu_strdup(password);
      vs->auth = VNC_AUTH_VNC;
 +    vs->retries = limit ? 0 : -1;
- 
-     return 0;
- }
+ out:
+     if (ret != 0) {
+         qerror_report(QERR_SET_PASSWD_FAILED);
 Index: new/ui/vnc.h
 ===================================================================
---- new.orig/ui/vnc.h	2011-02-25 06:39:51.000000000 +0100
-+++ new/ui/vnc.h	2011-02-25 07:22:17.000000000 +0100
-@@ -120,6 +120,7 @@
+--- new.orig/ui/vnc.h	2011-08-11 07:43:50.000000000 +0200
++++ new/ui/vnc.h	2011-08-11 07:47:35.000000000 +0200
+@@ -144,6 +144,7 @@
  
      char *display;
      char *password;
@@ -76,18 +76,18 @@
      bool lossy;
 Index: new/monitor.c
 ===================================================================
---- new.orig/monitor.c	2011-02-25 06:39:52.000000000 +0100
-+++ new/monitor.c	2011-02-25 07:39:39.000000000 +0100
-@@ -1041,7 +1041,7 @@
-     return 0;
+--- new.orig/monitor.c	2011-08-11 07:43:51.000000000 +0200
++++ new/monitor.c	2011-08-11 07:56:41.000000000 +0200
+@@ -1042,7 +1042,7 @@
  }
  
+ #ifdef CONFIG_VNC
 -static int change_vnc_password(const char *password)
 +static int change_vnc_password(const char *password, int limit)
  {
      if (!password || !password[0]) {
          if (vnc_display_disable_login(NULL)) {
-@@ -1051,7 +1051,7 @@
+@@ -1052,7 +1052,7 @@
          return 0;
      }
  
@@ -96,7 +96,7 @@
          qerror_report(QERR_SET_PASSWD_FAILED);
          return -1;
      }
-@@ -1062,19 +1062,23 @@
+@@ -1063,19 +1063,23 @@
  static void change_vnc_password_cb(Monitor *mon, const char *password,
                                     void *opaque)
  {
@@ -123,16 +123,16 @@
          } else {
              return monitor_read_password(mon, change_vnc_password_cb, NULL);
          }
-@@ -1152,7 +1156,7 @@
+@@ -1160,7 +1164,7 @@
          }
          /* Note that setting an empty password will not disable login through
           * this interface. */
--        rc = vnc_display_password(NULL, password);
-+        rc = vnc_display_password(NULL, password, 0);
-         if (rc != 0) {
-             qerror_report(QERR_SET_PASSWD_FAILED);
-             return -1;
-@@ -3978,11 +3982,11 @@
+-        return vnc_display_password(NULL, password);
++        return vnc_display_password(NULL, password, 0);
+     }
+ 
+     qerror_report(QERR_INVALID_PARAMETER, "protocol");
+@@ -4069,11 +4073,11 @@
  static int is_valid_option(const char *c, const char *typestr)
  {
      char option[3];
@@ -146,7 +146,7 @@
      typestr = strstr(typestr, option);
      return (typestr != NULL);
  }
-@@ -4322,7 +4326,7 @@
+@@ -4413,7 +4417,7 @@
                      p++;
                      if(c != *p) {
                          if(!is_valid_option(p, typestr)) {



More information about the pve-devel mailing list