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

svn-commits at proxmox.com svn-commits at proxmox.com
Fri Feb 25 07:10:50 CET 2011


Author: dietmar
Date: 2011-02-25 07:10:50 +0100 (Fri, 25 Feb 2011)
New Revision: 5618

Added:
   pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff
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/keymap.diff
   pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff
   pve-qemu-kvm/trunk/debian/patches/series
   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:
fixes for 0.14.0



Modified: pve-qemu-kvm/trunk/Makefile
===================================================================
--- pve-qemu-kvm/trunk/Makefile	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/Makefile	2011-02-25 06:10:50 UTC (rev 5618)
@@ -1,8 +1,8 @@
 RELEASE=1.7
 
 # 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/trunk/debian/changelog
===================================================================
--- pve-qemu-kvm/trunk/debian/changelog	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/changelog	2011-02-25 06:10:50 UTC (rev 5618)
@@ -1,3 +1,11 @@
+pve-qemu-kvm (0.14.0-1) unstable; urgency=low
+
+  * update to 0.14.0
+  
+  * add vnc keyboard fixes for fr-ca (reported by Pierre-Yves)
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 25 Feb 2011 06:37:52 +0100
+
 pve-qemu-kvm (0.13.0-3) unstable; urgency=low
 
   * fix vnc keyboard altgr/shift emulation

Modified: pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -1,8 +1,8 @@
-Index: qemu-new/net.h
+Index: new/net.h
 ===================================================================
---- qemu-new.orig/net.h	2010-10-25 12:46:09.000000000 +0200
-+++ qemu-new/net.h	2010-10-25 12:46:11.000000000 +0200
-@@ -167,8 +167,8 @@
+--- 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 @@
  int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
  int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
  
@@ -13,11 +13,11 @@
  #ifdef __sun__
  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
  #else
-Index: qemu-new/configure
+Index: new/configure
 ===================================================================
---- qemu-new.orig/configure	2010-10-25 12:46:09.000000000 +0200
-+++ qemu-new/configure	2010-10-25 12:46:11.000000000 +0200
-@@ -300,7 +300,7 @@
+--- 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"
  bindir="\${prefix}/bin"
  sysconfdir="\${prefix}/etc"
@@ -26,10 +26,10 @@
  slirp="yes"
  fmod_lib=""
  fmod_inc=""
-Index: qemu-new/net/tap.h
+Index: new/net/tap.h
 ===================================================================
---- qemu-new.orig/net/tap.h	2010-10-25 12:46:29.000000000 +0200
-+++ qemu-new/net/tap.h	2010-10-25 12:46:53.000000000 +0200
+--- 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
 @@ -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-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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 06:39:52.000000000 +0100
++++ new/exec.c	2011-02-25 06:59:16.000000000 +0100
+@@ -59,6 +59,9 @@
  #endif
  #endif
  

Modified: pve-qemu-kvm/trunk/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/fairsched.diff	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/fairsched.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -1,7 +1,7 @@
-Index: qemu-kvm/qemu-options.hx
+Index: new/qemu-options.hx
 ===================================================================
---- qemu-kvm.orig/qemu-options.hx	2010-10-21 14:39:35.000000000 +0200
-+++ qemu-kvm/qemu-options.hx	2010-10-21 14:41:52.000000000 +0200
+--- 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 @@
  are split equally.
  ETEXI
