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

svn-commits at proxmox.com svn-commits at proxmox.com
Mon Aug 9 13:50:08 CEST 2010


Author: dietmar
Date: 2010-08-09 11:50:08 +0000 (Mon, 09 Aug 2010)
New Revision: 4948

Added:
   pve-qemu-kvm/pve2/debian/roms/
Modified:
   pve-qemu-kvm/pve2/
   pve-qemu-kvm/pve2/Makefile
   pve-qemu-kvm/pve2/debian/changelog
   pve-qemu-kvm/pve2/debian/patches/adjust-path.diff
   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/series
   pve-qemu-kvm/pve2/debian/patches/vncticket.diff
   pve-qemu-kvm/pve2/debian/rules
Log:
merger trunk



Property changes on: pve-qemu-kvm/pve2
___________________________________________________________________
Added: svn:mergeinfo
   + /pve-qemu-kvm/trunk:4664-4947

Modified: pve-qemu-kvm/pve2/Makefile
===================================================================
--- pve-qemu-kvm/pve2/Makefile	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/Makefile	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,8 +1,8 @@
-RELEASE=1.5
+RELEASE=2.0
 
 # also update debian/changelog
-KVMVER=0.11.1
-KVMPKGREL=2
+KVMVER=0.12.5
+KVMPKGREL=1
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm
@@ -51,4 +51,4 @@
 
 .PHONY: clean
 clean:
-	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_*
\ No newline at end of file
+	rm -rf *~ ${KVMDIR} ${KVMPACKAGE}_*

Modified: pve-qemu-kvm/pve2/debian/changelog
===================================================================
--- pve-qemu-kvm/pve2/debian/changelog	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/changelog	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,3 +1,27 @@
+pve-qemu-kvm (0.12.5-1) unstable; urgency=low
+
+  * update to qemu-kvm-0.12.5
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 05 Aug 2010 11:01:56 +0200
+
+pve-qemu-kvm (0.12.4-1) unstable; urgency=low
+
+  * update to qemu-kvm-0.12.4
+
+ -- Proxmox Support Team <support at proxmox.com>  Tue, 11 May 2010 08:14:29 +0200
+
+pve-qemu-kvm (0.12.3-1) unstable; urgency=low
+
+  * update to qemu-kvm-0.12.3
+  
+  * include gPXE 1.0 network boot
+  
+  * remove multicore.diff patch
+  
+  * do not install ppc and sparc bios files
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 14 Apr 2010 13:30:23 +0200
+
 pve-qemu-kvm (0.11.1-2) unstable; urgency=low
 
   * Use/Include PXE boot ROMs from the Etherboot package

Modified: pve-qemu-kvm/pve2/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/adjust-path.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/adjust-path.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,8 +1,8 @@
-Index: kvm-86/configure
+Index: test/configure
 ===================================================================
---- kvm-86.orig/configure	2009-05-22 09:47:55.000000000 +0200
-+++ kvm-86/configure	2009-05-22 09:48:26.000000000 +0200
-@@ -1393,8 +1393,8 @@
+--- test.orig/configure	2010-05-11 08:18:56.000000000 +0200
++++ test/configure	2010-05-11 08:18:58.000000000 +0200
+@@ -1975,8 +1975,8 @@
        prefix="/usr/local"
    fi
    mansuffix="/share/man"
@@ -13,13 +13,13 @@
    binsuffix="/bin"
  fi
  
-Index: kvm-86/net.h
+Index: test/net.h
 ===================================================================
---- kvm-86.orig/net.h	2009-05-22 09:47:48.000000000 +0200
-+++ kvm-86/net.h	2009-05-22 09:48:26.000000000 +0200
-@@ -124,8 +124,8 @@
- void net_host_device_add(Monitor *mon, const char *device, const char *opts);
- void net_host_device_remove(Monitor *mon, int vlan_id, const char *device);
+--- test.orig/net.h	2010-05-11 08:18:56.000000000 +0200
++++ test/net.h	2010-05-11 08:18:58.000000000 +0200
+@@ -166,8 +166,8 @@
+ void net_host_device_add(Monitor *mon, const QDict *qdict);
+ void net_host_device_remove(Monitor *mon, const QDict *qdict);
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"

