[Qemu-devel] [PATCH] Use ffs in favor of ffsll

[Jan Kiszka]

Not all host platforms support the ll variant. This is not a critical
path, so go the easy way.

Signed-off-by: Jan Kiszka <address@hidden>
---

 target-i386/machine.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/target-i386/machine.c b/target-i386/machine.c
index 259302c..4ab154c 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -147,10 +147,10 @@ void cpu_save(QEMUFile *f, void *opaque)
     /* There can only be one pending IRQ set in the bitmap at a time, so try
        to find it and save its number instead (-1 for none). */
     pending_irq = -1;
-    for (i = 0; i < ARRAY_SIZE(env->interrupt_bitmap); i++) {
-        bit = ffsll(env->interrupt_bitmap[i]);
+    for (i = 0; i < sizeof(env->interrupt_bitmap) / sizeof(int); i++) {
+        bit = ffs(((int *)env->interrupt_bitmap)[i]);
         if (bit) {
-            pending_irq = i * 64 + bit - 1;
+            pending_irq = i * 8 * sizeof(int) + bit - 1;
             break;
         }
     }

signature.asc
Description: OpenPGP digital signature