@@ -15,11 +15,11 @@
  DEF("fda", HAS_ARG, QEMU_OPTION_fda,
      "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
-Index: qemu-kvm/vl.c
+Index: new/vl.c
 ===================================================================
---- qemu-kvm.orig/vl.c	2010-10-21 14:39:35.000000000 +0200
-+++ qemu-kvm/vl.c	2010-10-21 14:39:45.000000000 +0200
-@@ -152,6 +152,8 @@
+--- 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 @@
  #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;
  
@@ -105,10 +105,10 @@
      /* init the dynamic translator */
      cpu_exec_init_all(tb_size * 1024 * 1024);
  
-Index: qemu-kvm/vzsyscalls.h
+Index: new/vzsyscalls.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ qemu-kvm/vzsyscalls.h	2010-10-21 14:39:45.000000000 +0200
++++ new/vzsyscalls.h	2011-02-25 06:41:23.000000000 +0100
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

Added: pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff	                        (rev 0)
+++ pve-qemu-kvm/trunk/debian/patches/fr-ca-keymap-corrections.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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/trunk/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/keymap.diff	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/keymap.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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 06:51:48.000000000 +0100
++++ new/ui/vnc.c	2011-02-25 06:58:10.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/trunk/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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 06:39:51.000000000 +0100
++++ new/arch_init.c	2011-02-25 06:59:09.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/trunk/debian/patches/series
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/series	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/series	2011-02-25 06:10:50 UTC (rev 5618)
@@ -6,3 +6,4 @@
 enable-ksm.diff
 set-max-nics.patch
 use-local-linux-kvm-h.diff
+fr-ca-keymap-corrections.diff

Modified: pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch	2011-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/set-max-nics.patch	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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 06:40:58.000000000 +0100
++++ new/net.h	2011-02-25 06:59:30.000000000 +0100
+@@ -124,7 +124,7 @@
  
  /* NIC info */
  

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-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -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 06:39:51.000000000 +0100
++++ new/kvm/libkvm/libkvm.h	2011-02-25 06:59:36.000000000 +0100
 @@ -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-02-24 14:44:29 UTC (rev 5617)
+++ pve-qemu-kvm/trunk/debian/patches/vncticket.diff	2011-02-25 06:10:50 UTC (rev 5618)
@@ -1,21 +1,21 @@
-Index: qemu-kvm/console.h
+Index: new/console.h
 ===================================================================
---- qemu-kvm.orig/console.h	2010-10-21 13:40:20.000000000 +0200
-+++ qemu-kvm/console.h	2010-10-21 14:06:21.000000000 +0200
+--- new.orig/console.h	2011-02-25 06:39:51.000000000 +0100
++++ new/console.h	2011-02-25 06:45:23.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);
 -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);
- char *vnc_display_local_addr(DisplayState *ds);
-Index: qemu-kvm/ui/vnc.c
+Index: new/ui/vnc.c
 ===================================================================
---- qemu-kvm.orig/ui/vnc.c	2010-10-21 13:40:21.000000000 +0200
-+++ qemu-kvm/ui/vnc.c	2010-10-21 14:06:21.000000000 +0200
-@@ -1790,7 +1790,7 @@
+--- new.orig/ui/vnc.c	2011-02-25 06:39:51.000000000 +0100
++++ new/ui/vnc.c	2011-02-25 06:51:48.000000000 +0100
+@@ -1794,7 +1794,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);
-@@ -1876,7 +1876,7 @@
+@@ -1880,7 +1880,7 @@
          vnc_write_u8(vs, VNC_MSG_SERVER_FRAMEBUFFER_UPDATE);
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -33,20 +33,20 @@
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_unlock_output(vs);
-@@ -2079,7 +2079,10 @@
-     int i, j, pwlen;
+@@ -2084,7 +2084,10 @@
      unsigned char key[8];
+     time_t now = time(NULL);
  
