summaryrefslogtreecommitdiffstats
path: root/src/launch.c
diff options
context:
space:
mode:
authorRichard W.M. Jones <rjones@redhat.com>2012-06-16 10:19:39 +0100
committerRichard W.M. Jones <rjones@redhat.com>2012-06-27 16:36:15 +0100
commit78bd074f424fec0beb51d968f18df36e9139518e (patch)
treee0f61134e5b4740ac4424f75c695d3ae35472d11 /src/launch.c
parentcadfab1a20f3cfb37e1a4d69fbea001754dcba32 (diff)
downloadlibguestfs-78bd074f424fec0beb51d968f18df36e9139518e.tar.gz
libguestfs-78bd074f424fec0beb51d968f18df36e9139518e.tar.xz
libguestfs-78bd074f424fec0beb51d968f18df36e9139518e.zip
EPEL 5: Remove checks which fail with ancient qemu.
Note that g->qemu_version and g->qemu_devices will both be empty strings.
Diffstat (limited to 'src/launch.c')
-rw-r--r--src/launch.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/src/launch.c b/src/launch.c
index 3cd16f41..3bb41ae6 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1394,18 +1394,8 @@ test_qemu (guestfs_h *g)
return -1;
}
- snprintf (cmd, sizeof cmd, "LC_ALL=C '%s' -nographic -version 2>/dev/null",
- g->qemu);
-
- if (test_qemu_cmd (g, cmd, &g->qemu_version) == -1)
- goto qemu_error;
-
- snprintf (cmd, sizeof cmd,
- "LC_ALL=C '%s' -nographic -machine accel=kvm:tcg -device '?' 2>&1",
- g->qemu);
-
- if (test_qemu_cmd (g, cmd, &g->qemu_devices) == -1)
- goto qemu_error;
+ g->qemu_version = safe_strdup (g, "");
+ g->qemu_devices = safe_strdup (g, "");
return 0;
}