mrc0mmand / rpms / libguestfs

Forked from rpms/libguestfs 3 years ago
Clone

Blame SOURCES/0028-v2v-Use-Std_utils.qemu_input_filename-instead-of-pre.patch

e9bfca
From d3fd52a8e1241bace8d149ef31f6404dd61f89df Mon Sep 17 00:00:00 2001
e9bfca
From: "Richard W.M. Jones" <rjones@redhat.com>
e9bfca
Date: Tue, 22 May 2018 08:09:28 +0100
e9bfca
Subject: [PATCH] v2v: Use Std_utils.qemu_input_filename instead of prefixing
e9bfca
 "file:" to filename (RHBZ#1580292).
e9bfca
e9bfca
This also allows us to use virt-v2v with the old version of qemu in
e9bfca
RHEL 7.
e9bfca
e9bfca
Fixes commit e29296cfa20dd691995832940a30fe2e6b98149a.
e9bfca
e9bfca
Thanks: Pino Toscano for suggesting the fix.
e9bfca
(cherry picked from commit 0c934144eb8ea0ee1e1f68d4975415c001a62556)
e9bfca
---
e9bfca
 v2v/v2v.ml | 2 +-
e9bfca
 1 file changed, 1 insertion(+), 1 deletion(-)
e9bfca
e9bfca
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
e9bfca
index 90173b018..6b9bdadf6 100644
e9bfca
--- a/v2v/v2v.ml
e9bfca
+++ b/v2v/v2v.ml
e9bfca
@@ -726,7 +726,7 @@ and copy_targets cmdline targets input output =
e9bfca
       let cmd =
e9bfca
         let filename =
e9bfca
           match t.target_file with
e9bfca
-          | TargetFile filename -> "file:" ^ filename
e9bfca
+          | TargetFile filename -> qemu_input_filename filename
e9bfca
           | TargetURI uri -> uri in
e9bfca
         [ "qemu-img"; "convert" ] @
e9bfca
         (if not (quiet ()) then [ "-p" ] else []) @
e9bfca
-- 
8ff76f
2.20.1
e9bfca