331c6bc244
RHEL patches: * Select correct qemu binary for -o qemu mode * Disable the --qemu-boot / -oo qemu-boot option * Fix list of supported sound cards to match RHEL qemu * Fixes for libguestfs-winsupport * -i disk: force VNC as display * point to KB for supported v2v hypervisors/guests * Remove -o glance * Remove the --in-place option * tests: Remove btrfs test * Remove --block-driver option Remove input from Xen resolves: RHEL-37687 Remove -o rhv, -o rhv-upload and -o vdsm modes resolves: RHEL-36712
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From a8dc0a8f6ca43a1c4dea49a1ad46b0a4d1458942 Mon Sep 17 00:00:00 2001
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
Date: Sun, 28 Sep 2014 19:14:43 +0100
|
|
Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode
|
|
(RHBZ#1147313).
|
|
|
|
RHEL does not have qemu-system-x86_64 (etc), and in addition the
|
|
qemu binary is located in /usr/libexec. Encode the path to this
|
|
binary directly in the script.
|
|
|
|
Note that we don't support people running qemu directly like this.
|
|
It's just for quick testing of converted VMs, and to help us with
|
|
support cases.
|
|
---
|
|
output/output_qemu.ml | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/output/output_qemu.ml b/output/output_qemu.ml
|
|
index 26c1ba48..07dae8c2 100644
|
|
--- a/output/output_qemu.ml
|
|
+++ b/output/output_qemu.ml
|
|
@@ -131,7 +131,7 @@ module QEMU = struct
|
|
* module deals with shell and qemu comma quoting.
|
|
*)
|
|
let cmd = Qemuopts.create () in
|
|
- Qemuopts.set_binary_by_arch cmd (Some guestcaps.gcaps_arch);
|
|
+ Qemuopts.set_binary cmd "/usr/libexec/qemu-kvm";
|
|
|
|
let flag = Qemuopts.flag cmd
|
|
and arg = Qemuopts.arg cmd
|