mrc0mmand / rpms / libguestfs

Forked from rpms/libguestfs 3 years ago
Clone

Blame SOURCES/0066-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch

6b9fda
From adb584859d0f894b6e228b124ac6678f15b5a6b7 Mon Sep 17 00:00:00 2001
d0ea73
From: "Richard W.M. Jones" <rjones@redhat.com>
d0ea73
Date: Tue, 30 Sep 2014 10:50:27 +0100
d0ea73
Subject: [PATCH] RHEL 8: v2v: Disable the --qemu-boot option (RHBZ#1147313).
d0ea73
d0ea73
This cannot work because there is no Gtk or SDL output mode
d0ea73
in RHEL 8's qemu-kvm.
d0ea73
d0ea73
In addition you will have to edit the -display option in the
d0ea73
qemu script.
d0ea73
---
d0ea73
 v2v/cmdline.ml   |  3 ++-
d0ea73
 v2v/virt-v2v.pod | 13 -------------
d0ea73
 2 files changed, 2 insertions(+), 14 deletions(-)
d0ea73
d0ea73
diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
d0ea73
index 97d4f4377..6bca12ce3 100644
d0ea73
--- a/v2v/cmdline.ml
d0ea73
+++ b/v2v/cmdline.ml
d0ea73
@@ -228,7 +228,6 @@ let parse_cmdline () =
d0ea73
                                     s_"Use password from file";
d0ea73
     [ L"print-source" ], Getopt.Set print_source,
d0ea73
                                     s_"Print source and stop";
d0ea73
-    [ L"qemu-boot" ], Getopt.Set qemu_boot, s_"Boot in qemu (-o qemu only)";
d0ea73
     [ L"root" ],     Getopt.String ("ask|... ", set_root_choice),
d0ea73
                                     s_"How to choose root filesystem";
d0ea73
     [ L"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"),
d0ea73
@@ -564,6 +563,8 @@ read the man page virt-v2v(1).
d0ea73
         | Some d when not (is_directory d) ->
d0ea73
            error (f_"-os %s: output directory does not exist or is not a directory") d
d0ea73
         | Some d -> d in
d0ea73
+      if qemu_boot then
d0ea73
+        error (f_"-o qemu: the --qemu-boot option cannot be used in RHEL");
d0ea73
       Output_qemu.output_qemu os qemu_boot,
d0ea73
       output_format, output_alloc
d0ea73
 
d0ea73
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
d0ea73
index f4d200e3d..a5b1c218a 100644
d0ea73
--- a/v2v/virt-v2v.pod
d0ea73
+++ b/v2v/virt-v2v.pod
d0ea73
@@ -115,11 +115,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
d0ea73
 image(s) you do not need to specify the name of the disk image on the
d0ea73
 command line.
d0ea73
 
d0ea73
-To convert a local disk image and immediately boot it in local
d0ea73
-qemu, do:
d0ea73
-
d0ea73
- virt-v2v -i disk disk.img -o qemu -os /var/tmp --qemu-boot
d0ea73
-
d0ea73
 =head1 INPUT AND OUTPUT MODES
d0ea73
 
d0ea73
                           ┌────────────┐  ┌─────────▶ -o null
d0ea73
@@ -564,9 +559,6 @@ This is similar to I<-o local>, except that a shell script is written
d0ea73
 which you can use to boot the guest in qemu.  The converted disks and
d0ea73
 shell script are written to the directory specified by I<-os>.
d0ea73
 
d0ea73
-When using this output mode, you can also specify the I<--qemu-boot>
d0ea73
-option which boots the guest under qemu immediately.
d0ea73
-
d0ea73
 =item B<-o> B<rhev>
d0ea73
 
d0ea73
 This is the same as I<-o rhv>.
d0ea73
@@ -791,11 +783,6 @@ Print information about the source guest and stop.  This option is
d0ea73
 useful when you are setting up network and bridge maps.
d0ea73
 See L</NETWORKS AND BRIDGES>.
d0ea73
 
d0ea73
-=item B<--qemu-boot>
d0ea73
-
d0ea73
-When using I<-o qemu> only, this boots the guest immediately after
d0ea73
-virt-v2v finishes.
d0ea73
-
d0ea73
 =item B<-q>
d0ea73
 
d0ea73
 =item B<--quiet>
d0ea73
-- 
6b9fda
2.21.0
d0ea73