Modified: pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/enable-ksm.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,26 +1,10 @@
-From: Izik Eidus <ieidus at redhat.com>
-Date: Thu, 8 Oct 2009 14:39:39 +0000 (+0200)
-Subject: ksm support
-X-Git-Url: http://git.kernel.org/?p=virt%2Fkvm%2Fqemu-kvm.git;a=commitdiff_plain;h=ccb167e9d7d460a7cd09fdabd848efd3606dd27e
-
-ksm support
-
-patch is slighly modified by <support at proxmox.com> for old libc 
-
-Call MADV_MERGEABLE on guest memory allocations.  MADV_MERGABLE will be
-available starting in Linux 2.6.32.  This system call registers a region of
-virtual address space with Linux as a candidate for transparent memory
-sharing.
-
-Patchworks-ID: 35447
-Signed-off-by: Izik Eidus <ieidus at redhat.com>
-Signed-off-by: Anthony Liguori <aliguori at us.ibm.com>
+just define MADV_MERGEABLE
 ---
 
-Index: qemu-kvm/exec.c
+Index: test/exec.c
 ===================================================================
---- qemu-kvm.orig/exec.c	2009-12-14 15:58:59.000000000 +0100
-+++ qemu-kvm/exec.c	2009-12-14 16:26:21.000000000 +0100
+--- test.orig/exec.c	2010-04-14 12:55:22.000000000 +0200
++++ test/exec.c	2010-04-14 13:24:23.000000000 +0200
 @@ -48,6 +48,9 @@
  #include <qemu.h>
  #endif
@@ -31,13 +15,3 @@
  //#define DEBUG_TB_INVALIDATE
  //#define DEBUG_FLUSH
  //#define DEBUG_TLB
-@@ -2579,6 +2582,9 @@
-     new_block->host = file_ram_alloc(size, mem_path);
-     if (!new_block->host) {
-         new_block->host = qemu_vmalloc(size);
-+#ifdef MADV_MERGEABLE
-+         madvise(new_block->host, size, MADV_MERGEABLE);
-+#endif
-     }
-     new_block->offset = last_ram_offset;
-     new_block->length = size;

Modified: pve-qemu-kvm/pve2/debian/patches/fairsched.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/fairsched.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,8 +1,8 @@
-Index: kvm-86/qemu-options.hx
+Index: test/qemu-options.hx
 ===================================================================
---- kvm-86.orig/qemu-options.hx	2009-05-22 09:49:54.000000000 +0200
-+++ kvm-86/qemu-options.hx	2009-05-22 09:50:50.000000000 +0200
-@@ -55,6 +55,12 @@
+--- test.orig/qemu-options.hx	2010-05-11 08:15:36.000000000 +0200
++++ test/qemu-options.hx	2010-05-11 08:17:02.000000000 +0200
+@@ -66,6 +66,12 @@
  are split equally.
  ETEXI
  
@@ -15,44 +15,44 @@
  DEF("fda", HAS_ARG, QEMU_OPTION_fda,
      "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n")
  DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "")
-Index: kvm-86/vl.c
+Index: test/vl.c
 ===================================================================
---- kvm-86.orig/vl.c	2009-05-22 09:50:00.000000000 +0200
-+++ kvm-86/vl.c	2009-05-22 09:58:56.000000000 +0200
+--- test.orig/vl.c	2010-05-11 08:15:37.000000000 +0200
++++ test/vl.c	2010-05-11 08:18:10.000000000 +0200
 @@ -159,6 +159,7 @@
- #include "balloon.h"
+ #include "qemu-objects.h"
  #include "qemu-kvm.h"
  #include "hw/device-assignment.h"
 +#include "vzsyscalls.h"
  
  #include "disas.h"
  
-@@ -248,6 +249,7 @@
+@@ -220,6 +221,7 @@
+ int singlestep = 0;
  const char *assigned_devices[MAX_DEV_ASSIGN_CMDLINE];
  int assigned_devices_index;
++int fairsched_id = 0;
  int smp_cpus = 1;
-+int fairsched_id = 0;
- const char *vnc_display;
- int acpi_enabled = 1;
- int no_hpet = 0;
-@@ -559,7 +561,7 @@
-     va_end(ap);
-     abort();
+ int max_cpus = 0;
+ int smp_cores = 1;
+@@ -363,7 +365,7 @@
+     prctl(PR_SET_NAME, name);
+ #endif    	
  }
 - 
 +
  /***************/
  /* ballooning */
  
