|
 |
e76f14 |
From a613c11f034b736741b053e65823935161961ddd 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
|
|
|
e76f14 |
index e8785c4..32eb873 100644
|
|
|
0d20ef |
--- a/v2v/cmdline.ml
|
|
|
0d20ef |
+++ b/v2v/cmdline.ml
|
|
|
e76f14 |
@@ -214,7 +214,6 @@ let parse_cmdline () =
|
|
|
e76f14 |
"--password-file", Arg.String (set_string_option_once "--password-file" password_file),
|
|
|
e76f14 |
"file " ^ s_"Use password from file";
|
|
|
0d20ef |
"--print-source", Arg.Set print_source, " " ^ s_"Print source and stop";
|
|
|
0d20ef |
- "--qemu-boot", Arg.Set qemu_boot, " " ^ s_"Boot in qemu (-o qemu only)";
|
|
|
0d20ef |
"--root", Arg.String set_root_choice,"ask|... " ^ s_"How to choose root filesystem";
|
|
|
e76f14 |
"--vdsm-image-uuid", Arg.String add_vdsm_image_uuid, "uuid " ^ s_"Output image UUID(s)";
|
|
|
e76f14 |
"--vdsm-vol-uuid", Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)";
|
|
|
e76f14 |
@@ -416,6 +415,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");
|
|
|
e76f14 |
Output_qemu.output_qemu os qemu_boot
|
|
|
0d20ef |
|
|
|
0d20ef |
| `RHEV ->
|
|
|
0d20ef |
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
|
|
|
e76f14 |
index 0cde486..dcbaec2 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)
|
|
|
e76f14 |
@@ -478,9 +473,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 |
-
|
|
|
0d20ef |
=item B<-o rhev>
|
|
|
0d20ef |
|
|
|
0d20ef |
Set the output method to I<rhev>.
|
|
|
e76f14 |
@@ -566,11 +558,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 |
--
|
|
|
7af31e |
1.8.3.1
|
|
|
0d20ef |
|