[pve-devel] r5283 - pve-qemu-kvm/trunk/debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-25 10:35:02 +0000 (Mon, 25 Oct 2010)
New Revision: 5283

Modified:
   pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
   pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff
   pve-qemu-kvm/trunk/debian/patches/series
Log:


Modified: pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2010-10-25 10:01:21 UTC (rev 5282)
+++ pve-qemu-kvm/trunk/debian/patches/enable-ksm.diff	2010-10-25 10:35:02 UTC (rev 5283)
@@ -1,13 +1,13 @@
 just define MADV_MERGEABLE
 ---
 
-Index: test/exec.c
+Index: qemu-new/exec.c
 ===================================================================
---- 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>
+--- 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 @@
  #endif
+ #endif
  
 +/* our libc does not define it */
 +#define MADV_MERGEABLE   12

Modified: pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2010-10-25 10:01:21 UTC (rev 5282)
+++ pve-qemu-kvm/trunk/debian/patches/live-migration-fixes.diff	2010-10-25 10:35:02 UTC (rev 5283)
@@ -1,9 +1,9 @@
-Index: test/vl.c
+Index: qemu-new/arch_init.c
 ===================================================================
---- 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)
+--- 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 @@
+ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque)
  {
      ram_addr_t addr;
 -    uint64_t bytes_transferred_last;
@@ -14,31 +14,31 @@
  
      if (stage < 0) {
          cpu_physical_memory_set_dirty_tracking(0);
-@@ -3096,10 +3097,9 @@
-         cpu_physical_memory_set_dirty_tracking(1);
+@@ -256,10 +257,10 @@
+             qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr));
+             qemu_put_be64(f, block->length);
+         }
++
++	starttime = qemu_get_clock_ns(rt_clock);
+     }
  
-         qemu_put_be64(f, last_ram_offset | RAM_SAVE_FLAG_MEM_SIZE);
--    }
- 
 -    bytes_transferred_last = bytes_transferred;
--    bwidth = get_clock();
-+	starttime = get_clock();
-+    }
+-    bwidth = qemu_get_clock_ns(rt_clock);
  
      while (!qemu_file_rate_limit(f)) {
-         int ret;
-@@ -3110,8 +3110,8 @@
-             break;
+         int bytes_sent;
+@@ -271,8 +272,8 @@
+         }
      }
  
--    bwidth = get_clock() - bwidth;
+-    bwidth = qemu_get_clock_ns(rt_clock) - bwidth;
 -    bwidth = (bytes_transferred - bytes_transferred_last) / bwidth;
-+    timediff = get_clock() - starttime;
++    timediff = qemu_get_clock_ns(rt_clock) - starttime;
 +    bwidth = bytes_transferred / timediff;
  
      /* if we haven't transferred anything this round, force expected_time to a
       * a very high value, but without crashing */
-@@ -3129,6 +3129,10 @@
+@@ -293,6 +294,10 @@
  
      qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
  

Modified: pve-qemu-kvm/trunk/debian/patches/series
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/series	2010-10-25 10:01:21 UTC (rev 5282)
+++ pve-qemu-kvm/trunk/debian/patches/series	2010-10-25 10:35:02 UTC (rev 5283)
@@ -2,6 +2,6 @@
 fairsched.diff
 vncticket.diff
 keymap.diff
-#live-migration-fixes.diff
+live-migration-fixes.diff
 enable-ksm.diff
 set-max-nics.patch