-@@ -4953,6 +4955,7 @@
+@@ -4911,6 +4913,7 @@
      const char *gdbstub_dev = NULL;
      uint32_t boot_devices_bitmap = 0;
      int i;
 +    int cpuunits = 0;
-     int snapshot, linux_boot, net_boot;
+     int snapshot, linux_boot;
      const char *initrd_filename;
      const char *kernel_filename, *kernel_cmdline;
-@@ -5604,6 +5607,20 @@
+@@ -5573,6 +5576,20 @@
                      exit(1);
                  }
                  break;
@@ -71,11 +71,11 @@
 +                }
 +                break;
  	    case QEMU_OPTION_vnc:
+                 display_type = DT_VNC;
  		vnc_display = optarg;
- 		break;
 @@ -5973,6 +5990,39 @@
-     }
- #endif
+     if (ram_size == 0)
+         ram_size = DEFAULT_RAM_SIZE * 1024 * 1024;
  
 +    if (cpuunits && !fairsched_id) {
 +      fprintf(stderr, "cpuunits specified without -id");
@@ -113,10 +113,10 @@
      /* init the dynamic translator */
      cpu_exec_init_all(tb_size * 1024 * 1024);
  
-Index: kvm-86/vzsyscalls.h
+Index: test/vzsyscalls.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kvm-86/vzsyscalls.h	2009-05-22 09:50:50.000000000 +0200
++++ test/vzsyscalls.h	2010-05-11 08:17:02.000000000 +0200
 @@ -0,0 +1,47 @@
 +/*
 + *  Copyright (C) 2000-2008, Parallels, Inc. All rights reserved.

Modified: pve-qemu-kvm/pve2/debian/patches/keymap.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/keymap.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/keymap.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,7 +1,7 @@
-Index: kvm-86/curses.c
+Index: test/curses.c
 ===================================================================
---- kvm-86.orig/curses.c	2009-05-22 10:09:19.000000000 +0200
-+++ kvm-86/curses.c	2009-05-22 10:10:38.000000000 +0200
+--- test.orig/curses.c	2010-05-11 08:15:36.000000000 +0200
++++ test/curses.c	2010-05-11 08:18:37.000000000 +0200
 @@ -238,7 +238,11 @@
                  keysym = chr;
  
@@ -15,18 +15,18 @@
          }
  
          if (is_graphic_console()) {
-Index: kvm-86/keymaps.c
+Index: test/keymaps.c
 ===================================================================
---- kvm-86.orig/keymaps.c	2009-05-22 10:09:24.000000000 +0200
-+++ kvm-86/keymaps.c	2009-05-22 10:10:38.000000000 +0200
+--- test.orig/keymaps.c	2010-05-11 08:15:36.000000000 +0200
++++ test/keymaps.c	2010-05-11 08:18:37.000000000 +0200
 @@ -67,6 +67,7 @@
-     char file_name[1024];
+     char * filename;
      char line[1024];
      int len;
 +    int upper;
  
-     snprintf(file_name, sizeof(file_name),
-              "%s/keymaps/%s", bios_dir, language);
+     filename = qemu_find_file(QEMU_FILE_TYPE_KEYMAP, language);
+ 
 @@ -97,25 +98,66 @@
  	    if (*end_of_keysym) {
  		int keysym;
@@ -151,10 +151,10 @@
  }
  
  int keycode_is_keypad(void *kbd_layout, int keycode)
-Index: kvm-86/keymaps.h
+Index: test/keymaps.h
 ===================================================================
---- kvm-86.orig/keymaps.h	2009-05-22 10:09:32.000000000 +0200
-+++ kvm-86/keymaps.h	2009-05-22 10:10:38.000000000 +0200
+--- test.orig/keymaps.h	2010-05-11 08:15:36.000000000 +0200
++++ test/keymaps.h	2010-05-11 08:18:37.000000000 +0200
 @@ -38,13 +38,26 @@
      struct key_range *next;
  };
@@ -193,11 +193,11 @@
  int keycode_is_keypad(void *kbd_layout, int keycode);
  int keysym_is_numlock(void *kbd_layout, int keysym);
  
-Index: kvm-86/sdl.c
+Index: test/sdl.c
 ===================================================================
---- kvm-86.orig/sdl.c	2009-05-22 10:09:43.000000000 +0200
-+++ kvm-86/sdl.c	2009-05-22 10:10:38.000000000 +0200
-@@ -214,7 +214,11 @@
+--- test.orig/sdl.c	2010-05-11 08:15:36.000000000 +0200
++++ test/sdl.c	2010-05-11 08:18:37.000000000 +0200
+@@ -248,7 +248,11 @@
      if (keysym == 92 && ev->keysym.scancode == 133) {
          keysym = 0xa5;
      }
@@ -210,11 +210,11 @@
  }
  
  /* specific keyboard conversions from scan codes */
-Index: kvm-86/vnc.c
+Index: test/vnc.c
 ===================================================================
---- kvm-86.orig/vnc.c	2009-05-22 10:09:54.000000000 +0200
-+++ kvm-86/vnc.c	2009-05-22 10:10:38.000000000 +0200
-@@ -1257,27 +1257,85 @@
+--- test.orig/vnc.c	2010-05-11 08:18:27.000000000 +0200
++++ test/vnc.c	2010-05-11 08:18:37.000000000 +0200
+@@ -1443,27 +1443,85 @@
      check_pointer_type_change(vs, kbd_mouse_is_absolute());
  }
  
