ef5fbb5721
- Backport upstream ddab06d5eb99 [master] / 9e1c78a4dda8 [rhel-9.1]. - copy-patches.sh: rewrap patch formatting command, spell out "--patience" (already expected), then decrease churn by passing "--no-signature". - Migrate earlier rhbz#2062360 %changelog entries to latest (=new) entry. resolves: rhbz#2062360 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
From d7c0992dfb11982d96cac8e279c454d82787918a 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 3269fba5..7f2e9284 100644
|
|
--- a/output/output_qemu.ml
|
|
+++ b/output/output_qemu.ml
|
|
@@ -137,7 +137,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
|