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