--    if (!vs->vd->password || !vs->vd->password[0]) {
+-    if (!vs->vd->password) {
 +    if (vs->vd->retries >= 0)
-+        vs->vd->retries++;
++	vs->vd->retries++;
 +
-+    if (!vs->vd->password || !vs->vd->password[0] || vs->vd->retries > 3) {
++    if (!vs->vd->password || (vs->vd->retries > 3)) {
          VNC_DEBUG("No password configured on server");
-         vnc_write_u32(vs, 1); /* Reject auth */
-         if (vs->minor >= 8) {
-@@ -2478,7 +2481,7 @@
- #endif
+         goto reject;
+     }
+@@ -2502,7 +2505,7 @@
+     return 0;
  }
  
 -int vnc_display_password(DisplayState *ds, const char *password)
@@ -54,58 +54,57 @@
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
  
-@@ -2493,6 +2496,7 @@
-     if (password && password[0]) {
-         if (!(vs->password = qemu_strdup(password)))
-             return -1;
-+	vs->retries = limit ? 0 : -1;
-         if (vs->auth == VNC_AUTH_NONE) {
-             vs->auth = VNC_AUTH_VNC;
-         }
-Index: qemu-kvm/ui/vnc.h
+@@ -2522,6 +2525,7 @@
+     }
+     vs->password = qemu_strdup(password);
+     vs->auth = VNC_AUTH_VNC;
++    vs->retries = limit ? 0 : -1;
+ 
+     return 0;
+ }
+Index: new/ui/vnc.h
 ===================================================================
---- qemu-kvm.orig/ui/vnc.h	2010-10-21 13:40:20.000000000 +0200
-+++ qemu-kvm/ui/vnc.h	2010-10-21 14:06:21.000000000 +0200
+--- new.orig/ui/vnc.h	2011-02-25 06:39:51.000000000 +0100
++++ new/ui/vnc.h	2011-02-25 06:53:06.000000000 +0100
 @@ -120,6 +120,7 @@
  
      char *display;
      char *password;
 +    int retries;
+     time_t expires;
      int auth;
      bool lossy;
- #ifdef CONFIG_VNC_TLS
-Index: qemu-kvm/monitor.c
+Index: new/monitor.c
 ===================================================================
---- qemu-kvm.orig/monitor.c	2010-10-21 13:40:21.000000000 +0200
-+++ qemu-kvm/monitor.c	2010-10-21 14:14:38.000000000 +0200
-@@ -978,7 +978,7 @@
+--- new.orig/monitor.c	2011-02-25 06:39:52.000000000 +0100
++++ new/monitor.c	2011-02-25 06:57:46.000000000 +0100
+@@ -1041,7 +1041,7 @@
+     return 0;
+ }
  
- static int change_vnc_password(const char *password)
+-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 @@
+         return 0;
+     }
+ 
 -    if (vnc_display_password(NULL, password) < 0) {
-+    if (vnc_display_password(NULL, password, 0) < 0) {
++    if (vnc_display_password(NULL, password, limit) < 0) {
          qerror_report(QERR_SET_PASSWD_FAILED);
          return -1;
      }
-@@ -986,6 +986,17 @@
-     return 0;
- }
- 
-+static int change_vnc_ticket(const char *password)
-+{
-+    if (vnc_display_password(NULL, password, 1) < 0) {
-+	qerror_report(QERR_SET_PASSWD_FAILED);
-+	return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
+@@ -1062,19 +1062,23 @@
  static void change_vnc_password_cb(Monitor *mon, const char *password,
                                     void *opaque)
  {
-@@ -996,12 +1007,16 @@
+-    change_vnc_password(password);
++    change_vnc_password(password, 0);
+     monitor_read_command(mon, 1);
+ }
+ 
  static int do_change_vnc(Monitor *mon, const char *target, const char *arg)
  {
      if (strcmp(target, "passwd") == 0 ||
@@ -118,13 +117,13 @@
              password[sizeof(password) - 1] = '\0';
 -            return change_vnc_password(password);
 +	    if (strcmp(target, "ticket") == 0)
-+		return change_vnc_ticket(password);
++		return change_vnc_password(password, 1);
 +	    else
-+		return change_vnc_password(password);
++		return change_vnc_password(password, 0);
          } else {
              return monitor_read_password(mon, change_vnc_password_cb, NULL);
          }
-@@ -3324,11 +3339,11 @@
+@@ -3978,11 +3982,11 @@
  static int is_valid_option(const char *c, const char *typestr)
  {
      char option[3];
@@ -138,7 +137,7 @@
      typestr = strstr(typestr, option);
      return (typestr != NULL);
  }
-@@ -3640,7 +3655,7 @@
+@@ -4322,7 +4326,7 @@
                      p++;
                      if(c != *p) {
                          if(!is_valid_option(p, typestr)) {



More information about the pve-devel mailing list