diff options
| author | Richard Jones <rich@koneko.home.annexia.org> | 2010-03-21 16:33:37 +0000 |
|---|---|---|
| committer | Richard Jones <rich@koneko.home.annexia.org> | 2010-03-22 10:41:44 +0000 |
| commit | b7d59e2cdaa73b42a2063a0653151bae20497074 (patch) | |
| tree | 20ee9ea4cc6758748379d92e0a66894c73e809f5 | |
| parent | a7cb2d9b08ca038a96aa180fee0f5e8745d2928d (diff) | |
| download | libguestfs-b7d59e2cdaa73b42a2063a0653151bae20497074.tar.gz libguestfs-b7d59e2cdaa73b42a2063a0653151bae20497074.tar.xz libguestfs-b7d59e2cdaa73b42a2063a0653151bae20497074.zip | |
Run qemu with -nographic option.
On Mac OS X this prevents a short "flash" as qemu opens a
toplevel window.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/guestfs.c | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e9d0fc01..93b6256e 100644 --- a/configure.ac +++ b/configure.ac @@ -176,7 +176,7 @@ dnl fallback to null vmchannel (still using SLIRP). See the dnl discussion in the README file. if test "x$vmchannel_test" != "xno"; then AC_MSG_CHECKING([for guestfwd support in $QEMU]) - if $QEMU --help | grep -sq guestfwd; then + if $QEMU -nographic --help | grep -sq guestfwd; then AC_MSG_RESULT([yes]) vmchannel_guestfwd=guestfwd else @@ -185,7 +185,7 @@ if test "x$vmchannel_test" != "xno"; then # test failing. This is because recent qemu will throw # up an SDL window and hang if we try to run this test. AC_MSG_CHECKING([for "-net channel" (old guestfwd) support in $QEMU]) - vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:` + vmchannelout=`$QEMU -nographic -net channel /dev/zero 2>&1 ||:` echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD if echo "$vmchannelout" | grep -sq "vmchannel wrong port number" ; then AC_MSG_RESULT([yes]) @@ -197,7 +197,7 @@ if test "x$vmchannel_test" != "xno"; then fi AC_MSG_CHECKING([for "-net user" (user mode network) support in $QEMU]) - if $QEMU --help | grep -sq -- "-net user"; then + if $QEMU -nographic --help | grep -sq -- "-net user"; then AC_MSG_RESULT([yes]) vmchannel_net_user=yes else diff --git a/src/guestfs.c b/src/guestfs.c index 02d5fdbf..e3080446 100644 --- a/src/guestfs.c +++ b/src/guestfs.c @@ -1620,7 +1620,7 @@ test_qemu (guestfs_h *g) char cmd[1024]; FILE *fp; - snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -help", g->qemu); + snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -nographic -help", g->qemu); fp = popen (cmd, "r"); /* qemu -help should always work (qemu -version OTOH wasn't @@ -1642,7 +1642,8 @@ test_qemu (guestfs_h *g) if (pclose (fp) == -1) goto error; - snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -version 2>/dev/null", g->qemu); + snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -nographic -version 2>/dev/null", + g->qemu); fp = popen (cmd, "r"); if (fp) { |