update to latest version from git

diff --git a/debian/patches/fix-alarm-timer-setup.patch b/debian/patches/fix-alarm-timer-setup.patch
deleted file mode 100644 (file)
index 4d66118..0000000
--- a/debian/patches/fix-alarm-timer-setup.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: new/qemu-char.c
-===================================================================
---- new.orig/qemu-char.c       2012-11-21 11:11:22.000000000 +0100
-+++ new/qemu-char.c    2012-11-23 07:26:49.000000000 +0100
-@@ -134,9 +134,9 @@
- void qemu_chr_generic_open(CharDriverState *s)
- {
-     if (s->open_timer == NULL) {
--        s->open_timer = qemu_new_timer_ms(vm_clock,
-+        s->open_timer = qemu_new_timer_ms(rt_clock,
-                                           qemu_chr_fire_open_event, s);
--        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(vm_clock) - 1);
-+        qemu_mod_timer(s->open_timer, qemu_get_clock_ms(rt_clock) - 1);
-     }
- }
- 

diff --git a/debian/patches/series b/debian/patches/series
index 00370a79aef4baf6953fae000673fd0cec8dfc13..d7496fd4cd30522668d9650794dc2195868562d1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ internal-snapshot-async.patch
 stream-fix-ratelimit_set_speed.patch
 qemu-img-convert-skipcreate-option.patch
 enable-kvm-by-default.patch
-fix-alarm-timer-setup.patch

diff --git a/qemu-kvm-src.tar.gz b/qemu-kvm-src.tar.gz
index 2cae1396403dbde89cfc816abf5e8cbf8045e89f..d43c4ab2ae422fa8d3233b881b3f32c9ac1cc495 100644 (file)
Binary files a/qemu-kvm-src.tar.gz and b/qemu-kvm-src.tar.gz differ