Blame SOURCES/0006-RHEL-7-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch

90a56e
From d4f2cb392ed4b88b14f3c3f8e08b02b5f52a9430 Mon Sep 17 00:00:00 2001
0d20ef
From: "Richard W.M. Jones" <rjones@redhat.com>
0d20ef
Date: Tue, 30 Sep 2014 10:50:27 +0100
0d20ef
Subject: [PATCH] RHEL 7: v2v: Disable the --qemu-boot option (RHBZ#1147313).
0d20ef
0d20ef
This cannot work because there is no Gtk or SDL output mode
0d20ef
in RHEL 7's qemu-kvm.
0d20ef
0d20ef
In addition you will have to edit the -display option in the
0d20ef
qemu script.
0d20ef
---
e76f14
 v2v/cmdline.ml   |  3 ++-
0d20ef
 v2v/virt-v2v.pod | 13 -------------
e76f14
 2 files changed, 2 insertions(+), 14 deletions(-)
0d20ef
0d20ef
diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
46ce2f
index c294e5778..9f02098c0 100644
0d20ef
--- a/v2v/cmdline.ml
0d20ef
+++ b/v2v/cmdline.ml
90a56e
@@ -199,7 +199,6 @@ let parse_cmdline () =
90a56e
     [ L"password-file" ], Getopt.String ("file", set_string_option_once "--password-file" password_file),
90a56e
                                             s_"Use password from file";
90a56e
     [ L"print-source" ], Getopt.Set print_source, s_"Print source and stop";
90a56e
-    [ L"qemu-boot" ], Getopt.Set qemu_boot,       s_"Boot in qemu (-o qemu only)";
90a56e
     [ L"root" ],    Getopt.String ("ask|... ", set_root_choice), s_"How to choose root filesystem";
90a56e
     [ L"vdsm-compat" ], Getopt.Symbol ("0.10|1.1", ["0.10"; "1.1"], set_vdsm_compat), s_"Write qcow2 with compat=0.10|1.1";
90a56e
     [ L"vdsm-image-uuid" ], Getopt.String ("uuid", add_vdsm_image_uuid), s_"Output image UUID(s)";
90a56e
@@ -403,6 +402,8 @@ read the man page virt-v2v(1).
e76f14
         | Some d when not (is_directory d) ->
e76f14
            error (f_"-os %s: output directory does not exist or is not a directory") d
e76f14
         | Some d -> d in
0d20ef
+      if qemu_boot then
0d20ef
+        error (f_"-o qemu: the --qemu-boot option cannot be used in RHEL");
90a56e
       Output_qemu.output_qemu os qemu_boot,
90a56e
       output_format, output_alloc
0d20ef
 
0d20ef
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
46ce2f
index 838b5986f..79c742e3f 100644
0d20ef
--- a/v2v/virt-v2v.pod
0d20ef
+++ b/v2v/virt-v2v.pod
e76f14
@@ -145,11 +145,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
0d20ef
 image(s) you do not need to specify the name of the disk image on the
0d20ef
 command line.
0d20ef
 
0d20ef
-To convert a local disk image and immediately boot it in local
0d20ef
-qemu, do:
0d20ef
-
0d20ef
- virt-v2v -i disk disk.img -o qemu -os /var/tmp --qemu-boot
0d20ef
-
e76f14
 =head1 SUPPORT MATRIX
0d20ef
 
e76f14
 =head2 Hypervisors (Input)
90a56e
@@ -466,9 +461,6 @@ This is similar to I<-o local>, except that a shell script is written
0d20ef
 which you can use to boot the guest in qemu.  The converted disks and
0d20ef
 shell script are written to the directory specified by I<-os>.
0d20ef
 
0d20ef
-When using this output mode, you can also specify the I<--qemu-boot>
0d20ef
-option which boots the guest under qemu immediately.
0d20ef
-
90a56e
 =item B<-o> B<rhev>
0d20ef
 
90a56e
 This is the same as I<-o rhv>.
90a56e
@@ -558,11 +550,6 @@ Print information about the source guest and stop.  This option is
0d20ef
 useful when you are setting up network and bridge maps.
0d20ef
 See L</NETWORKS AND BRIDGES>.
0d20ef
 
0d20ef
-=item B<--qemu-boot>
0d20ef
-
0d20ef
-When using I<-o qemu> only, this boots the guest immediately after
0d20ef
-virt-v2v finishes.
0d20ef
-
0d20ef
 =item B<-q>
0d20ef
 
0d20ef
 =item B<--quiet>
0d20ef
-- 
46ce2f
2.13.4
0d20ef