From 19d1100a7b944babdf1e3ba4fae170d31802ad59 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo 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. --- output/output.ml | 3 +++ v2v/v2v.ml | 2 -- docs/virt-v2v-output-local.pod | 6 ++---- docs/virt-v2v.pod | 12 ------------ 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/output/output.ml b/output/output.ml index 92b035259b0f..1414a5214a8a 100644 --- a/output/output.ml +++ b/output/output.ml @@ -1346,6 +1346,9 @@ and qemu_parse_options cmdline = ) cmdline.output_options; let qemu_boot = !qemu_boot in + if qemu_boot then + error (f_"-o qemu: the -oo qemu-boot option cannot be used in RHEL"); + (* -os must be set to a directory. *) let output_storage = match cmdline.output_storage with diff --git a/v2v/v2v.ml b/v2v/v2v.ml index a88e0509bf10..1104295c0a1e 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -218,8 +218,6 @@ let rec main () = s_"Same as ‘-ip filename’"; [ L"print-source" ], Getopt.Set print_source, s_"Print source and stop"; - [ L"qemu-boot" ], Getopt.Unit (fun () -> add_o_option "-oo" "qemu-boot"), - s_"Boot in qemu (-o qemu only)"; [ L"root" ], Getopt.String ("ask|... ", add_conv_option "--root"), s_"How to choose root filesystem"; [ L"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"), diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod index a5f155cbc4a4..3a2e62389604 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 b25d678d7bd0..0a47b6114047 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -141,11 +141,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 -oo qemu-boot - =head1 OPTIONS =over 4 @@ -511,9 +506,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<-oo qemu-boot> -option which boots the guest under qemu immediately. - =item B<-o> B This is the same as I<-o rhv>. @@ -769,10 +761,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> - -This is the same as I<-oo qemu-boot>. - =item B<-q> =item B<--quiet> -- 2.19.1.3.g30247aa5d201