|
 |
4ebc84 |
From 45c163c5b327bcaf6363cdb7fedc25783eed5ad3 Mon Sep 17 00:00:00 2001
|
|
|
4ebc84 |
From: Pino Toscano <ptoscano@redhat.com>
|
|
|
4ebc84 |
Date: Thu, 19 Jul 2018 13:30:17 +0200
|
|
|
4ebc84 |
Subject: [PATCH] RHEL 7: p2v: ignore 'rhv-upload' driver (RHBZ#1590220)
|
|
|
4ebc84 |
|
|
|
4ebc84 |
The 'rhv-upload' output mode requires few options, and virt-p2v does not
|
|
|
4ebc84 |
have the GUI bits for specifying them.
|
|
|
4ebc84 |
---
|
|
|
4ebc84 |
p2v/ssh.c | 8 ++++++--
|
|
|
4ebc84 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
4ebc84 |
|
|
|
4ebc84 |
diff --git a/p2v/ssh.c b/p2v/ssh.c
|
|
|
4ebc84 |
index c8528033d..8aac2685d 100644
|
|
|
4ebc84 |
--- a/p2v/ssh.c
|
|
|
4ebc84 |
+++ b/p2v/ssh.c
|
|
|
4ebc84 |
@@ -1021,8 +1021,12 @@ add_input_driver (const char *name, size_t len)
|
|
|
4ebc84 |
static void
|
|
|
4ebc84 |
add_output_driver (const char *name, size_t len)
|
|
|
4ebc84 |
{
|
|
|
4ebc84 |
- /* Ignore the 'vdsm' driver, since that should only be used by VDSM. */
|
|
|
4ebc84 |
- if (len != 4 || memcmp (name, "vdsm", 4) != 0)
|
|
|
4ebc84 |
+ /* Ignore the 'vdsm' driver, since that should only be used by VDSM.
|
|
|
4ebc84 |
+ * Ignore the 'rhv-upload' driver, since we do not support passing all the
|
|
|
4ebc84 |
+ * options for it.
|
|
|
4ebc84 |
+ */
|
|
|
4ebc84 |
+ if ((len != 4 || memcmp (name, "vdsm", 4) != 0) &&
|
|
|
4ebc84 |
+ (len != 10 || memcmp (name, "rhv-upload", 10) != 0))
|
|
|
4ebc84 |
add_option ("output", &output_drivers, name, len);
|
|
|
4ebc84 |
}
|
|
|
4ebc84 |
|
|
|
4ebc84 |
--
|
|
|
4ebc84 |
2.21.0
|
|
|
4ebc84 |
|