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