X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=src%2Fgenerator.ml;h=0a0f9b1764ed1ebe6c5cfcf049afc7d81a4bd81c;hb=5dc2f852d275b79c3e338c6ea5629c6baf4e1a8e;hp=b3f27cd709362bd29f356a6264c64dd72665b943;hpb=ccc1d216032ff61a81eb1116df44d5bd82079462;p=libguestfs.git

diff --git a/src/generator.ml b/src/generator.ml
index b3f27cd..0a0f9b1 100755
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -3980,11 +3980,18 @@ int main (int argc, char *argv[])
     printf (\"guestfs_launch FAILED\\n\");
     exit (1);
   }
+
+  /* Set a timeout in case qemu hangs during launch (RHBZ#505329). */
+  alarm (600);
+
   if (guestfs_wait_ready (g) == -1) {
     printf (\"guestfs_wait_ready FAILED\\n\");
     exit (1);
   }
 
+  /* Cancel previous alarm. */
+  alarm (0);
+
   nr_tests = %d;
 
 " (500 * 1024 * 1024) (50 * 1024 * 1024) (10 * 1024 * 1024) nr_tests;