main/qemu: replace patches with the ones sent upstream

Patches sent upstream:
http://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg04773.html

1 files changed, 32 insertions, 0 deletions

diff --git a/main/qemu/0003-xen-replace-ffsl-with-ctzl.patch b/main/qemu/0003-xen-replace-ffsl-with-ctzl.patch
new file mode 100644
index 0000000000..63d7de95eb
--- /dev/null
+++ b/main/qemu/0003-xen-replace-ffsl-with-ctzl.patch
@@ -0,0 +1,32 @@
+From a8f26948d36c27243fd564e9af59ebf416838311 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Tue, 29 Apr 2014 14:28:52 +0200
+Subject: [PATCH 3/6] xen: replace ffsl with ctzl
+
+ffsl is a GNU extension and not available in musl libc.
+
+See also commit fbeadf50 (bitops: unify bitops_ffsl with the one in
+host-utils.h, call it bitops_ctzl) on why ctzl should be used instead
+of ffsl.
+
+Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
+---
+ xen-all.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xen-all.c b/xen-all.c
+index ba34739..3a0e9e5 100644
+--- a/xen-all.c
++++ b/xen-all.c
+@@ -511,7 +511,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
+     for (i = 0; i < ARRAY_SIZE(bitmap); i++) {
+         unsigned long map = bitmap[i];
+         while (map != 0) {
+-            j = ffsl(map) - 1;
++            j = ctzl(map);
+             map &= ~(1ul << j);
+             memory_region_set_dirty(framebuffer,
+                                     (i * width + j) * TARGET_PAGE_SIZE,
+-- 
+1.9.2
+