|
 |
ffd6ed |
From c8eca5fd761f8eb7822ccb765d3e9138d9bcb738 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 |
---
|
|
|
0d20ef |
v2v/cmdline.ml | 4 +++-
|
|
|
0d20ef |
v2v/virt-v2v.pod | 13 -------------
|
|
|
0d20ef |
2 files changed, 3 insertions(+), 14 deletions(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
|
|
|
0d20ef |
index 01f3335..14c3fb9 100644
|
|
|
0d20ef |
--- a/v2v/cmdline.ml
|
|
|
0d20ef |
+++ b/v2v/cmdline.ml
|
|
|
0d20ef |
@@ -168,7 +168,7 @@ let parse_cmdline () =
|
|
|
0d20ef |
"-os", Arg.Set_string output_storage, "storage " ^ s_"Set output storage location";
|
|
|
0d20ef |
"--password-file", Arg.Set_string password_file, "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 |
+ "--qemu-boot", Arg.Set qemu_boot, " " ^ s_"This option cannot be used in RHEL";
|
|
|
0d20ef |
"-q", Arg.Set quiet, " " ^ s_"Quiet output";
|
|
|
0d20ef |
"--quiet", Arg.Set quiet, ditto;
|
|
|
0d20ef |
"--root", Arg.String set_root_choice,"ask|... " ^ s_"How to choose root filesystem";
|
|
|
0d20ef |
@@ -364,6 +364,8 @@ read the man page virt-v2v(1).
|
|
|
0d20ef |
if not (is_directory output_storage) then
|
|
|
0d20ef |
error (f_"-os %s: output directory does not exist or is not a directory")
|
|
|
0d20ef |
output_storage;
|
|
|
0d20ef |
+ if qemu_boot then
|
|
|
0d20ef |
+ error (f_"-o qemu: the --qemu-boot option cannot be used in RHEL");
|
|
|
0d20ef |
Output_qemu.output_qemu verbose output_storage qemu_boot
|
|
|
0d20ef |
|
|
|
0d20ef |
| `RHEV ->
|
|
|
0d20ef |
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
|
|
|
0d20ef |
index 5f4d42e..9edb2ca 100644
|
|
|
0d20ef |
--- a/v2v/virt-v2v.pod
|
|
|
0d20ef |
+++ b/v2v/virt-v2v.pod
|
|
|
0d20ef |
@@ -139,11 +139,6 @@ Since C<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 |
-
|
|
|
0d20ef |
=head1 OPTIONS
|
|
|
0d20ef |
|
|
|
0d20ef |
=over 4
|
|
|
0d20ef |
@@ -350,9 +345,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>.
|
|
|
0d20ef |
@@ -436,11 +428,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 |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|