From 05de88f9fe2415664adff793351f916cc6a01485 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313). This cannot work because there is no Gtk or SDL output mode in RHEL's qemu-kvm. In addition you will have to edit the -display option in the qemu script. --- docs/virt-v2v-output-local.pod | 6 ++---- docs/virt-v2v.pod | 13 ------------- v2v/cmdline.ml | 3 ++- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod index a5f155cb..3a2e6238 100644 --- a/docs/virt-v2v-output-local.pod +++ b/docs/virt-v2v-output-local.pod @@ -9,7 +9,7 @@ or libvirt virt-v2v [-i* options] -o local -os DIRECTORY - virt-v2v [-i* options] -o qemu -os DIRECTORY [--qemu-boot] + virt-v2v [-i* options] -o qemu -os DIRECTORY virt-v2v [-i* options] -o json -os DIRECTORY [-oo json-disks-pattern=PATTERN] @@ -50,12 +50,10 @@ where C is the guest name. =item B<-o qemu -os> C -=item B<-o qemu -os> C B<--qemu-boot> - This converts the guest to files in C. Unlike I<-o local> above, a shell script is created which contains the raw qemu command you would need to boot the guest. However the shell script is not -run, I you also add the I<--qemu-boot> option. +run. =item B<-o json -os> C diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod index fb8b6a5d..924e1d2d 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -144,11 +144,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 OPTIONS =over 4 @@ -537,9 +532,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>. @@ -815,11 +807,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> diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 3b74f307..df69e2e0 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -284,7 +284,6 @@ let parse_cmdline () = s_"Estimate size of source and stop"; [ 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"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"), @@ -668,6 +667,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 -- 2.30.1