@@ -308,7 +308,7 @@
      /* QEMU console switch */
      switch(keycode) {
      case 0x2a:                          /* Left Shift */
-@@ -1286,23 +1344,24 @@
+@@ -1472,23 +1530,24 @@
      case 0x9d:                          /* Right CTRL */
      case 0x38:                          /* Left ALT */
      case 0xb8:                          /* Right ALT */
@@ -343,26 +343,48 @@
          break;
      }
  
-@@ -1312,25 +1371,42 @@
+@@ -1498,14 +1557,14 @@
             toggles numlock away from the VNC window.
          */
          if (keysym_is_numlock(vs->vd->kbd_layout, sym & 0xFFFF)) {
 -            if (!vs->modifiers_state[0x45]) {
 -                vs->modifiers_state[0x45] = 1;
-+	    if (!vs->modifiers_state[0][0x45]) {
-+	        do_modifier(vs, 0x45, 1, 0);
++ 	    if (!vs->modifiers_state[0][0x45]) {
++ 	        do_modifier(vs, 0x45, 1, 0);
                  press_key(vs, 0xff7f);
              }
          } else {
 -            if (vs->modifiers_state[0x45]) {
 -                vs->modifiers_state[0x45] = 0;
 -                press_key(vs, 0xff7f);
-+            if (vs->modifiers_state[0][0x45]) {
-+	        do_modifier(vs, 0x45, 0, 0);
-+		press_key(vs, 0xff7f);
++             if (vs->modifiers_state[0][0x45]) {
++ 	        do_modifier(vs, 0x45, 0, 0);
++ 		press_key(vs, 0xff7f);
              }
          }
      }
+@@ -1516,28 +1575,45 @@
+            toggles capslock away from the VNC window.
+         */
+         int uppercase = !!(sym >= 'A' && sym <= 'Z');
+-        int shift = !!(vs->modifiers_state[0x2a] | vs->modifiers_state[0x36]);
+-        int capslock = !!(vs->modifiers_state[0x3a]);
++        int shift = !!(vs->modifiers_state[0][0x2a] | vs->modifiers_state[0][0x36]);
++        int capslock = !!(vs->modifiers_state[0][0x3a]);
+         if (capslock) {
+             if (uppercase == shift) {
+-                vs->modifiers_state[0x3a] = 0;
++ 	        do_modifier(vs, 0x3a, 0, 0);
+                 press_key(vs, 0xffe5);
+             }
+         } else {
+             if (uppercase != shift) {
+-                vs->modifiers_state[0x3a] = 1;
++ 	        do_modifier(vs, 0x3a, 1, 0);
+                 press_key(vs, 0xffe5);
+             }
+         }
+     }
  
      if (is_graphic_console()) {
 -        if (keycode & 0x80)
@@ -371,49 +393,51 @@
 -            kbd_put_keycode(keycode & 0x7f);
 -        else
 -            kbd_put_keycode(keycode | 0x80);
-+        if (down) {
-+	    /* Send deadkey */
-+	    if (kd->keymod & KEYMOD_DEAD) {
-+	      keydata_t *deaddata;
-+	      deaddata = find_keysym(vs->vd->kbd_layout, kd->deadsym);
-+	      if (deaddata != NULL) {
-+                set_modifiers(vs, deaddata->keymod, 0, 1);
-+                do_keycode(deaddata->keycode, 1);
-+                do_keycode(deaddata->keycode, 0);
-+                restore_modifiers(vs);
-+	      }
-+	    }
-+	    set_modifiers(vs, kd->keymod, 1, 0);
-+	} else
-+	    restore_modifiers(vs);
++         if (down) {
++ 	    /* Send deadkey */
++ 	    if (kd->keymod & KEYMOD_DEAD) {
++ 	      keydata_t *deaddata;
++ 	      deaddata = find_keysym(vs->vd->kbd_layout, kd->deadsym);
++ 	      if (deaddata != NULL) {
++                 set_modifiers(vs, deaddata->keymod, 0, 1);
++                 do_keycode(deaddata->keycode, 1);
++                 do_keycode(deaddata->keycode, 0);
++                 restore_modifiers(vs);
++ 	      }
++ 	    }
++ 	    set_modifiers(vs, kd->keymod, 1, 0);
++ 	} else
++ 	    restore_modifiers(vs);
 +
-+        do_keycode (keycode, down);
++         do_keycode (keycode, down);
 +
-+	/* vnc never sends ALTGR, so we create an artificial up event */
-+	if (down && (kd->keymod & KEYMOD_ALTGR)) {
-+	    set_modifiers(vs, kd->keymod, 0, 0);
-+	}
++ 	/* vnc never sends ALTGR, so we create an artificial up event */
++ 	if (down && (kd->keymod & KEYMOD_ALTGR)) {
++ 	    set_modifiers(vs, kd->keymod, 0, 0);
++ 	}
 +
      } else {
          /* QEMU console emulation */
          if (down) {
-@@ -1388,13 +1464,9 @@
+@@ -1638,15 +1714,9 @@
  
  static void key_event(VncState *vs, int down, uint32_t sym)
  {
 -    int keycode;
+-    int lsym = sym;
++     keydata_t *kd = find_keysym(vs->vd->kbd_layout, sym & 0xFFFF);
+ 
+-    if (lsym >= 'A' && lsym <= 'Z' && is_graphic_console()) {
+-        lsym = lsym - 'A' + 'a';
+-    }
 -
--    if (sym >= 'A' && sym <= 'Z' && is_graphic_console())
--        sym = sym - 'A' + 'a';
-+    keydata_t *kd = find_keysym(vs->vd->kbd_layout, sym & 0xFFFF);
- 
--    keycode = keysym2scancode(vs->vd->kbd_layout, sym & 0xFFFF);
+-    keycode = keysym2scancode(vs->vd->kbd_layout, lsym & 0xFFFF);
 -    do_key_event(vs, down, keycode, sym);
-+    do_key_event(vs, down, kd, sym & 0xFFFF);
++     do_key_event(vs, down, kd, sym & 0xFFFF);
  }
  
  static void ext_key_event(VncState *vs, int down,
-@@ -1403,8 +1475,15 @@
+@@ -1655,8 +1725,15 @@
      /* if the user specifies a keyboard layout, always use it */
      if (keyboard_layout)
          key_event(vs, down, sym);
@@ -431,10 +455,19 @@
  }
  
  static void framebuffer_update_request(VncState *vs, int incremental,
-Index: kvm-86/vnc.h
+@@ -2478,7 +2555,7 @@
+ char *vnc_display_local_addr(DisplayState *ds)
+ {
+     VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
+-    
++
+     return vnc_socket_local_addr("%s:%s", vs->lsock);
+ }
+ 
+Index: test/vnc.h
 ===================================================================
---- kvm-86.orig/vnc.h	2009-05-22 10:10:08.000000000 +0200
-+++ kvm-86/vnc.h	2009-05-22 10:10:38.000000000 +0200
+--- test.orig/vnc.h	2010-05-11 08:18:27.000000000 +0200
++++ test/vnc.h	2010-05-11 08:18:37.000000000 +0200
 @@ -49,6 +49,21 @@
   *
   *****************************************************************************/
@@ -457,7 +490,7 @@
  typedef struct Buffer
  {
      size_t capacity;
-@@ -156,7 +171,7 @@
+@@ -158,7 +173,7 @@
      VncReadEvent *read_handler;
      size_t read_handler_expect;
      /* input */

Modified: pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/live-migration-fixes.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,9 +1,9 @@
-Index: qemu-kvm/vl.c
+Index: test/vl.c
 ===================================================================
---- qemu-kvm.orig/vl.c	2009-09-30 10:35:45.000000000 +0200
-+++ qemu-kvm/vl.c	2009-09-30 10:47:05.000000000 +0200
-@@ -3175,9 +3175,10 @@
- static int ram_save_live(QEMUFile *f, int stage, void *opaque)
+--- test.orig/vl.c	2010-04-14 12:58:55.000000000 +0200
++++ test/vl.c	2010-04-14 13:24:03.000000000 +0200
+@@ -3069,9 +3069,10 @@
+ static int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
  {
      ram_addr_t addr;
 -    uint64_t bytes_transferred_last;
@@ -12,9 +12,9 @@
 +    static int64_t starttime = 0;
 +    double timediff;
  
-     if (cpu_physical_sync_dirty_bitmap(0, TARGET_PHYS_ADDR_MAX) != 0) {
-         qemu_file_set_error(f);
-@@ -3195,10 +3196,9 @@
+     if (stage < 0) {
+         cpu_physical_memory_set_dirty_tracking(0);
+@@ -3096,10 +3097,9 @@
          cpu_physical_memory_set_dirty_tracking(1);
  
          qemu_put_be64(f, last_ram_offset | RAM_SAVE_FLAG_MEM_SIZE);
@@ -27,7 +27,7 @@
  
      while (!qemu_file_rate_limit(f)) {
          int ret;
-@@ -3209,8 +3209,8 @@
+@@ -3110,8 +3110,8 @@
              break;
      }
  
@@ -38,7 +38,7 @@
  
      /* if we haven't transferred anything this round, force expected_time to a
       * a very high value, but without crashing */
-@@ -3230,6 +3230,10 @@
+@@ -3129,6 +3129,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

Modified: pve-qemu-kvm/pve2/debian/patches/series
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/series	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/series	2010-08-09 11:50:08 UTC (rev 4948)
@@ -2,6 +2,5 @@
 fairsched.diff
 vncticket.diff
 keymap.diff
-multicore.diff
 live-migration-fixes.diff
 enable-ksm.diff

Modified: pve-qemu-kvm/pve2/debian/patches/vncticket.diff
===================================================================
--- pve-qemu-kvm/pve2/debian/patches/vncticket.diff	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/patches/vncticket.diff	2010-08-09 11:50:08 UTC (rev 4948)
@@ -1,71 +1,21 @@
-Index: kvm-86/console.h
+Index: test/console.h
 ===================================================================
---- kvm-86.orig/console.h	2009-09-24 14:19:14.000000000 +0200
-+++ kvm-86/console.h	2009-09-24 14:33:18.000000000 +0200
-@@ -320,7 +320,7 @@
+--- test.orig/console.h	2010-05-11 08:15:36.000000000 +0200
++++ test/console.h	2010-05-11 08:18:27.000000000 +0200
+@@ -322,7 +322,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);
- void do_info_vnc(Monitor *mon);
+ 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: kvm-86/monitor.c
+Index: test/vnc.c
 ===================================================================
---- kvm-86.orig/monitor.c	2009-09-24 14:19:14.000000000 +0200
-+++ kvm-86/monitor.c	2009-09-24 14:33:18.000000000 +0200
-@@ -500,7 +500,16 @@
- static void change_vnc_password_cb(Monitor *mon, const char *password,
-                                    void *opaque)
- {
--    if (vnc_display_password(NULL, password) < 0)
-+    if (vnc_display_password(NULL, password, 0) < 0)
-+        monitor_printf(mon, "could not set VNC server password\n");
-+
-+    monitor_read_command(mon, 1);
-+}
-+
-+static void change_vnc_ticket_cb(Monitor *mon, const char *password,
-+				 void *opaque)
-+{
-+    if (vnc_display_password(NULL, password, 1) < 0)
-         monitor_printf(mon, "could not set VNC server password\n");
- 
-     monitor_read_command(mon, 1);
-@@ -509,12 +518,16 @@
- static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
- {
-     if (strcmp(target, "passwd") == 0 ||
--        strcmp(target, "password") == 0) {
-+	       strcmp(target, "password") == 0 ||
-+	       strcmp(target, "ticket") == 0) {
-         if (arg) {
-             char password[9];
-             strncpy(password, arg, sizeof(password));
-             password[sizeof(password) - 1] = '\0';
--            change_vnc_password_cb(mon, password, NULL);
-+	    if (strcmp(target, "ticket") == 0)
-+	      change_vnc_ticket_cb(mon, password, NULL);
-+	    else 
-+	      change_vnc_password_cb(mon, password, NULL);
-         } else {
-             monitor_read_password(mon, change_vnc_password_cb, NULL);
-         }
-@@ -897,7 +910,7 @@
-     FILE *f;
-     uint32_t l;
-     uint8_t buf[1024];
--    target_phys_addr_t addr = GET_TPHYSADDR(valh, vall); 
-+    target_phys_addr_t addr = GET_TPHYSADDR(valh, vall);
- 
-     f = fopen(filename, "wb");
-     if (!f) {
-Index: kvm-86/vnc.c
-===================================================================
---- kvm-86.orig/vnc.c	2009-09-24 14:19:14.000000000 +0200
-+++ kvm-86/vnc.c	2009-09-24 14:33:55.000000000 +0200
-@@ -1607,7 +1607,7 @@
+--- test.orig/vnc.c	2010-05-11 08:15:37.000000000 +0200
++++ test/vnc.c	2010-05-11 08:18:27.000000000 +0200
+@@ -1765,7 +1765,7 @@
  static void set_pixel_conversion(VncState *vs)
  {
      if ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) ==
@@ -74,7 +24,7 @@
          !memcmp(&(vs->clientds.pf), &(vs->ds->surface->pf), sizeof(PixelFormat))) {
          vs->write_pixels = vnc_write_pixels_copy;
          switch (vs->ds->surface->pf.bits_per_pixel) {
-@@ -1715,7 +1715,7 @@
+@@ -1873,7 +1873,7 @@
          vnc_write_u8(vs, 0);  /* msg id */
          vnc_write_u8(vs, 0);
          vnc_write_u16(vs, 1); /* number of rects */
@@ -83,7 +33,7 @@
                                 ds_get_height(vs->ds), VNC_ENCODING_WMVi);
          pixel_format_message(vs);
          vnc_flush(vs);
-@@ -1905,7 +1905,10 @@
+@@ -2070,7 +2070,10 @@
      int i, j, pwlen;
      unsigned char key[8];
  
@@ -95,7 +45,7 @@
          VNC_DEBUG("No password configured on server");
          vnc_write_u32(vs, 1); /* Reject auth */
          if (vs->minor >= 8) {
-@@ -2178,7 +2181,7 @@
+@@ -2446,7 +2449,7 @@
  #endif
  }
  
@@ -104,7 +54,7 @@
  {
      VncDisplay *vs = ds ? (VncDisplay *)ds->opaque : vnc_display;
  
-@@ -2193,6 +2196,7 @@
+@@ -2461,6 +2464,7 @@
      if (password && password[0]) {
          if (!(vs->password = qemu_strdup(password)))
              return -1;
@@ -112,11 +62,11 @@
          if (vs->auth == VNC_AUTH_NONE) {
              vs->auth = VNC_AUTH_VNC;
          }
-Index: kvm-86/vnc.h
+Index: test/vnc.h
 ===================================================================
---- kvm-86.orig/vnc.h	2009-09-24 14:19:14.000000000 +0200
-+++ kvm-86/vnc.h	2009-09-24 14:33:18.000000000 +0200
-@@ -94,6 +94,7 @@
+--- test.orig/vnc.h	2010-05-11 08:15:37.000000000 +0200
++++ test/vnc.h	2010-05-11 08:18:27.000000000 +0200
+@@ -104,6 +104,7 @@
  
      char *display;
      char *password;
@@ -124,3 +74,69 @@
      int auth;
  #ifdef CONFIG_VNC_TLS
      int subauth; /* Used by VeNCrypt */
+Index: test/monitor.c
+===================================================================
+--- test.orig/monitor.c	2010-05-11 08:15:36.000000000 +0200
++++ test/monitor.c	2010-05-11 08:18:27.000000000 +0200
+@@ -951,11 +951,17 @@
+ 
+ static void change_vnc_password(const char *password)
+ {
+-    if (vnc_display_password(NULL, password) < 0)
++	if (vnc_display_password(NULL, password, 0) < 0)
+         qemu_error_new(QERR_SET_PASSWD_FAILED);
+ 
+ }
+ 
++static void change_vnc_ticket(const char *password)
++{
++	if (vnc_display_password(NULL, password, 1) < 0)
++        qemu_error_new(QERR_SET_PASSWD_FAILED);
++}
++
+ static void change_vnc_password_cb(Monitor *mon, const char *password,
+                                    void *opaque)
+ {
+@@ -966,12 +972,18 @@
+ static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
+ {
+     if (strcmp(target, "passwd") == 0 ||
+-        strcmp(target, "password") == 0) {
++        strcmp(target, "password") == 0 ||
++	strcmp(target, "ticket") == 0) {
+         if (arg) {
+             char password[9];
+             strncpy(password, arg, sizeof(password));
+             password[sizeof(password) - 1] = '\0';
+             change_vnc_password(password);
++ 	    if (strcmp(target, "ticket") == 0)
++ 	      change_vnc_ticket(password);
++ 	    else
++ 	      change_vnc_password(password);
++
+         } else {
+             monitor_read_password(mon, change_vnc_password_cb, NULL);
+         }
+@@ -3360,11 +3372,11 @@
+ static int is_valid_option(const char *c, const char *typestr)
+ {
+     char option[3];
+-  
++
+     option[0] = '-';
+     option[1] = *c;
+     option[2] = '\0';
+-  
++
+     typestr = strstr(typestr, option);
+     return (typestr != NULL);
+ }
+@@ -3586,7 +3598,7 @@
+                     p++;
+                     if(c != *p) {
+                         if(!is_valid_option(p, typestr)) {
+-                  
++
+                             monitor_printf(mon, "%s: unsupported option -%c\n",
+                                            cmdname, *p);
+                             goto fail;

Modified: pve-qemu-kvm/pve2/debian/rules
===================================================================
--- pve-qemu-kvm/pve2/debian/rules	2010-08-09 10:13:00 UTC (rev 4947)
+++ pve-qemu-kvm/pve2/debian/rules	2010-08-09 11:50:08 UTC (rev 4948)
@@ -89,17 +89,15 @@
 	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
 
-	# install etherboot pxe bios image
-	ebdir=/usr/lib/etherboot; \
-	tbdir=$(CURDIR)/debian/$(PACKAGE)/usr/share/kvm; \
-	rm $$tbdir/pxe-*.bin; \
-	cp -p $$ebdir/e1000-82540em.zrom.gz $$tbdir/pxe-e1000.bin.gz; \
-	cp -p $$ebdir/rtl8029.zrom.gz $$tbdir/pxe-ne2k_pci.bin.gz; \
-	cp -p $$ebdir/pcnet32.zrom.gz $$tbdir/pxe-pcnet.bin.gz; \
-	cp -p $$ebdir/rtl8139.zrom.gz $$tbdir/pxe-rtl8139.bin.gz; \
-	cp -p $$ebdir/virtio-net.zrom.gz $$tbdir/pxe-virtio.bin.gz; \
-	gzip -d $$tbdir/pxe-*.bin.gz 
+	# install gPXE bios image
+	rm $(destdir)/usr/share/kvm/pxe-*.bin;
+	install -m0644 debian/roms/*.bin $(destdir)/usr/share/kvm
 
+	# rm ppc files
+	rm $(destdir)/usr/share/kvm/*.dtb
+	# rm openbios ppc and sparc
+	rm $(destdir)/usr/share/kvm/openbios-*
+
 	# Remove things we don't package at all, would be a "kvm-dev" package
 	rm -Rf $(destdir)/usr/include/linux/
 	rm -Rf $(destdir)/usr/include



More information about the pve-devel mailing list