updates for qemu 1.3.0 rc2

diff --git a/Makefile b/Makefile
index d80c693f8a5453d20078b61fd1e875bdcf35e7aa..21f76ed5764e5826d3a7cd00f18701cef3a7d4a5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.2
 
 # also update debian/changelog
 KVMVER=1.3
-KVMPKGREL=3
+KVMPKGREL=4
 
 KVMPACKAGE=pve-qemu-kvm
 KVMDIR=qemu-kvm

diff --git a/debian/changelog b/debian/changelog
index 3dae135c1c303edeea6b3c99a7e437c338ff4d98..2c683b5334e4b4f30813f73a8b3e5d9771ff7472 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pve-qemu-kvm (1.3-4) unstable; urgency=low
+
+  * update to  qemu 1.3 rc2 (bios update, fix lsi bug)
+  
+  * rm stream-fix-ratelimit_set_speed.patch (upstream)
+  
+  * update qemu backup patches
+
+ -- Proxmox Support Team <support@proxmox.com>  Mon, 03 Dec 2012 06:32:00 +0100
+
 pve-qemu-kvm (1.3-3) unstable; urgency=low
 
   * include qemu backup patches

diff --git a/debian/patches/0001-RFC-Efficient-VM-backup-for-qemu.patch b/debian/patches/0001-RFC-Efficient-VM-backup-for-qemu.patch
index 9c43b6c2679cf0479e442b9172b3c4855e1e248a..d27efe0deadccefecd9b755f3947fe0f81868baf 100644 (file)
--- a/debian/patches/0001-RFC-Efficient-VM-backup-for-qemu.patch
+++ b/debian/patches/0001-RFC-Efficient-VM-backup-for-qemu.patch
@@ -1,4 +1,4 @@
-From 0177b535961d9e46420d474091b6dedbf7ee11a3 Mon Sep 17 00:00:00 2001
+From 491d4eb9d078b68616205c0c89de9909df990014 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 09:24:50 +0100
 Subject: [PATCH v3 1/6] RFC: Efficient VM backup for qemu

diff --git a/debian/patches/0002-add-basic-backup-support-to-block-driver.patch b/debian/patches/0002-add-basic-backup-support-to-block-driver.patch
index 54b42f9063bf587cadbd746b9d719bbea6d6cb8c..152eb0f2315788868389c6778ab31a4063dba6fb 100644 (file)
--- a/debian/patches/0002-add-basic-backup-support-to-block-driver.patch
+++ b/debian/patches/0002-add-basic-backup-support-to-block-driver.patch
@@ -1,4 +1,4 @@
-From 4a8d3de07ce2989390f2b0a42a81884d3300d516 Mon Sep 17 00:00:00 2001
+From 7ec08213d1b7c9de3b83016db81efd8337838ad2 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 10:03:52 +0100
 Subject: [PATCH v3 2/6] add basic backup support to block driver

diff --git a/debian/patches/0003-add-backup-related-monitor-commands.patch b/debian/patches/0003-add-backup-related-monitor-commands.patch
index da02d31f268aced67f91b4ed6086c6593a8cddb5..3d4724f3dd58346ca285c2f69a0184a617ea1f3f 100644 (file)
--- a/debian/patches/0003-add-backup-related-monitor-commands.patch
+++ b/debian/patches/0003-add-backup-related-monitor-commands.patch
@@ -1,4 +1,4 @@
-From 5583ec7185e67b11681cead13e59d8ae3319748f Mon Sep 17 00:00:00 2001
+From 6e030cd398065d17ab01fe7b2a3e655c5e5f19eb Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 11:27:56 +0100
 Subject: [PATCH v3 3/6] add backup related monitor commands

diff --git a/debian/patches/0004-introduce-new-vma-archive-format.patch b/debian/patches/0004-introduce-new-vma-archive-format.patch
index 1c9c0128b9c4935d8977c973afb5cb80d6dc9224..477c43a83229527f22507f99a4dcd781b80f9734 100644 (file)
--- a/debian/patches/0004-introduce-new-vma-archive-format.patch
+++ b/debian/patches/0004-introduce-new-vma-archive-format.patch
@@ -1,4 +1,4 @@
-From ff878b16c010752dd46a474329d523cded78a004 Mon Sep 17 00:00:00 2001
+From 07c102f539d0ee90afbd695cdb1a8955a141d8c1 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Tue, 13 Nov 2012 11:11:38 +0100
 Subject: [PATCH v3 4/6] introduce new vma archive format

diff --git a/debian/patches/0005-add-regression-tests-for-backup.patch b/debian/patches/0005-add-regression-tests-for-backup.patch
index 4bc9cf3021fe3c7bd019c4ee3c14681c0f10bd08..341a815546b9e2f56052dc4ce2af88195852b8be 100644 (file)
--- a/debian/patches/0005-add-regression-tests-for-backup.patch
+++ b/debian/patches/0005-add-regression-tests-for-backup.patch
@@ -1,31 +1,17 @@
-From d22192dbb5515b4bf0bf2ceed7d16cf6a18769f9 Mon Sep 17 00:00:00 2001
+From 2a7c5bdf32295a97fdfe63783fcdc846c92e50a9 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Wed, 14 Nov 2012 09:57:04 +0100
 Subject: [PATCH v3 5/6] add regression tests for backup
 
-Also added the ratelimit.h fix here, because it is still not upstream.
+Simple regression tests using vma-reader and vma-writer.
 
 Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 ---
- include/qemu/ratelimit.h |    2 +-
- tests/Makefile           |   11 +-
- tests/backup-test.c      |  511 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 521 insertions(+), 3 deletions(-)
+ tests/Makefile      |   11 +-
+ tests/backup-test.c |  511 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 520 insertions(+), 2 deletions(-)
  create mode 100644 tests/backup-test.c
 
-diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
-index c6ac281..d1610f1 100644
---- a/include/qemu/ratelimit.h
-+++ b/include/qemu/ratelimit.h
-@@ -42,7 +42,7 @@ static inline void ratelimit_set_speed(RateLimit *limit, uint64_t speed,
-                                        uint64_t slice_ns)
- {
-     limit->slice_ns = slice_ns;
--    limit->slice_quota = ((double)speed * 1000000000ULL) / slice_ns;
-+    limit->slice_quota = ((double)speed * slice_ns)/1000000000ULL;
- }
- 
- #endif
 diff --git a/tests/Makefile b/tests/Makefile
 index b60f0fb..cffbd22 100644
 --- a/tests/Makefile

diff --git a/debian/patches/0006-add-vm-state-to-backups.patch b/debian/patches/0006-add-vm-state-to-backups.patch
index a1bf1342b14dd1ffc96716f870728c618c06b8e4..53923dcfeb5e018dfeb1d7f41b7a9afbd10cc2cf 100644 (file)
--- a/debian/patches/0006-add-vm-state-to-backups.patch
+++ b/debian/patches/0006-add-vm-state-to-backups.patch
@@ -1,4 +1,4 @@
-From 32e6a75c9ee5ceadf1e236787cfb3834d0d3a0ca Mon Sep 17 00:00:00 2001
+From 8c867119798abdd8f16b6fdf738aa0682cb4e713 Mon Sep 17 00:00:00 2001
 From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Thu, 29 Nov 2012 10:46:49 +0100
 Subject: [PATCH v3 6/6] add vm state to backups

diff --git a/debian/patches/series b/debian/patches/series
index 7744be0011a7b9525021efdcaca71f6b7c072389..c6e7950d761c28d90bb706328796cad3b5ee0c10 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@ ahci-add_migration-support.patch
 fix-qemu-img-snapshot-removal.patch
 move-bdrv-snapshot-find.patch
 internal-snapshot-async.patch
-# (included in backup series): stream-fix-ratelimit_set_speed.patch
 qemu-img-convert-skipcreate-option.patch
 enable-kvm-by-default.patch
 # include qemu backup series

diff --git a/debian/patches/stream-fix-ratelimit_set_speed.patch b/debian/patches/stream-fix-ratelimit_set_speed.patch
deleted file mode 100644 (file)
index 0ba0078..0000000
--- a/debian/patches/stream-fix-ratelimit_set_speed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 264baba5f5e6c2f42af0262bc2ce81647df74639 Mon Sep 17 00:00:00 2001
-From: Dietmar Maurer <dietmar@proxmox.com>
-Date: Wed, 24 Oct 2012 11:59:23 +0200
-Subject: [PATCH] stream: fix ratelimit_set_speed
-
-The formula to compute slice_quota was wrong.
-
-Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
----
- include/qemu/ratelimit.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h
-index c6ac281..d1610f1 100644
---- a/include/qemu/ratelimit.h
-+++ b/include/qemu/ratelimit.h
-@@ -42,7 +42,7 @@ static inline void ratelimit_set_speed(RateLimit *limit, uint64_t speed,
-                                        uint64_t slice_ns)
- {
-     limit->slice_ns = slice_ns;
--    limit->slice_quota = ((double)speed * 1000000000ULL) / slice_ns;
-+    limit->slice_quota = ((double)speed * slice_ns)/1000000000ULL;
- }
- 
- #endif
--- 
-1.7.2.5
-

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index ab9f5396b67e3da8c25b48868acdff31150c1aaf..87748ef27786aec8257162b9c44a131d26c1e6c1 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