import libguestfs-1.40.2-27.module+el8.4.0+9282+0bdec052

This commit is contained in:
CentOS Sources 2021-03-30 11:31:33 -04:00 committed by Stepan Oksanichenko
parent f87f6f5988
commit 7874ff8e70
97 changed files with 1174 additions and 267 deletions

View File

@ -0,0 +1,56 @@
From a5e8afb4ed8576a1b3398add2ede49a1f90ad01a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 30 Jul 2020 13:57:45 +0100
Subject: [PATCH] daemon, lib: Replace deprecated security_context_t with char
*.
This gives deprecation warnings. It always was simply a char *, and
the recommendation upstream is to replace uses with char *:
https://github.com/SELinuxProject/selinux/commit/9eb9c9327563014ad6a807814e7975424642d5b9
(cherry picked from commit eb78e990ac5277a4282293f8787af871a1420b61)
---
daemon/selinux.c | 3 +--
lib/launch-libvirt.c | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/daemon/selinux.c b/daemon/selinux.c
index 1c1446d30..f4d839c19 100644
--- a/daemon/selinux.c
+++ b/daemon/selinux.c
@@ -63,8 +63,7 @@ char *
do_getcon (void)
{
#if defined(HAVE_GETCON)
- security_context_t context;
- char *r;
+ char *context, *r;
if (getcon (&context) == -1) {
reply_with_perror ("getcon");
diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
index bc5978cc4..4a47bbb29 100644
--- a/lib/launch-libvirt.c
+++ b/lib/launch-libvirt.c
@@ -288,8 +288,7 @@ create_cow_overlay_libvirt (guestfs_h *g, void *datav, struct drive *drv)
if (data->selinux_imagelabel) {
debug (g, "setting SELinux label on %s to %s",
overlay, data->selinux_imagelabel);
- if (setfilecon (overlay,
- (security_context_t) data->selinux_imagelabel) == -1)
+ if (setfilecon (overlay, data->selinux_imagelabel) == -1)
selinux_warning (g, __func__, "setfilecon", overlay);
}
#endif
@@ -840,7 +839,7 @@ is_custom_hv (guestfs_h *g)
static void
set_socket_create_context (guestfs_h *g)
{
- security_context_t scon; /* this is actually a 'char *' */
+ char *scon;
context_t con;
if (getcon (&scon) == -1) {
--
2.18.4

View File

@ -0,0 +1,36 @@
From 524b0c748a3a2d47b4c76e3aa546b9d4af144e6c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 7 Dec 2019 11:08:54 +0000
Subject: [PATCH] caml_named_value returns const value pointer in OCaml 4.09+
(cherry picked from ocaml-augeas
commit 1cf5aef99b26a46529ca797547c0b49627fffe78)
---
common/mlaugeas/augeas-c.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/mlaugeas/augeas-c.c b/common/mlaugeas/augeas-c.c
index 3e0ba67ba..3b1dc2551 100644
--- a/common/mlaugeas/augeas-c.c
+++ b/common/mlaugeas/augeas-c.c
@@ -77,7 +77,7 @@ static const int error_map_len = sizeof error_map / sizeof error_map[0];
static void
raise_error (augeas_t t, const char *msg)
{
- value *exn = caml_named_value ("Augeas.Error");
+ const value *exn = caml_named_value ("Augeas.Error");
value args[4];
const int code = aug_error (t);
const char *aug_err_minor;
@@ -113,7 +113,7 @@ raise_error (augeas_t t, const char *msg)
static void
raise_init_error (const char *msg)
{
- value *exn = caml_named_value ("Augeas.Error");
+ const value *exn = caml_named_value ("Augeas.Error");
value args[4];
args[0] = caml_alloc (1, 0);
--
2.18.4

View File

@ -0,0 +1,78 @@
From 3860ab78d9fe5c34785aabc2227ebc8687b1171b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Sep 2019 09:00:14 +0100
Subject: [PATCH] ocaml: Change calls to caml_named_value() to cope with const
value* return.
In OCaml >= 4.09 the return value pointer of caml_named_value is
declared const.
Based on Pino Toscano's original patch to ocaml-augeas.
(cherry picked from commit 9788fa50601ad4f1eab56d0b763591268026e536)
---
common/mlpcre/pcre-c.c | 3 +--
common/mltools/uri-c.c | 6 ++----
common/mlvisit/visit-c.c | 4 +---
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c
index 0762a8341..07f99b8d6 100644
--- a/common/mlpcre/pcre-c.c
+++ b/common/mlpcre/pcre-c.c
@@ -73,12 +73,11 @@ init (void)
static void
raise_pcre_error (const char *msg, int errcode)
{
- value *exn = caml_named_value ("PCRE.Error");
value args[2];
args[0] = caml_copy_string (msg);
args[1] = Val_int (errcode);
- caml_raise_with_args (*exn, 2, args);
+ caml_raise_with_args (*caml_named_value ("PCRE.Error"), 2, args);
}
/* Wrap and unwrap pcre regular expression handles, with a finalizer. */
diff --git a/common/mltools/uri-c.c b/common/mltools/uri-c.c
index 2a8837cd9..e03647c7b 100644
--- a/common/mltools/uri-c.c
+++ b/common/mltools/uri-c.c
@@ -46,10 +46,8 @@ guestfs_int_mllib_parse_uri (value argv /* arg value, not an array! */)
int r;
r = parse_uri (String_val (argv), &uri);
- if (r == -1) {
- value *exn = caml_named_value ("URI.Parse_failed");
- caml_raise (*exn);
- }
+ if (r == -1)
+ caml_raise (*caml_named_value ("URI.Parse_failed"));
/* Convert the struct into an OCaml tuple. */
rv = caml_alloc_tuple (5);
diff --git a/common/mlvisit/visit-c.c b/common/mlvisit/visit-c.c
index 7137c4998..201f6d762 100644
--- a/common/mlvisit/visit-c.c
+++ b/common/mlvisit/visit-c.c
@@ -53,7 +53,6 @@ value
guestfs_int_mllib_visit (value gv, value dirv, value fv)
{
CAMLparam3 (gv, dirv, fv);
- value *visit_failure_exn;
guestfs_h *g = (guestfs_h *) (intptr_t) Int64_val (gv);
struct visitor_function_wrapper_args args;
/* The dir string could move around when we call the
@@ -84,8 +83,7 @@ guestfs_int_mllib_visit (value gv, value dirv, value fv)
* already printed the error to stderr (XXX - fix), so we raise a
* generic exception.
*/
- visit_failure_exn = caml_named_value ("Visit.Failure");
- caml_raise (*visit_failure_exn);
+ caml_raise (*caml_named_value ("Visit.Failure"));
}
free (dir);
--
2.18.4

View File

@ -0,0 +1,121 @@
From 5c5cc8b7bc2588c04dd0d0472b466f978f8ac55c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Feb 2020 10:17:35 +0000
Subject: [PATCH] ocaml: Use caml_alloc_initialized_string instead of memcpy.
See this commit in libguestfs-common:
https://github.com/libguestfs/libguestfs-common/commit/398dc56a6cb5d6d01506338fa94ef580e668d5e9
(cherry picked from commit 9f3148c791a970b7d6adf249e949a1b7e0b4b0c1)
---
generator/OCaml.ml | 10 ++++------
m4/guestfs-ocaml.m4 | 18 ++++++++++++++++++
ocaml/guestfs-c.c | 3 +--
ocaml/guestfs-c.h | 18 ++++++++++++++++++
4 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/generator/OCaml.ml b/generator/OCaml.ml
index bd4f73b85..1b6970f6d 100644
--- a/generator/OCaml.ml
+++ b/generator/OCaml.ml
@@ -504,12 +504,11 @@ copy_table (char * const * argv)
| name, FString ->
pr " v = caml_copy_string (%s->%s);\n" typ name
| name, FBuffer ->
- pr " v = caml_alloc_string (%s->%s_len);\n" typ name;
- pr " memcpy (String_val (v), %s->%s, %s->%s_len);\n"
+ pr " v = caml_alloc_initialized_string (%s->%s_len, %s->%s);\n"
typ name typ name
| name, FUUID ->
- pr " v = caml_alloc_string (32);\n";
- pr " memcpy (String_val (v), %s->%s, 32);\n" typ name
+ pr " v = caml_alloc_initialized_string (32, %s->%s);\n"
+ typ name
| name, (FBytes|FInt64|FUInt64) ->
pr " v = caml_copy_int64 (%s->%s);\n" typ name
| name, (FInt32|FUInt32) ->
@@ -757,8 +756,7 @@ copy_table (char * const * argv)
pr " for (i = 0; r[i] != NULL; ++i) free (r[i]);\n";
pr " free (r);\n";
| RBufferOut _ ->
- pr " rv = caml_alloc_string (size);\n";
- pr " memcpy (String_val (rv), r, size);\n";
+ pr " rv = caml_alloc_initialized_string (size, r);\n";
pr " free (r);\n"
);
diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4
index 3c504ce7e..90658e8c5 100644
--- a/m4/guestfs-ocaml.m4
+++ b/m4/guestfs-ocaml.m4
@@ -221,6 +221,24 @@ AS_IF([test "x$have_Hivex_OPEN_UNSAFE" = "xno"],[
])
AC_SUBST([HIVEX_OPEN_UNSAFE_FLAG])
+dnl Check if OCaml has caml_alloc_initialized_string (added 2017).
+AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && \
+ test "x$enable_ocaml" = "xyes"],[
+ AC_MSG_CHECKING([for caml_alloc_initialized_string])
+ cat >conftest.c <<'EOF'
+#include <caml/alloc.h>
+int main () { char *p = (void *) caml_alloc_initialized_string; return 0; }
+EOF
+ AS_IF([$OCAMLC conftest.c >&AS_MESSAGE_LOG_FD 2>&1],[
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_CAML_ALLOC_INITIALIZED_STRING],[1],
+ [caml_alloc_initialized_string found at compile time.])
+ ],[
+ AC_MSG_RESULT([no])
+ ])
+ rm -f conftest.c conftest.o
+])
+
dnl Flags we want to pass to every OCaml compiler call.
OCAML_WARN_ERROR="-warn-error CDEFLMPSUVYZX+52-3"
AC_SUBST([OCAML_WARN_ERROR])
diff --git a/ocaml/guestfs-c.c b/ocaml/guestfs-c.c
index 3b5fb198f..18d7dd978 100644
--- a/ocaml/guestfs-c.c
+++ b/ocaml/guestfs-c.c
@@ -360,8 +360,7 @@ event_callback_wrapper_locked (guestfs_h *g,
ehv = Val_int (event_handle);
- bufv = caml_alloc_string (buf_len);
- memcpy (String_val (bufv), buf, buf_len);
+ bufv = caml_alloc_initialized_string (buf_len, buf);
arrayv = caml_alloc (array_len, 0);
for (i = 0; i < array_len; ++i) {
diff --git a/ocaml/guestfs-c.h b/ocaml/guestfs-c.h
index f05dbd8e7..93ad3e2bf 100644
--- a/ocaml/guestfs-c.h
+++ b/ocaml/guestfs-c.h
@@ -19,6 +19,24 @@
#ifndef GUESTFS_OCAML_C_H
#define GUESTFS_OCAML_C_H
+#include "config.h"
+
+#include <caml/alloc.h>
+#include <caml/mlvalues.h>
+
+/* Replacement if caml_alloc_initialized_string is missing, added
+ * to OCaml runtime in 2017.
+ */
+#ifndef HAVE_CAML_ALLOC_INITIALIZED_STRING
+static inline value
+caml_alloc_initialized_string (mlsize_t len, const char *p)
+{
+ value sv = caml_alloc_string (len);
+ memcpy ((char *) String_val (sv), p, len);
+ return sv;
+}
+#endif
+
#define Guestfs_val(v) (*((guestfs_h **)Data_custom_val(v)))
extern void guestfs_int_ocaml_raise_error (guestfs_h *g, const char *func)
Noreturn;
--
2.18.4

View File

@ -0,0 +1,125 @@
From 3b4082b239ec0976b366293067e42f91d56cfcd5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Feb 2020 10:15:29 +0000
Subject: [PATCH] ocaml: Use caml_alloc_initialized_string instead of memcpy.
Since about 2017 OCaml has had a function for creating an initialized
string. This uses the function instead of caml_alloc_string + memcpy
(which doesn't work for OCaml 4.10) and defines a replacement if the
function is missing.
Note this requires configure.ac in libguestfs.git and virt-v2v.git to
define HAVE_CAML_ALLOC_INITIALIZED_STRING.
(cherry picked from commit 398dc56a6cb5d6d01506338fa94ef580e668d5e9)
---
common/mlpcre/pcre-c.c | 16 ++++++++++++++--
common/mlvisit/visit-c.c | 16 ++++++++++++++--
common/mlxml/xml-c.c | 16 ++++++++++++++--
3 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c
index 07f99b8d6..7dbba5857 100644
--- a/common/mlpcre/pcre-c.c
+++ b/common/mlpcre/pcre-c.c
@@ -39,6 +39,19 @@
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+/* Replacement if caml_alloc_initialized_string is missing, added
+ * to OCaml runtime in 2017.
+ */
+#ifndef HAVE_CAML_ALLOC_INITIALIZED_STRING
+static inline value
+caml_alloc_initialized_string (mlsize_t len, const char *p)
+{
+ value sv = caml_alloc_string (len);
+ memcpy ((char *) String_val (sv), p, len);
+ return sv;
+}
+#endif
+
/* Data on the most recent match is stored in this thread-local
* variable. It is freed either by the next call to PCRE.matches or
* by (clean) thread exit.
@@ -257,8 +270,7 @@ guestfs_int_pcre_sub (value nv)
if (len < 0)
raise_pcre_error ("pcre_get_substring", len);
- strv = caml_alloc_string (len);
- memcpy (String_val (strv), str, len);
+ strv = caml_alloc_initialized_string (len, str);
CAMLreturn (strv);
}
diff --git a/common/mlvisit/visit-c.c b/common/mlvisit/visit-c.c
index 201f6d762..d5585ca94 100644
--- a/common/mlvisit/visit-c.c
+++ b/common/mlvisit/visit-c.c
@@ -35,6 +35,19 @@
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+/* Replacement if caml_alloc_initialized_string is missing, added
+ * to OCaml runtime in 2017.
+ */
+#ifndef HAVE_CAML_ALLOC_INITIALIZED_STRING
+static inline value
+caml_alloc_initialized_string (mlsize_t len, const char *p)
+{
+ value sv = caml_alloc_string (len);
+ memcpy ((char *) String_val (sv), p, len);
+ return sv;
+}
+#endif
+
struct visitor_function_wrapper_args {
/* In both case we are pointing to local roots, hence why these are
* value* not value.
@@ -198,8 +211,7 @@ copy_xattr (const struct guestfs_xattr *xattr)
rv = caml_alloc (2, 0);
v = caml_copy_string (xattr->attrname);
Store_field (rv, 0, v);
- v = caml_alloc_string (xattr->attrval_len);
- memcpy (String_val (v), xattr->attrval, xattr->attrval_len);
+ v = caml_alloc_initialized_string (xattr->attrval_len, xattr->attrval);
Store_field (rv, 1, v);
CAMLreturn (rv);
}
diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c
index d3db7e227..a0fa0fc3d 100644
--- a/common/mlxml/xml-c.c
+++ b/common/mlxml/xml-c.c
@@ -40,6 +40,19 @@
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+/* Replacement if caml_alloc_initialized_string is missing, added
+ * to OCaml runtime in 2017.
+ */
+#ifndef HAVE_CAML_ALLOC_INITIALIZED_STRING
+static inline value
+caml_alloc_initialized_string (mlsize_t len, const char *p)
+{
+ value sv = caml_alloc_string (len);
+ memcpy ((char *) String_val (sv), p, len);
+ return sv;
+}
+#endif
+
/* xmlDocPtr type */
#define docptr_val(v) (*((xmlDocPtr *)Data_custom_val(v)))
@@ -183,8 +196,7 @@ mllib_xml_to_string (value docv, value formatv)
doc = docptr_val (docv);
xmlDocDumpFormatMemory (doc, &mem, &size, Bool_val (formatv));
- strv = caml_alloc_string (size);
- memcpy (String_val (strv), mem, size);
+ strv = caml_alloc_initialized_string (size, mem);
free (mem);
CAMLreturn (strv);
--
2.18.4

View File

@ -0,0 +1,32 @@
From 96462b30d5ca6e45601512609cedfc874739137d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 5 Sep 2019 09:00:14 +0100
Subject: [PATCH] ocaml: Change calls to caml_named_value() to cope with const
value* return.
In OCaml >= 4.09 the return value pointer of caml_named_value is
declared const.
Based on Pino Toscano's original patch to ocaml-augeas.
(cherry picked from commit 74ce7332dbb9bab2a69737257f0d07c93eb9bab4)
---
generator/daemon.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generator/daemon.ml b/generator/daemon.ml
index a4e136aaa..b67c4d20b 100644
--- a/generator/daemon.ml
+++ b/generator/daemon.ml
@@ -746,7 +746,7 @@ let generate_daemon_caml_stubs () =
let nr_args = List.length args_do_function in
pr "{\n";
- pr " static value *cb = NULL;\n";
+ pr " static const value *cb = NULL;\n";
pr " CAMLparam0 ();\n";
pr " CAMLlocal2 (v, retv);\n";
pr " CAMLlocalN (args, %d);\n"
--
2.18.4

View File

@ -0,0 +1,34 @@
From 93422725a0a8248d97b67cdbc20e065f5164e089 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Feb 2020 10:27:48 +0000
Subject: [PATCH] cat: Fix GCC 10 warning.
I believe this warning is bogus, but simply initializing the local
variable is enough to avoid it.
log.c: In function 'do_log':
log.c:390:7: error: 'comm_len' may be used uninitialized in this function [-Werror=maybe-uninitialized]
390 | printf (" %.*s", (int) comm_len, comm);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
(cherry picked from commit 4e199494c41d3240aa5c0708887b7a7513c6b6f2)
---
cat/log.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cat/log.c b/cat/log.c
index 25107e25f..f8a5c85f2 100644
--- a/cat/log.c
+++ b/cat/log.c
@@ -337,7 +337,7 @@ do_log_journal (void)
while ((r = guestfs_journal_next (g)) > 0) {
CLEANUP_FREE_XATTR_LIST struct guestfs_xattr_list *xattrs = NULL;
const char *priority_str, *identifier, *comm, *pid, *message;
- size_t priority_len, identifier_len, comm_len, pid_len, message_len;
+ size_t priority_len, identifier_len, comm_len = 0, pid_len, message_len;
int priority = LOG_INFO;
int64_t ts;
--
2.18.4

View File

@ -0,0 +1,29 @@
From 17df30b82007073a40deb37ff7f840d56a1b5bf1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Feb 2020 10:33:39 +0000
Subject: [PATCH] builder: Fix const correctness for OCaml 4.10.
String_val now returns a const char *.
(cherry picked from commit d6fcf519f2d860fe3167629f042f5ff6a4ccc40d)
---
builder/setlocale-c.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builder/setlocale-c.c b/builder/setlocale-c.c
index f2ad85352..6d877e7ac 100644
--- a/builder/setlocale-c.c
+++ b/builder/setlocale-c.c
@@ -44,7 +44,8 @@ virt_builder_setlocale (value val_category, value val_name)
{
CAMLparam2 (val_category, val_name);
CAMLlocal2 (rv, rv2);
- char *ret, *locstring;
+ const char *locstring;
+ char *ret;
int category;
category = lc_string_table[Int_val (val_category)];
--
2.18.4

View File

@ -0,0 +1,33 @@
From 8eb9f06b156c6362a17712cfed9c629dec297a2c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 6 Feb 2020 10:22:42 +0000
Subject: [PATCH] mlxml: Fix pointed target signedness.
xml-c.c: In function 'mllib_xml_to_string':
xml-c.c:199:47: error: pointer targets in passing argument 2 of 'caml_alloc_initialized_string' differ in signedness [-Werror=pointer-sign]
199 | strv = caml_alloc_initialized_string (size, mem);
| ^~~
| |
| xmlChar * {aka unsigned char *}
(cherry picked from commit ea10827b4cfb3cfe5f782421c01d2902e5f73f90)
---
common/mlxml/xml-c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/mlxml/xml-c.c b/common/mlxml/xml-c.c
index a0fa0fc3d..715c3bb24 100644
--- a/common/mlxml/xml-c.c
+++ b/common/mlxml/xml-c.c
@@ -196,7 +196,7 @@ mllib_xml_to_string (value docv, value formatv)
doc = docptr_val (docv);
xmlDocDumpFormatMemory (doc, &mem, &size, Bool_val (formatv));
- strv = caml_alloc_initialized_string (size, mem);
+ strv = caml_alloc_initialized_string (size, (const char *) mem);
free (mem);
CAMLreturn (strv);
--
2.18.4

View File

@ -1,4 +1,4 @@
From 6e0dbefde3ddb0711e2b0961ee913084dc5e6a41 Mon Sep 17 00:00:00 2001 From 83c76b6c610df17e0b9bfd9cd11deb43ebc40411 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 19 Feb 2019 10:50:01 +0100 Date: Tue, 19 Feb 2019 10:50:01 +0100
Subject: [PATCH] common/mlpcre: add offset flag for PCRE.matches Subject: [PATCH] common/mlpcre: add offset flag for PCRE.matches
@ -51,10 +51,10 @@ index eacb6fd90..e10d512fc 100644
val sub : int -> string val sub : int -> string
diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c diff --git a/common/mlpcre/pcre-c.c b/common/mlpcre/pcre-c.c
index 0762a8341..be054a004 100644 index 7dbba5857..ec3a6f00d 100644
--- a/common/mlpcre/pcre-c.c --- a/common/mlpcre/pcre-c.c
+++ b/common/mlpcre/pcre-c.c +++ b/common/mlpcre/pcre-c.c
@@ -121,6 +121,15 @@ is_Some_true (value v) @@ -133,6 +133,15 @@ is_Some_true (value v)
Bool_val (Field (v, 0)) /* Some true */; Bool_val (Field (v, 0)) /* Some true */;
} }
@ -70,7 +70,7 @@ index 0762a8341..be054a004 100644
value value
guestfs_int_pcre_compile (value anchoredv, value caselessv, value dotallv, guestfs_int_pcre_compile (value anchoredv, value caselessv, value dotallv,
value extendedv, value multilinev, value extendedv, value multilinev,
@@ -165,9 +174,9 @@ guestfs_int_pcre_compile_byte (value *argv, int argn) @@ -177,9 +186,9 @@ guestfs_int_pcre_compile_byte (value *argv, int argn)
} }
value value
@ -82,7 +82,7 @@ index 0762a8341..be054a004 100644
pcre *re = Regexp_val (rev); pcre *re = Regexp_val (rev);
struct last_match *m, *oldm; struct last_match *m, *oldm;
size_t len = caml_string_length (strv); size_t len = caml_string_length (strv);
@@ -205,7 +214,8 @@ guestfs_int_pcre_matches (value rev, value strv) @@ -217,7 +226,8 @@ guestfs_int_pcre_matches (value rev, value strv)
caml_raise_out_of_memory (); caml_raise_out_of_memory ();
} }
@ -122,5 +122,5 @@ index 346019c40..3e5981107 100644
assert (replace ~global:true re0 "dd" "abcabcaabccca" = "ddcddcddccca"); assert (replace ~global:true re0 "dd" "abcabcaabccca" = "ddcddcddccca");
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From a98136d6ee36df15a226f853d47bd803a7a25329 Mon Sep 17 00:00:00 2001 From 8b7c559f6c619bab8a708358db15b2959623c833 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 19 Feb 2019 14:54:31 +0100 Date: Tue, 19 Feb 2019 14:54:31 +0100
Subject: [PATCH] v2v: add Var_expander Subject: [PATCH] v2v: add Var_expander
@ -411,5 +411,5 @@ index 000000000..35b628369
+ ignore (run_test_tt_main suite); + ignore (run_test_tt_main suite);
+ Printf.fprintf stderr "\n" + Printf.fprintf stderr "\n"
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 480c7169c341fc2f86609a13100c42e10f599b83 Mon Sep 17 00:00:00 2001 From 87df9bcb99bdb60d5cedf52e155361826e700816 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 25 Feb 2019 13:14:43 +0100 Date: Mon, 25 Feb 2019 13:14:43 +0100
Subject: [PATCH] v2v: add -o json output mode Subject: [PATCH] v2v: add -o json output mode
@ -781,5 +781,5 @@ index cf9464834..9a555c3be 100644
For I<-o rhv-upload>, this is the name of the destination Storage For I<-o rhv-upload>, this is the name of the destination Storage
Domain. Domain.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From e7ff090884f5e32585e9683d35b72bca01e0a836 Mon Sep 17 00:00:00 2001 From 9ff9ddf3c372acee3a31a9d9435b1f32e0932943 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 11 Feb 2019 19:28:00 +0100 Date: Mon, 11 Feb 2019 19:28:00 +0100
Subject: [PATCH] inspect: fix icon of RHEL Subject: [PATCH] inspect: fix icon of RHEL
@ -28,5 +28,5 @@ index 623591aa6..19f3f87af 100644
return get_png (g, shadowman, size_r, 102400); return get_png (g, shadowman, size_r, 102400);
} }
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From df8794643644c742b7cfced948eee4519b38a643 Mon Sep 17 00:00:00 2001 From 573f551ff8ced48f4ea21ec7bbbad235092f36f2 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 12 Apr 2019 17:28:12 +0200 Date: Fri, 12 Apr 2019 17:28:12 +0200
Subject: [PATCH] v2v: warn when the guest has direct network interfaces Subject: [PATCH] v2v: warn when the guest has direct network interfaces
@ -44,5 +44,5 @@ index d5d78d367..b9970cee8 100644
s_hypervisor = hypervisor; s_hypervisor = hypervisor;
s_name = name; s_orig_name = name; s_name = name; s_orig_name = name;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From de267e07b9b26d2f89470d4305d7259edb24663b Mon Sep 17 00:00:00 2001 From 31ffb01b14ef809d4c5836e9244eb114e971c36e Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 12 Apr 2019 16:19:43 +0200 Date: Fri, 12 Apr 2019 16:19:43 +0200
Subject: [PATCH] v2v: update documentation on nbdkit (RHBZ#1605242) Subject: [PATCH] v2v: update documentation on nbdkit (RHBZ#1605242)
@ -51,5 +51,5 @@ index 2b6dbaeec..b3ebda182 100644
=item 3. =item 3.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 51367a1f2d4a5c54564a6bcaf8c193de643d3ee4 Mon Sep 17 00:00:00 2001 From 9857aa4f951dd289b54e5693946b3f7adbe5c98b Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 27 Feb 2019 17:51:59 +0100 Date: Wed, 27 Feb 2019 17:51:59 +0100
Subject: [PATCH] v2v: linux: do not uninstall open-vm-tools w/ ubuntu-server Subject: [PATCH] v2v: linux: do not uninstall open-vm-tools w/ ubuntu-server
@ -53,5 +53,5 @@ index 3d61400b5..b4b2f24c4 100644
) inspect.i_apps; ) inspect.i_apps;
let libraries = !libraries in let libraries = !libraries in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 6239ce21ea4d47914aa149cee724e998c287d26c Mon Sep 17 00:00:00 2001 From 999180eca864baf0a82267448de120d2ed0e4787 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 20 Mar 2019 16:55:05 +0100 Date: Wed, 20 Mar 2019 16:55:05 +0100
Subject: [PATCH] v2v: linux: canonicalize module path for arch detection Subject: [PATCH] v2v: linux: canonicalize module path for arch detection
@ -32,5 +32,5 @@ index 3313aabc7..889ec2f2a 100644
(* Just return the module names, without path or extension. *) (* Just return the module names, without path or extension. *)
let modules = List.filter_map ( let modules = List.filter_map (
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 10afd834b5e1787cb2b22fce96de30baf37b5b2b Mon Sep 17 00:00:00 2001 From de9ebcaf0784c464a3ca3b2686935ce2bddcc281 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 20 Mar 2019 12:32:02 +0100 Date: Wed, 20 Mar 2019 12:32:02 +0100
Subject: [PATCH] v2v: linux: improve arch detection from modules Subject: [PATCH] v2v: linux: improve arch detection from modules
@ -57,5 +57,5 @@ index 889ec2f2a..30160f0da 100644
(* Just return the module names, without path or extension. *) (* Just return the module names, without path or extension. *)
let modules = List.filter_map ( let modules = List.filter_map (
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 54b63460b7602ac5c68d6e58ab60e7f85877cefc Mon Sep 17 00:00:00 2001 From 19c52dffc48af65eb07e6e1f8a85fc093ede9eb2 Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com> From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 27 May 2019 13:30:05 +0200 Date: Mon, 27 May 2019 13:30:05 +0200
Subject: [PATCH] Use proper label for nbdkit sockets Subject: [PATCH] Use proper label for nbdkit sockets
@ -59,5 +59,5 @@ index 77c39107e..c2a5c72c7 100644
args in args in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 042554182bcc782527dc74e035e2efaf6eb38aa4 Mon Sep 17 00:00:00 2001 From 3fe15743f316f1576115e30ebd0a512b3667e2f1 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 8 Apr 2019 18:23:27 +0200 Date: Mon, 8 Apr 2019 18:23:27 +0200
Subject: [PATCH] v2v: start reading the new libvirt firmware autoselect Subject: [PATCH] v2v: start reading the new libvirt firmware autoselect
@ -41,5 +41,5 @@ index b9970cee8..14cd82afd 100644
s_video = video; s_video = video;
s_sound = sound; s_sound = sound;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 692a752cf3e552790ada8cc07f937036adaa8bf0 Mon Sep 17 00:00:00 2001 From 7ac3289d64b37348f29de9db4d71c3286836066b Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 21 Mar 2019 17:16:37 +0100 Date: Thu, 21 Mar 2019 17:16:37 +0100
Subject: [PATCH] common/mltools: move the code for machine readable up Subject: [PATCH] common/mltools: move the code for machine readable up
@ -92,5 +92,5 @@ index 24641369e..5a35708cd 100644
getopt : Getopt.t; getopt : Getopt.t;
ks : key_store; ks : key_store;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 61e503d193706c38d58147a2d308faf01948550c Mon Sep 17 00:00:00 2001 From d60ef2eca9c0e51944a9c17806d6936af45907f5 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 22 Mar 2019 11:36:41 +0100 Date: Fri, 22 Mar 2019 11:36:41 +0100
Subject: [PATCH] common/mltools: make sure machine readable output is flushed Subject: [PATCH] common/mltools: make sure machine readable output is flushed
@ -30,5 +30,5 @@ index 5a35708cd..ade4cb37f 100644
Some { pr } Some { pr }
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 0dd5c55c62f4e239c7be75852cf8a667be833cf1 Mon Sep 17 00:00:00 2001 From f7acb14822f1a962a211c0d11488ffceadde2b68 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 22 Mar 2019 12:59:11 +0100 Date: Fri, 22 Mar 2019 12:59:11 +0100
Subject: [PATCH] common/mltools: allow fd for machine readable output Subject: [PATCH] common/mltools: allow fd for machine readable output
@ -83,5 +83,5 @@ index 53cece2da..f11028466 100644
The output goes to the specified F<filename>. The output goes to the specified F<filename>.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1b29702cefae8a66c83bc84dd15e7b858af3ab47 Mon Sep 17 00:00:00 2001 From e34b3a6aca9e7e51888416c57f768522597a2df1 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 22 Mar 2019 16:24:25 +0100 Date: Fri, 22 Mar 2019 16:24:25 +0100
Subject: [PATCH] OCaml tools: output messages into JSON for machine readable Subject: [PATCH] OCaml tools: output messages into JSON for machine readable
@ -510,5 +510,5 @@ index f11028466..3c1d635c5 100644
passed to the I<--machine-readable> option: this string specifies passed to the I<--machine-readable> option: this string specifies
where the machine-readable output will go. where the machine-readable output will go.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1d4e167ebcf75771957f3ba109354a8217e78004 Mon Sep 17 00:00:00 2001 From 1d6f775d8826915f9547c7dcac0fd10e702c3d80 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 1 Apr 2019 17:01:44 +0200 Date: Mon, 1 Apr 2019 17:01:44 +0200
Subject: [PATCH] OCaml tools: fix 3999 -> 3339 typo Subject: [PATCH] OCaml tools: fix 3999 -> 3339 typo
@ -73,5 +73,5 @@ index 3c1d635c5..af944ddb7 100644
In addition to that, a subset of these tools support an extra string In addition to that, a subset of these tools support an extra string
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 18007f645332e6a7c039a6bdb690e0a55f9cd1c7 Mon Sep 17 00:00:00 2001 From ee414298417aa570df4f1c77a5d47672c2871629 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 18 Jul 2019 15:38:53 +0200 Date: Thu, 18 Jul 2019 15:38:53 +0200
Subject: [PATCH] v2v: remove extra nbdkit bit from documentation Subject: [PATCH] v2v: remove extra nbdkit bit from documentation
@ -27,5 +27,5 @@ index b3ebda182..3acdd773e 100644
-ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' \ -ic 'vpx://root@vcenter.example.com/Datacenter/esxi?no_verify=1' \
-it vddk \ -it vddk \
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d74842f209b5461692a2d283d622157862bdc230 Mon Sep 17 00:00:00 2001 From f36bb1b9c44cda46afa1a34522202a5319fd0a5a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 25 Jul 2019 14:52:42 +0100 Date: Thu, 25 Jul 2019 14:52:42 +0100
Subject: [PATCH] v2v: -i vmx: Use scp -T option if available to unbreak scp Subject: [PATCH] v2v: -i vmx: Use scp -T option if available to unbreak scp
@ -45,5 +45,5 @@ index b169b2537..e3469308d 100644
| None -> "" | None -> ""
| Some port -> sprintf " -P %d" port) | Some port -> sprintf " -P %d" port)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 4b94dac532dc17cde462479bf90ab2631006b80b Mon Sep 17 00:00:00 2001 From 9a9270b0156cf30d98c26eaffb8b12c98d0d9bf4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 4 Jul 2019 15:51:25 +0100 Date: Thu, 4 Jul 2019 15:51:25 +0100
Subject: [PATCH] v2v: Allow Windows virtio ISO to be a block device as well as Subject: [PATCH] v2v: Allow Windows virtio ISO to be a block device as well as
@ -24,5 +24,5 @@ index 92bf3ec60..a6dc29f2c 100644
try try
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 2eeada3ec57760f57d5da473f32b359c6b55c616 Mon Sep 17 00:00:00 2001 From c49492cf218f4e6c1e90979c8d50ce3557642c42 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nirsof@gmail.com> From: Nir Soffer <nirsof@gmail.com>
Date: Mon, 2 Sep 2019 17:45:13 +0100 Date: Mon, 2 Sep 2019 17:45:13 +0100
Subject: [PATCH] v2v: Set DISKTYPE=2 in RHV and VDSM meta files Subject: [PATCH] v2v: Set DISKTYPE=2 in RHV and VDSM meta files
@ -42,5 +42,5 @@ index 91ff5198d..9aad5dd15 100644
bpf "LEGALITY=LEGAL\n"; bpf "LEGALITY=LEGAL\n";
bpf "POOL_UUID=\n"; bpf "POOL_UUID=\n";
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 41f3e803050b46fd79d8c2e728fc0425da05878c Mon Sep 17 00:00:00 2001 From 1a601b248f347b2237ff458376a010eeb46d005d Mon Sep 17 00:00:00 2001
From: Daniel Erez <derez@redhat.com> From: Daniel Erez <derez@redhat.com>
Date: Mon, 18 Mar 2019 18:51:26 +0200 Date: Mon, 18 Mar 2019 18:51:26 +0200
Subject: [PATCH] v2v: rhv-upload-plugin - improve wait logic after finalize Subject: [PATCH] v2v: rhv-upload-plugin - improve wait logic after finalize
@ -51,5 +51,5 @@ index 2a950c5ed..4d61a089b 100644
# Write the disk ID file. Only do this on successful completion. # Write the disk ID file. Only do this on successful completion.
with builtins.open(params['diskid_file'], 'w') as fp: with builtins.open(params['diskid_file'], 'w') as fp:
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From b37ca67f769749b7b3b5d51e171b7cccfa3b5fd2 Mon Sep 17 00:00:00 2001 From fed5b4195b1b220e43964aa61d01634b307f09a4 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 15 Apr 2019 17:24:42 +0200 Date: Mon, 15 Apr 2019 17:24:42 +0200
Subject: [PATCH] v2v: -o rhv-upload: check whether the cluster exists Subject: [PATCH] v2v: -o rhv-upload: check whether the cluster exists
@ -57,5 +57,5 @@ index 8d1058d67..cc4224ccd 100644
def list(self, search=None, case_sensitive=False): def list(self, search=None, case_sensitive=False):
return [] return []
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From ae560843517da393492418bb61c3dee43e64af2c Mon Sep 17 00:00:00 2001 From fb5e3592a94b535abe686b65e51577ad0e36fcd0 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 12 Sep 2019 13:19:48 +0200 Date: Thu, 12 Sep 2019 13:19:48 +0200
Subject: [PATCH] v2v: -o rhv-upload: split vmcheck out of precheck Subject: [PATCH] v2v: -o rhv-upload: split vmcheck out of precheck
@ -260,5 +260,5 @@ index 000000000..fbb884b94
+ +
+# Otherwise everything is OK, exit with no error. +# Otherwise everything is OK, exit with no error.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From f0f00c5f0ea1a726dd2c8501bcc269211f30e2a8 Mon Sep 17 00:00:00 2001 From bb04eba9683c4143f9b5880238f006af3b13c05c Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 12 Sep 2019 14:17:36 +0200 Date: Thu, 12 Sep 2019 14:17:36 +0200
Subject: [PATCH] v2v: -o rhv-upload: change precheck script to return a JSON Subject: [PATCH] v2v: -o rhv-upload: change precheck script to return a JSON
@ -49,5 +49,5 @@ index d6a58f0fc..de8a66c05 100644
+ +
+json.dump(results, sys.stdout) +json.dump(results, sys.stdout)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From ccd327919ca1fed3e10fdd3567ede0dc8cd5d0c3 Mon Sep 17 00:00:00 2001 From 07348a7d9a7533b11513706a91d8eb8b91ce8518 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 12 Sep 2019 15:21:26 +0200 Date: Thu, 12 Sep 2019 15:21:26 +0200
Subject: [PATCH] v2v: -o rhv-upload: improve lookup of specified resources Subject: [PATCH] v2v: -o rhv-upload: improve lookup of specified resources
@ -165,5 +165,5 @@ index de8a66c05..725a8dc9e 100644
json.dump(results, sys.stdout) json.dump(results, sys.stdout)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 5883b1efc1c54742bed7f56f4b1522061321c8f9 Mon Sep 17 00:00:00 2001 From e7b94193f29d7a2715a860deb6db0708eef8c107 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 13 Sep 2019 12:40:34 +0200 Date: Fri, 13 Sep 2019 12:40:34 +0200
Subject: [PATCH] v2v: -o rhv-upload: tell whether a SD actually exists Subject: [PATCH] v2v: -o rhv-upload: tell whether a SD actually exists
@ -32,5 +32,5 @@ index 725a8dc9e..1b344ba27 100644
# (shouldn't happen, would fail on disk creation). # (shouldn't happen, would fail on disk creation).
raise RuntimeError("The storage domain %s is not attached to a DC" % raise RuntimeError("The storage domain %s is not attached to a DC" %
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 7baca2397e3e494fa727e63e9a2d34b81b78c298 Mon Sep 17 00:00:00 2001 From fbb0daf1ee29cda6d9117be2430c7d5d66463eca Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 16 Sep 2019 14:01:14 +0200 Date: Mon, 16 Sep 2019 14:01:14 +0200
Subject: [PATCH] v2v: add output#disk_copied hook Subject: [PATCH] v2v: add output#disk_copied hook
@ -72,5 +72,5 @@ index 277d8f2c7..63e809030 100644
(* Update the target_actual_size field in the target structure. *) (* Update the target_actual_size field in the target structure. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 9ae4cc6feaf66cf34b9cdf0cf2c251ed7ef61259 Mon Sep 17 00:00:00 2001 From 8f8fbe96bfcb6f284590ddd17b960247ec87bde9 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 16 Sep 2019 14:07:22 +0200 Date: Mon, 16 Sep 2019 14:07:22 +0200
Subject: [PATCH] v2v: -o rhv-upload: collect disks UUIDs right after copy Subject: [PATCH] v2v: -o rhv-upload: collect disks UUIDs right after copy
@ -80,5 +80,5 @@ index 19bdfcf05..382ad0d93 100644
let ovf = DOM.doc_to_string ovf in let ovf = DOM.doc_to_string ovf in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 9d7503382f33a7721378ec586ea718c63a0ec3b6 Mon Sep 17 00:00:00 2001 From 9d7b3e53fd4346bbb2abfb046df224de03f5b92f Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 19 Sep 2019 12:19:09 +0200 Date: Thu, 19 Sep 2019 12:19:09 +0200
Subject: [PATCH] v2v: -o rhv-upload: add -oo rhv-disk-uuid option Subject: [PATCH] v2v: -o rhv-upload: add -oo rhv-disk-uuid option
@ -197,5 +197,5 @@ index 651f61dae..e840ca78d 100644
If this option is given then virt-v2v will attempt to directly upload If this option is given then virt-v2v will attempt to directly upload
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 5ad1e7c160f5fe0d499d8d25116cb0e1692f1e93 Mon Sep 17 00:00:00 2001 From 971f3c3239a9d6433fa351ceb983db9cce2ab4ac Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 27 Sep 2019 13:56:42 +0200 Date: Fri, 27 Sep 2019 13:56:42 +0200
Subject: [PATCH] v2v: -o rhv-upload: make -oo rhv-cafile optional Subject: [PATCH] v2v: -o rhv-upload: make -oo rhv-cafile optional
@ -83,5 +83,5 @@ index e840ca78d..04a894268 100644
Set the RHV Cluster Name. If not given it uses C<Default>. Set the RHV Cluster Name. If not given it uses C<Default>.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1b409cee748cfb60cc87f8bfa80370048d8dd014 Mon Sep 17 00:00:00 2001 From 14f47e2084688af0d67807f2a5cfbd90759d8e7f Mon Sep 17 00:00:00 2001
From: Mike Latimer <mlatimer@suse.com> From: Mike Latimer <mlatimer@suse.com>
Date: Mon, 25 Mar 2019 14:38:00 +0000 Date: Mon, 25 Mar 2019 14:38:00 +0000
Subject: [PATCH] v2v: Fix default graphics driver for SUSE guests. Subject: [PATCH] v2v: Fix default graphics driver for SUSE guests.
@ -36,5 +36,5 @@ index b4b2f24c4..f9e811c8d 100644
let video_driver = match video with QXL -> "qxl" | Cirrus -> "cirrus" in let video_driver = match video with QXL -> "qxl" | Cirrus -> "cirrus" in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From bb09f8b1ab0fc3bda654e7d564d5010f9f24f660 Mon Sep 17 00:00:00 2001 From d875df20c30868db210396b64f6dcec2cb6d57b4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Dec 2018 16:09:42 +0000 Date: Tue, 4 Dec 2018 16:09:42 +0000
Subject: [PATCH] v2v: windows: Add a helper function for installing Powershell Subject: [PATCH] v2v: windows: Add a helper function for installing Powershell
@ -69,5 +69,5 @@ index 016ef2a78..6db7874b0 100644
+ Powershell script (the lines of code) as a firstboot script in + Powershell script (the lines of code) as a firstboot script in
+ the Windows VM. *) + the Windows VM. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 70e2215cd1f660dbad5a336bb611ad1b9cf1e60d Mon Sep 17 00:00:00 2001 From 77606e831f8891b65350effb6502d233d74f8cfc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Dec 2018 16:09:42 +0000 Date: Tue, 4 Dec 2018 16:09:42 +0000
Subject: [PATCH] v2v: Copy static IP address information over for Windows Subject: [PATCH] v2v: Copy static IP address information over for Windows
@ -419,5 +419,5 @@ index 9a555c3be..0642d158f 100644
=item B<--machine-readable>=format =item B<--machine-readable>=format
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From bcd376966fedca02a52ad61405e84de931a89899 Mon Sep 17 00:00:00 2001 From c31eaba4d6b36d90cfd835a4750e50f6a5256b73 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 29 Nov 2019 11:48:59 +0100 Date: Fri, 29 Nov 2019 11:48:59 +0100
Subject: [PATCH] New API: luks_uuid Subject: [PATCH] New API: luks_uuid
@ -83,5 +83,5 @@ index 80e3e6eab..055b6671a 100644
-506 -506
+507 +507
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 7f12a3ddad2b735dc6d06b7b3ef67aacc57defe2 Mon Sep 17 00:00:00 2001 From a7fe83c678520aca2289eab2af6d8aebdf225bb7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Nov 2019 18:15:44 +0000 Date: Tue, 12 Nov 2019 18:15:44 +0000
Subject: [PATCH] options: Fix segfault when multiple --key parameters given. Subject: [PATCH] options: Fix segfault when multiple --key parameters given.
@ -43,5 +43,5 @@ index 7f689866b..f783066ff 100644
error (EXIT_FAILURE, errno, "realloc"); error (EXIT_FAILURE, errno, "realloc");
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d2ca3f2f9bd9f26cacef2cf2a38e8ac18484d8e4 Mon Sep 17 00:00:00 2001 From c74aa1326061723bd87e599699096d1085472772 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 26 Nov 2019 12:12:45 +0000 Date: Tue, 26 Nov 2019 12:12:45 +0000
Subject: [PATCH] options: Simplify selector parsing for --key options. Subject: [PATCH] options: Simplify selector parsing for --key options.
@ -81,5 +81,5 @@ index f783066ff..74b549731 100644
error (EXIT_FAILURE, errno, "strdup"); error (EXIT_FAILURE, errno, "strdup");
break; break;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d3c6f71eed46df3f9ec376359433d9c4b9830860 Mon Sep 17 00:00:00 2001 From 0267ad921c3be8a780342b052264666cef2cc1b1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Nov 2019 17:50:17 +0000 Date: Tue, 12 Nov 2019 17:50:17 +0000
Subject: [PATCH] options: Allow multiple --key parameters. Subject: [PATCH] options: Allow multiple --key parameters.
@ -13,10 +13,10 @@ would try "trykey1" and "trykey2" against /dev/sda1.
(cherry picked from commit c10c8baedb88e7c2988a01b70fc5f81fa8e4885c (cherry picked from commit c10c8baedb88e7c2988a01b70fc5f81fa8e4885c
in libguestfs-common) in libguestfs-common)
--- ---
common/options/decrypt.c | 37 +++++++++++++++++++++++++-------- common/options/decrypt.c | 35 ++++++++++++++++++++++++-------
common/options/keys.c | 45 +++++++++++++++++++++++++++++++--------- common/options/keys.c | 45 +++++++++++++++++++++++++++++++---------
common/options/options.h | 6 ++++-- common/options/options.h | 6 ++++--
3 files changed, 67 insertions(+), 21 deletions(-) 3 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/common/options/decrypt.c b/common/options/decrypt.c diff --git a/common/options/decrypt.c b/common/options/decrypt.c
index 234163d8c..3511d9fe9 100644 index 234163d8c..3511d9fe9 100644
@ -53,10 +53,9 @@ index 234163d8c..3511d9fe9 100644
- */ - */
- if (guestfs_luks_open (g, partitions[i], key, mapname) == -1) - if (guestfs_luks_open (g, partitions[i], key, mapname) == -1)
- exit (EXIT_FAILURE); - exit (EXIT_FAILURE);
-
+ CLEANUP_FREE_STRING_LIST char **keys = get_keys (ks, partitions[i]); + CLEANUP_FREE_STRING_LIST char **keys = get_keys (ks, partitions[i]);
+ assert (guestfs_int_count_strings (keys) > 0); + assert (guestfs_int_count_strings (keys) > 0);
+
+ /* Try each key in turn. */ + /* Try each key in turn. */
+ for (j = 0; keys[j] != NULL; ++j) { + for (j = 0; keys[j] != NULL; ++j) {
+ /* XXX Should we call guestfs_luks_open_ro if readonly flag + /* XXX Should we call guestfs_luks_open_ro if readonly flag
@ -177,5 +176,5 @@ index 6fadf1e76..510e8a8a9 100644
extern struct key_store *key_store_import_key (struct key_store *ks, const struct key_store_key *key); extern struct key_store *key_store_import_key (struct key_store *ks, const struct key_store_key *key);
extern void free_key_store (struct key_store *ks); extern void free_key_store (struct key_store *ks);
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 3afce3e84c79d7fbca4d6eeb76f237090c5528c9 Mon Sep 17 00:00:00 2001 From dd28c27df30c5a41bec97181a297d4df95aad0ab Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 29 Nov 2019 12:06:20 +0100 Date: Fri, 29 Nov 2019 12:06:20 +0100
Subject: [PATCH] options: rename key.device as key.id Subject: [PATCH] options: rename key.device as key.id
@ -433,5 +433,5 @@ index 0642d158f..8c2867814 100644
Read the passphrase from F<FILENAME>. Read the passphrase from F<FILENAME>.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From abb0a1dcc6e15130c334713d0716e223e5fc494d Mon Sep 17 00:00:00 2001 From 88c4dc1e5b9f9e545c89e8b8ee6878f57df3139c Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 29 Nov 2019 12:07:13 +0100 Date: Fri, 29 Nov 2019 12:07:13 +0100
Subject: [PATCH] options: allow a UUID as identifier for --key Subject: [PATCH] options: allow a UUID as identifier for --key
@ -309,5 +309,5 @@ index 8c2867814..25041d0ec 100644
=over 4 =over 4
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 34b2da989021994389b6392fca06590424b7c975 Mon Sep 17 00:00:00 2001 From 14c456c0f5d9caad9aedc5abb7b6a025ac09e7bd Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 18 Dec 2019 12:12:26 +0100 Date: Wed, 18 Dec 2019 12:12:26 +0100
Subject: [PATCH] docs: remove paragraph about VMware tools on Windows Subject: [PATCH] docs: remove paragraph about VMware tools on Windows
@ -78,5 +78,5 @@ index 3acdd773e..16ddb045f 100644
The libvirt URI of a vCenter server looks something like this: The libvirt URI of a vCenter server looks something like this:
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 3dc8b808bdc992fb72372ece84b45644bef2c206 Mon Sep 17 00:00:00 2001 From 931846b8f08e5e763141cadfc5e9b194b69303e3 Mon Sep 17 00:00:00 2001
From: Martin Kletzander <mkletzan@redhat.com> From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 24 Feb 2020 13:12:03 +0100 Date: Mon, 24 Feb 2020 13:12:03 +0100
Subject: [PATCH] mlcustomize: Trim whitespaces from commands read from file Subject: [PATCH] mlcustomize: Trim whitespaces from commands read from file
@ -25,5 +25,5 @@ index c278347c1..0b256e2d2 100644
fun line -> fun line ->
String.length line > 0 && line.[0] <> '#' String.length line > 0 && line.[0] <> '#'
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From a4433085bf38719bd22a7cfe507c503885c839f2 Mon Sep 17 00:00:00 2001 From 7cfbc1e0fac86b1139c59945f74eab8906ec18bc Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 4 Feb 2020 14:39:39 +0000 Date: Tue, 4 Feb 2020 14:39:39 +0000
Subject: [PATCH] openstack: Increase Cinder volume attach timeout to 5 minutes Subject: [PATCH] openstack: Increase Cinder volume attach timeout to 5 minutes
@ -39,5 +39,5 @@ index d187f1d5d..bebf9af18 100644
attach_timeout attach_timeout
(fun () -> (fun () ->
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d02694e659ebe1ecad29f8461d87eda6a1f8faa2 Mon Sep 17 00:00:00 2001 From 303ecfdf662a2fd80b115a1e2f20560e6f97d953 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 19 Sep 2019 09:52:41 +0200 Date: Thu, 19 Sep 2019 09:52:41 +0200
Subject: [PATCH] v2v: -o rhv-upload: check for a valid image transfer right Subject: [PATCH] v2v: -o rhv-upload: check for a valid image transfer right
@ -31,5 +31,5 @@ index 6ec74a5d4..7f62b4e3b 100644
# Now we have permission to start the transfer. # Now we have permission to start the transfer.
if params['rhv_direct']: if params['rhv_direct']:
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 200a365f20d5d8a3ddfe713e9bbe938206e43e9a Mon Sep 17 00:00:00 2001 From 7a4b425471223234fde5a65ca5fe5abc87fb0276 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nirsof@gmail.com> From: Nir Soffer <nirsof@gmail.com>
Date: Mon, 18 Nov 2019 01:04:24 +0200 Date: Mon, 18 Nov 2019 01:04:24 +0200
Subject: [PATCH] rhv-upload: Check status more frequently Subject: [PATCH] rhv-upload: Check status more frequently
@ -45,5 +45,5 @@ index 7f62b4e3b..f13405df1 100644
# Now we have permission to start the transfer. # Now we have permission to start the transfer.
if params['rhv_direct']: if params['rhv_direct']:
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 7fd1c3be6bb744a93eff6ae1a9cfcdd9280cf247 Mon Sep 17 00:00:00 2001 From 8659766f3559177edf60f7ed6e1ed834f5d4d4a0 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nirsof@gmail.com> From: Nir Soffer <nirsof@gmail.com>
Date: Mon, 18 Nov 2019 23:53:46 +0200 Date: Mon, 18 Nov 2019 23:53:46 +0200
Subject: [PATCH] rhv-upload: Show transfer id in error message Subject: [PATCH] rhv-upload: Show transfer id in error message
@ -27,5 +27,5 @@ index f13405df1..9b83d1cfa 100644
# Now we have permission to start the transfer. # Now we have permission to start the transfer.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d132157c9e0b6b990cd989662f5499644508de97 Mon Sep 17 00:00:00 2001 From 79a7e239ca55bffb2af059e1cfe07206d37cb858 Mon Sep 17 00:00:00 2001
From: Nir Soffer <nsoffer@redhat.com> From: Nir Soffer <nsoffer@redhat.com>
Date: Thu, 28 Nov 2019 20:36:32 +0200 Date: Thu, 28 Nov 2019 20:36:32 +0200
Subject: [PATCH] rhv-upload: Fix waiting for transfer Subject: [PATCH] rhv-upload: Fix waiting for transfer
@ -46,7 +46,6 @@ index 9b83d1cfa..14d4e37fb 100644
endt = time.time() + timeout endt = time.time() + timeout
while True: while True:
- transfer = transfer_service.get() - transfer = transfer_service.get()
- if transfer.phase != types.ImageTransferPhase.INITIALIZING:
+ time.sleep(1) + time.sleep(1)
+ try: + try:
+ transfer = transfer_service.get() + transfer = transfer_service.get()
@ -65,10 +64,11 @@ index 9b83d1cfa..14d4e37fb 100644
+ "transfer %s was paused by system" % transfer.id) + "transfer %s was paused by system" % transfer.id)
+ +
+ if transfer.phase == types.ImageTransferPhase.TRANSFERRING: + if transfer.phase == types.ImageTransferPhase.TRANSFERRING:
break + break
- if time.time() > endt:
+ +
+ if transfer.phase != types.ImageTransferPhase.INITIALIZING: if transfer.phase != types.ImageTransferPhase.INITIALIZING:
- break
- if time.time() > endt:
+ transfer_service.cancel() + transfer_service.cancel()
raise RuntimeError( raise RuntimeError(
- "timed out waiting for transfer %s status != INITIALIZING" - "timed out waiting for transfer %s status != INITIALIZING"
@ -85,5 +85,5 @@ index 9b83d1cfa..14d4e37fb 100644
# Now we have permission to start the transfer. # Now we have permission to start the transfer.
if params['rhv_direct']: if params['rhv_direct']:
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 8d39f6bcf21a7c76e29c270b9304c978bbf2e8ba Mon Sep 17 00:00:00 2001 From 48718639cc7fc5f93260b00553397ccb3faa7bbc Mon Sep 17 00:00:00 2001
From: Nir Soffer <nirsof@gmail.com> From: Nir Soffer <nirsof@gmail.com>
Date: Fri, 1 Nov 2019 22:56:18 +0100 Date: Fri, 1 Nov 2019 22:56:18 +0100
Subject: [PATCH] v2v: Optimize convert for images with small holes Subject: [PATCH] v2v: Optimize convert for images with small holes
@ -80,5 +80,5 @@ index d7a868659..a81a2320a 100644
let start_time = gettimeofday () in let start_time = gettimeofday () in
if run_command cmd <> 0 then if run_command cmd <> 0 then
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 49623c945c93b878d13c0539eddf2d625f5aeb3c Mon Sep 17 00:00:00 2001 From fdf461e88c464de697c14adea2e8e61644811844 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 15 Jan 2020 11:12:17 +0000 Date: Wed, 15 Jan 2020 11:12:17 +0000
Subject: [PATCH] v2v: -o rhv-upload: Make -oo rhv-cafile optional in all cases Subject: [PATCH] v2v: -o rhv-upload: Make -oo rhv-cafile optional in all cases
@ -45,5 +45,5 @@ index 04a894268..4520c9184 100644
=item I<-oo rhv-cluster=>C<CLUSTERNAME> =item I<-oo rhv-cluster=>C<CLUSTERNAME>
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 03b67600b98e8af2ea199f8643b2993c1effc60f Mon Sep 17 00:00:00 2001 From 99de55c364d95ae50a6d6cd6865e52a6737738c5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 15 Jan 2020 10:55:27 +0000 Date: Wed, 15 Jan 2020 10:55:27 +0000
Subject: [PATCH] docs: Fix update-crypto-policies command (RHBZ#1791257). Subject: [PATCH] docs: Fix update-crypto-policies command (RHBZ#1791257).
@ -29,5 +29,5 @@ index 4bb5d2dc2..9fd5065f1 100644
=head2 Test libvirt connection to remote Xen host =head2 Test libvirt connection to remote Xen host
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From ebc6680ab1030c763a6c4764f6045734c41f0e7f Mon Sep 17 00:00:00 2001 From 2a08f0f71b92a2489b873c7cef5aae2b2cec88d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Thu, 16 Jan 2020 16:05:10 +0100 Date: Thu, 16 Jan 2020 16:05:10 +0100
Subject: [PATCH] add versioned directory for guest agent on EL8 Subject: [PATCH] add versioned directory for guest agent on EL8
@ -31,5 +31,5 @@ index a6dc29f2c..7be63a316 100644
| "sles" | "suse-based" | "opensuse" -> Some "lp151" | "sles" | "suse-based" | "opensuse" -> Some "lp151"
| _ -> None in | _ -> None in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1d0a22aa3f950330b0cf9c5e874642b5a02edf17 Mon Sep 17 00:00:00 2001 From 66cd34e84e41d3f70e95fa745637ba6eb4779aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Fri, 8 Feb 2019 11:44:41 +0100 Date: Fri, 8 Feb 2019 11:44:41 +0100
Subject: [PATCH] v2v: fix path to source when copying files from guest tools Subject: [PATCH] v2v: fix path to source when copying files from guest tools
@ -25,17 +25,17 @@ index 7be63a316..70f0bf09d 100644
and copy_from_virtio_win g inspect srcdir destdir filter missing = and copy_from_virtio_win g inspect srcdir destdir filter missing =
let ret = ref [] in let ret = ref [] in
if is_directory virtio_win then ( if is_directory virtio_win then (
- let dir = virtio_win // srcdir in
- debug "windows: copy_from_virtio_win: guest tools source directory %s" dir;
+ debug "windows: copy_from_virtio_win: guest tools source directory %s" + debug "windows: copy_from_virtio_win: guest tools source directory %s"
+ virtio_win; + virtio_win;
+
let dir = virtio_win // srcdir in
- debug "windows: copy_from_virtio_win: guest tools source directory %s" dir;
-
- if not (is_directory srcdir) then missing () - if not (is_directory srcdir) then missing ()
+ let dir = virtio_win // srcdir in
+ if not (is_directory dir) then missing () + if not (is_directory dir) then missing ()
else ( else (
let cmd = sprintf "cd %s && find -L -type f" (quote dir) in let cmd = sprintf "cd %s && find -L -type f" (quote dir) in
let paths = external_command cmd in let paths = external_command cmd in
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From c664b50ab691a85d8a827ba51ea767744da548c3 Mon Sep 17 00:00:00 2001 From cf06f1d264a8832aa31265da5b2a28547b0faf49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Tue, 8 Oct 2019 13:16:38 +0200 Date: Tue, 8 Oct 2019 13:16:38 +0200
Subject: [PATCH] v2v: windows: install QEMU Guest Agent MSI Subject: [PATCH] v2v: windows: install QEMU Guest Agent MSI
@ -115,5 +115,5 @@ index ae3b7e865..731dbd6f0 100644
(* The following function is only exported for unit tests. *) (* The following function is only exported for unit tests. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From b5e6c21a8241b3040c772f5ecd93a23a1896dc53 Mon Sep 17 00:00:00 2001 From ab6076b6fe33cfe9a7b5d29bea5b8c24553894cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Wed, 5 Feb 2020 14:11:36 +0100 Date: Wed, 5 Feb 2020 14:11:36 +0100
Subject: [PATCH] windows: small tweaks of qemu-ga firstboot script Subject: [PATCH] windows: small tweaks of qemu-ga firstboot script
@ -38,5 +38,5 @@ index bdb0092c3..43c1f85de 100644
Firstboot.add_firstboot_script g inspect.i_root Firstboot.add_firstboot_script g inspect.i_root
("install " ^ msi_path) fb_script; ("install " ^ msi_path) fb_script;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 34305aa93b6107c0aa9efcb1197efae3675a4ffe Mon Sep 17 00:00:00 2001 From 52a4f93f1d8bb150167885c94df890af0d00d76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Wed, 5 Feb 2020 14:11:35 +0100 Date: Wed, 5 Feb 2020 14:11:35 +0100
Subject: [PATCH] windows: fix detection of qemu-ga installer on RHV Subject: [PATCH] windows: fix detection of qemu-ga installer on RHV
@ -39,5 +39,5 @@ index ea7e5c02d..9a7297344 100644
(* The following function is only exported for unit tests. *) (* The following function is only exported for unit tests. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 34a8b1a7115aeb95812ae8ee182055de757f3892 Mon Sep 17 00:00:00 2001 From 898b0654a0c4ef55af147a5ca081d2399ce05855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com> From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
Date: Thu, 5 Mar 2020 15:37:13 +0100 Date: Thu, 5 Mar 2020 15:37:13 +0100
Subject: [PATCH] windows: delay installation of qemu-ga MSI Subject: [PATCH] windows: delay installation of qemu-ga MSI
@ -63,5 +63,5 @@ index 43c1f85de..088cd33d9 100644
("install " ^ msi_path) fb_script; ("install " ^ msi_path) fb_script;
) files ) files
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 052549a055bbedc402418bc52bcbfa3bfcb97952 Mon Sep 17 00:00:00 2001 From a13f9b06370a6fef6f671f5aa7c23df0f0fd542e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 12 Mar 2020 13:57:06 +0000 Date: Thu, 12 Mar 2020 13:57:06 +0000
Subject: [PATCH] daemon: xattr: Refactor code which splits attr names from the Subject: [PATCH] daemon: xattr: Refactor code which splits attr names from the
@ -279,5 +279,5 @@ index bc5c2df97..3e1144963 100644
} }
} }
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1c976cc5d1add98eee09c38ac8e01634c94f3778 Mon Sep 17 00:00:00 2001 From 2e5a8775941b5767abcfcf93f9f84c9560e0f378 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 12 Mar 2020 13:59:05 +0000 Date: Thu, 12 Mar 2020 13:59:05 +0000
Subject: [PATCH] daemon: Add filter_list utility function. Subject: [PATCH] daemon: Add filter_list utility function.
@ -80,5 +80,5 @@ index c3f88bcab..e87233d0f 100644
* Skip leading and trailing whitespace, updating the original string * Skip leading and trailing whitespace, updating the original string
* in-place. * in-place.
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From fabaf7328a449344028903811674787dc685084b Mon Sep 17 00:00:00 2001 From fb3136e8abe5fec9e8a749e5879b75c696f7ba0e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 12 Mar 2020 14:40:05 +0000 Date: Thu, 12 Mar 2020 14:40:05 +0000
Subject: [PATCH] daemon: xattr: Filter out user.WofCompressedData from xattrs Subject: [PATCH] daemon: xattr: Filter out user.WofCompressedData from xattrs
@ -116,5 +116,5 @@ index 3e1144963..43e49384f 100644
goto error; goto error;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 1519dfe45d35dbc1f273d468fca3ea77d6cfdfad Mon Sep 17 00:00:00 2001 From 9a8246e91ac0fa38d96691dc6025cb8b117f9cb2 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 4 May 2020 15:14:46 +0200 Date: Mon, 4 May 2020 15:14:46 +0200
Subject: [PATCH] mltools: add run_in_guest_command helper Subject: [PATCH] mltools: add run_in_guest_command helper
@ -91,5 +91,5 @@ index ab70f583e..102abff4d 100644
+ [?logfile] is an optional file in the guest to where redirect + [?logfile] is an optional file in the guest to where redirect
+ stdout and stderr of the command. *) + stdout and stderr of the command. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 63d711246f7e86c838c4471bec538a40abffbfb8 Mon Sep 17 00:00:00 2001 From 02f8969558ecadc13726068ccb732595c5d29565 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 4 May 2020 11:55:41 +0200 Date: Mon, 4 May 2020 11:55:41 +0200
Subject: [PATCH] customize: port do_run to run_in_guest_command Subject: [PATCH] customize: port do_run to run_in_guest_command
@ -8,8 +8,8 @@ the guest.
(cherry picked from commit b25e3495f522378f59d201526d7d2d02c2bf6f3f) (cherry picked from commit b25e3495f522378f59d201526d7d2d02c2bf6f3f)
--- ---
customize/customize_run.ml | 48 ++++++-------------------------------- customize/customize_run.ml | 46 +++++---------------------------------
1 file changed, 7 insertions(+), 41 deletions(-) 1 file changed, 6 insertions(+), 40 deletions(-)
diff --git a/customize/customize_run.ml b/customize/customize_run.ml diff --git a/customize/customize_run.ml b/customize/customize_run.ml
index 3eacdaca0..f2ee20413 100644 index 3eacdaca0..f2ee20413 100644
@ -37,7 +37,9 @@ index 3eacdaca0..f2ee20413 100644
+ let guest_arch = g#inspect_get_arch root in + let guest_arch = g#inspect_get_arch root in
error (f_"host cpu (%s) and guest arch (%s) are not compatible, so you cannot use command line options that involve running commands in the guest. Use --firstboot scripts instead.") error (f_"host cpu (%s) and guest arch (%s) are not compatible, so you cannot use command line options that involve running commands in the guest. Use --firstboot scripts instead.")
- Guestfs_config.host_cpu guest_arch; - Guestfs_config.host_cpu guest_arch;
- + Guestfs_config.host_cpu guest_arch
+ in
- (* Add a prologue to the scripts: - (* Add a prologue to the scripts:
- * - Pass environment variables through from the host. - * - Pass environment variables through from the host.
- * - Send stdout and stderr to a log file so we capture all output - * - Send stdout and stderr to a log file so we capture all output
@ -70,14 +72,11 @@ index 3eacdaca0..f2ee20413 100644
- -
- debug "running command:\n%s" cmd; - debug "running command:\n%s" cmd;
- try ignore (g#sh cmd) - try ignore (g#sh cmd)
+ Guestfs_config.host_cpu guest_arch
+ in
+
+ try + try
+ run_in_guest_command g root ~logfile ~incompatible_fn cmd + run_in_guest_command g root ~logfile ~incompatible_fn cmd
with with
G.Error msg -> G.Error msg ->
debug_logfile (); debug_logfile ();
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From f3fa23fd9db0723bbeccffc79ce12a707d284643 Mon Sep 17 00:00:00 2001 From f4613f408e4584741d08aa39c950de304f5e18db Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 4 May 2020 12:05:18 +0200 Date: Mon, 4 May 2020 12:05:18 +0200
Subject: [PATCH] sysprep: add a update_system_ca_store side effect Subject: [PATCH] sysprep: add a update_system_ca_store side effect
@ -134,5 +134,5 @@ index a57a0d876..82779620e 100644
+(** Update the system CA store on the guest for the specified root +(** Update the system CA store on the guest for the specified root
+ (which is fully mounted). *) + (which is fully mounted). *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d78ec54de6b5ba915445d668ebf292bc9ff38a9a Mon Sep 17 00:00:00 2001 From 315bf96d182d5626e5935aaf57b0787fedffc62b Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Mon, 4 May 2020 12:15:43 +0200 Date: Mon, 4 May 2020 12:15:43 +0200
Subject: [PATCH] sysprep: ca-certificates: request system CA store update Subject: [PATCH] sysprep: ca-certificates: request system CA store update
@ -38,5 +38,5 @@ index e481cebf8..a2b7986c1 100644
} }
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From fa3ff43b763d191ae542594f75987a3686c847b2 Mon Sep 17 00:00:00 2001 From 90bb3cd1793275da50d509570d07d279989e2c45 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 7 May 2020 13:53:21 +0200 Date: Thu, 7 May 2020 13:53:21 +0200
Subject: [PATCH] sysprep: add IPA offline unenrollment (RHBZ#1789592) Subject: [PATCH] sysprep: add IPA offline unenrollment (RHBZ#1789592)
@ -103,5 +103,5 @@ index 000000000..6e64a754a
+ +
+let () = register_operation op +let () = register_operation op
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 7700915a65bfed5f6a9b80d63daf572bff33e154 Mon Sep 17 00:00:00 2001 From c8dc0b229b3cbcb72ca90ddf025087586a7d2e38 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Thu, 7 May 2020 14:02:30 +0200 Date: Thu, 7 May 2020 14:02:30 +0200
Subject: [PATCH] sysprep: add Kerberos keytab file removal Subject: [PATCH] sysprep: add Kerberos keytab file removal
@ -77,5 +77,5 @@ index 000000000..cb3023353
+ +
+let () = register_operation op +let () = register_operation op
-- --
2.25.4 2.18.4

View File

@ -0,0 +1,35 @@
From 318aa975b212c9b8778606ce440c95682f99c700 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 19 May 2020 12:14:18 +0200
Subject: [PATCH] vCenter: fix parsing of HTTP status string (RHBZ#1837328)
vCenter 7 answers with an HTTP/2 status string, so we cannot extract
the status code from it by using fixed positions in that string.
Hence, pick the status code by reading what's after the whitespace.
Tested with vCenter 6.5 and 7.
(cherry picked from commit d2aa82317964d62fcc8dc7b6737773003d04b998
in virt-v2v)
---
v2v/vCenter.ml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml
index b1b9f9b15..b15e2f7d0 100644
--- a/v2v/vCenter.ml
+++ b/v2v/vCenter.ml
@@ -213,7 +213,9 @@ and fetch_headers_from_url password_file uri sslverify https_url =
| [] ->
dump_response stderr;
error (f_"vcenter: no status code in output of curl command. Is curl installed?")
- | ss -> String.sub (List.hd (List.rev ss)) 9 3 in
+ | ss ->
+ let s = List.hd (List.rev ss) in
+ String.sub s (String.index s ' ' + 1) 3 in
let headers =
List.map (
--
2.18.4

View File

@ -1,4 +1,4 @@
From 0647a3a475c647d363205bdbdaca8a79614460c3 Mon Sep 17 00:00:00 2001 From a7fefab912d97962fb77f0f57799b7b70634376c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 21 Dec 2012 15:50:11 +0000 Date: Fri, 21 Dec 2012 15:50:11 +0000
Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980). Subject: [PATCH] RHEL 8: Remove libguestfs live (RHBZ#798980).
@ -34,5 +34,5 @@ index 4794a7b13..993b83601 100644
static int static int
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 3341114876c1a2df330b68d15026ba266d557d6e Mon Sep 17 00:00:00 2001 From 683153015b95a7b6d4979d48736c80e366986c72 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 18 Jul 2013 18:31:53 +0100 Date: Thu, 18 Jul 2013 18:31:53 +0100
Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710). Subject: [PATCH] RHEL 8: Remove 9p APIs from RHEL (RHBZ#921710).
@ -368,5 +368,5 @@ index 79f4b8c56..b99333d0d 100644
gobject/src/optargs-ntfsclone_out.c gobject/src/optargs-ntfsclone_out.c
gobject/src/optargs-ntfsfix.c gobject/src/optargs-ntfsfix.c
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 717d8b6a2d0bb559684a436b4f1bc115ac36d3dd Mon Sep 17 00:00:00 2001 From 336961659225584add638442cc0cf933803e008e Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Jul 2013 14:47:56 +0100 Date: Mon, 29 Jul 2013 14:47:56 +0100
Subject: [PATCH] RHEL 8: Disable unsupported remote drive protocols Subject: [PATCH] RHEL 8: Disable unsupported remote drive protocols
@ -605,5 +605,5 @@ index 19dd60a2f..583e031bd 100755
-grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail -grep -sq -- '-drive file=ssh://rich@example.com/disk.img,' "$DEBUG_QEMU_FILE" || fail
-rm "$DEBUG_QEMU_FILE" -rm "$DEBUG_QEMU_FILE"
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 3d30c10f351b61c9c9aae54fd8a250af5cd8a61a Mon Sep 17 00:00:00 2001 From cbb6a42b9074ed78c74ddefee4ec7571132a4d24 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 19 Sep 2014 13:38:20 +0100 Date: Fri, 19 Sep 2014 13:38:20 +0100
Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197). Subject: [PATCH] RHEL 8: Remove User-Mode Linux (RHBZ#1144197).
@ -68,5 +68,5 @@ index da20c17d9..a5e0e8179 100644
static int static int
shutdown_uml (guestfs_h *g, void *datav, int check_for_errors) shutdown_uml (guestfs_h *g, void *datav, int check_for_errors)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From fbc5eea00f9f9cd27a1c53913e58f8a4937fd067 Mon Sep 17 00:00:00 2001 From a2c0ccac7b1bcb451987b6c1b85e3a5ee48b8949 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Sep 2014 19:14:43 +0100 Date: Sun, 28 Sep 2014 19:14:43 +0100
Subject: [PATCH] RHEL 8: v2v: Select correct qemu binary for -o qemu mode Subject: [PATCH] RHEL 8: v2v: Select correct qemu binary for -o qemu mode
@ -29,5 +29,5 @@ index 1f6798aaf..8665d7b5c 100644
let flag = Qemuopts.flag cmd let flag = Qemuopts.flag cmd
and arg = Qemuopts.arg cmd and arg = Qemuopts.arg cmd
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From ec11bac4af65a54400739e476bf90fe815073619 Mon Sep 17 00:00:00 2001 From 4190aec225ec3bf4d1e39fbde89131d4c8a6a9a7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Sep 2014 10:50:27 +0100 Date: Tue, 30 Sep 2014 10:50:27 +0100
Subject: [PATCH] RHEL 8: v2v: Disable the --qemu-boot option (RHBZ#1147313). Subject: [PATCH] RHEL 8: v2v: Disable the --qemu-boot option (RHBZ#1147313).
@ -101,5 +101,5 @@ index 25041d0ec..bd606592b 100644
=item B<--quiet> =item B<--quiet>
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 0abf9c24495d577d20fe0d972212dec4eb2b2e73 Mon Sep 17 00:00:00 2001 From 1b819b67c2cc39e4728c4299749f1dd439937743 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 24 Oct 2014 16:33:50 +0100 Date: Fri, 24 Oct 2014 16:33:50 +0100
Subject: [PATCH] RHEL 8: Disable alternate Augeas lenses. Subject: [PATCH] RHEL 8: Disable alternate Augeas lenses.
@ -56,5 +56,5 @@ index 453251337..5bbfffa2d 100644
return 0; return 0;
} }
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From c5db36832644bb6330f90670e799d59cef3d6771 Mon Sep 17 00:00:00 2001 From 74d6c774c52ad7d6dd1746a4d11eb7668e826374 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Apr 2015 09:45:41 -0400 Date: Fri, 24 Apr 2015 09:45:41 -0400
Subject: [PATCH] RHEL 8: Fix list of supported sound cards to match RHEL qemu Subject: [PATCH] RHEL 8: Fix list of supported sound cards to match RHEL qemu
@ -30,5 +30,5 @@ index 74b501f81..21e9c9c15 100644
(* Find the UEFI firmware. *) (* Find the UEFI firmware. *)
let find_uefi_firmware guest_arch = let find_uefi_firmware guest_arch =
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From dcd37841d19c43f5874b11a1f81e578df49d58e6 Mon Sep 17 00:00:00 2001 From 434dd6ac0634211a48dd8d46c6efa68ef1270ae5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 7 Jul 2015 09:28:03 -0400 Date: Tue, 7 Jul 2015 09:28:03 -0400
Subject: [PATCH] RHEL 8: Reject use of libguestfs-winsupport features except Subject: [PATCH] RHEL 8: Reject use of libguestfs-winsupport features except
@ -36,5 +36,5 @@ index 86f7d89a3..b5bb99f53 100644
* as a progress bar hint. * as a progress bar hint.
*) *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From e17bc8207168c45b2e887decc0a19b5689798b0b Mon Sep 17 00:00:00 2001 From dbbd9c3d94eeb1ad700bc0745a245da1fb71e1b7 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 30 Aug 2015 03:21:57 -0400 Date: Sun, 30 Aug 2015 03:21:57 -0400
Subject: [PATCH] RHEL 8: Fix tests for libguestfs-winsupport. Subject: [PATCH] RHEL 8: Fix tests for libguestfs-winsupport.
@ -89,5 +89,5 @@ index f1da222a9..ff94fe39b 100755
# We also update the Registry several times, for firstboot, and (ONLY # We also update the Registry several times, for firstboot, and (ONLY
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From fbda37c7b2819300b6b09d2b0b84cec547fdd00e Mon Sep 17 00:00:00 2001 From e6a6af387981b849349c72e7d5c367b944dbd317 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 21 Sep 2015 13:12:43 -0400 Date: Mon, 21 Sep 2015 13:12:43 -0400
Subject: [PATCH] RHEL 8: tests: Disable daemon tests that require the 'unix' Subject: [PATCH] RHEL 8: tests: Disable daemon tests that require the 'unix'
@ -24,5 +24,5 @@ index 053cad3e1..0d723fee4 100644
TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS_ENVIRONMENT = $(top_builddir)/run --test
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From d6e49b3cd141cdf573e1e4f59d248007f3658435 Mon Sep 17 00:00:00 2001 From 153dc4ea922875c582490bc4e0ccad227aa62558 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 14 Jan 2016 11:53:42 -0500 Date: Thu, 14 Jan 2016 11:53:42 -0500
Subject: [PATCH] RHEL 8: v2v: Disable the virt-v2v --in-place option. Subject: [PATCH] RHEL 8: v2v: Disable the virt-v2v --in-place option.
@ -282,5 +282,5 @@ index bd606592b..092d88635 100644
The I<--machine-readable> option can be used to make the output more The I<--machine-readable> option can be used to make the output more
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From ce7a5cc371d6f6e0f96c2cd897245a2e83839c20 Mon Sep 17 00:00:00 2001 From 68d6b9b268ccc6fd12c94acc7e0d3aa130eaee95 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Mar 2017 14:21:37 +0100 Date: Thu, 2 Mar 2017 14:21:37 +0100
Subject: [PATCH] RHEL 8: v2v: -i disk: force VNC as display (RHBZ#1372671) Subject: [PATCH] RHEL 8: v2v: -i disk: force VNC as display (RHBZ#1372671)
@ -22,5 +22,5 @@ index 8321a2a8c..6bd9f43f8 100644
s_video = None; s_video = None;
s_sound = None; s_sound = None;
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 0cf211cc08f0f0b886021dc10b52a03aa2d22b1f Mon Sep 17 00:00:00 2001 From 9c3434985b67dd6387f7d358753b289ae43e54fe Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Wed, 8 Mar 2017 11:03:40 +0100 Date: Wed, 8 Mar 2017 11:03:40 +0100
Subject: [PATCH] RHEL 8: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) Subject: [PATCH] RHEL 8: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)
@ -22,5 +22,5 @@ index 9fd5065f1..c3c20a6b6 100644
=head1 INPUT FROM XEN =head1 INPUT FROM XEN
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 2009eb2439c8112789728856f08a9f92c6883ad8 Mon Sep 17 00:00:00 2001 From 24c75d5ae2ca66fc683e98d32f7949a35caf6260 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 14 May 2018 10:16:58 +0100 Date: Mon, 14 May 2018 10:16:58 +0100
Subject: [PATCH] RHEL 8: v2v: rhv-upload: Remove restriction on -oa sparse. Subject: [PATCH] RHEL 8: v2v: rhv-upload: Remove restriction on -oa sparse.
@ -87,5 +87,5 @@ index 4520c9184..f6579a48e 100644
A file containing a password to be used when connecting to the oVirt A file containing a password to be used when connecting to the oVirt
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From 58a4b8f9a1a8590728dd169f8c481171ab859b7d Mon Sep 17 00:00:00 2001 From cb6f386f75f210bdc97133a026e2fdb29a2fe28d Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Sun, 16 Dec 2018 16:42:46 +0100 Date: Sun, 16 Dec 2018 16:42:46 +0100
Subject: [PATCH] RHEL 8: use platform-python Subject: [PATCH] RHEL 8: use platform-python
@ -23,5 +23,5 @@ index 3159373a1..f2c00c40f 100644
type script = { type script = {
tmpdir : string; (* Temporary directory. *) tmpdir : string; (* Temporary directory. *)
-- --
2.25.4 2.18.4

View File

@ -1,4 +1,4 @@
From a53675a2b1142654fa3cacc775e44692419d10e0 Mon Sep 17 00:00:00 2001 From ada9209ada5511a7876ca9c0e1183bde217adbae Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 26 Mar 2019 09:42:25 +0100 Date: Tue, 26 Mar 2019 09:42:25 +0100
Subject: [PATCH] RHEL 8: point to KB for supported v2v hypervisors/guests Subject: [PATCH] RHEL 8: point to KB for supported v2v hypervisors/guests
@ -121,5 +121,5 @@ index a22506068..4ec1a07c1 100644
=head2 Guest firmware =head2 Guest firmware
-- --
2.25.4 2.18.4

View File

@ -0,0 +1,66 @@
From ee88832841e82a407c9df44a82b87270ec0d492b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Jun 2020 17:34:47 +0100
Subject: [PATCH] lib: Increase default memsize to 1280 (RHBZ#1837765).
Argon2 is the default LUKS Password-Based Key Derivation Function
(PBKDF) for some new guests such as RHEL 8.2 and Fedora. It is
designed to be "memory hard", meaning that by design it requires large
amounts of memory, making it expensive to brute-force. Unfortunately
the default for guests which had more than a few GB of RAM at install
time is to require about 1 GB of RAM to decrypt the block device,
which is considerably larger than the default available in the
libguestfs appliance.
To make it possible to open these encrypted disks we need to make the
appliance larger. This could be done as a one-off, and the current
workaround is simply to set LIBGUESTFS_MEMSIZE=2048 or a similar
amount. However since we don't know in advance whether we could be
dealing with an encrypted disk, partition, etc. or what PBKDF it uses,
the only way to deal with this in all circumstances is to increase the
default memsize. This commit increases it quite a lot (768 -> 1280)
which is unfortunate.
Note as there is some confusion on this point: Since libguestfs does
not attempt to decrypt disks in parallel, you only need ~ 1GB in
total, not per encrypted disk.
For a reproducer, see:
https://bugzilla.redhat.com/show_bug.cgi?id=1837765#c14
(cherry picked from commit 224f373043302845122bf701ffc6e3416e0168fa)
---
lib/guestfs-internal.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
index 75b8a5c8e..30553d7c0 100644
--- a/lib/guestfs-internal.h
+++ b/lib/guestfs-internal.h
@@ -94,7 +94,7 @@
* creating device nodes.
*/
#ifdef __powerpc__
-# define DEFAULT_MEMSIZE 1024
+# define DEFAULT_MEMSIZE 1280
#endif
/* Kernel 3.19 is unable to uncompress the initramfs on aarch64 unless
@@ -103,12 +103,12 @@
* common on aarch64, treat this like the ppc case above.
*/
#ifdef __aarch64__
-# define DEFAULT_MEMSIZE 1024
+# define DEFAULT_MEMSIZE 1280
#endif
/* The default and minimum memory size for most users. */
#ifndef DEFAULT_MEMSIZE
-# define DEFAULT_MEMSIZE 768
+# define DEFAULT_MEMSIZE 1280
#endif
#ifndef MIN_MEMSIZE
# define MIN_MEMSIZE 256
--
2.18.4

View File

@ -0,0 +1,41 @@
From 38ecae6c0298943b4bc74d6d3d5c888ca0853dec Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 13 Oct 2016 12:47:43 +0100
Subject: [PATCH] tar-in: Add workaround because tar doesn't restore
capabilities (RHBZ#1384241).
Current GNU tar does not restore all extended attributes. In
particular only user.* capabilities are restored (although all
are saved in the tarball).
To restore capabilities, SELinux security attributes, and other things
we need to use --xattrs-include=*
For further information on the tar bug, see:
https://bugzilla.redhat.com/show_bug.cgi?id=771927
(cherry picked from commit 6d0ab14b56743679638ead0829ff3131749ac59b)
---
daemon/tar.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/daemon/tar.c b/daemon/tar.c
index 300e99448..9464d7105 100644
--- a/daemon/tar.c
+++ b/daemon/tar.c
@@ -188,7 +188,11 @@ do_tar_in (const char *dir, const char *compress, int xattrs, int selinux, int a
"tar",
dir, filter,
chown_supported ? "" : "--no-same-owner ",
- xattrs ? "--xattrs " : "",
+ /* --xattrs-include=* is a workaround for a bug
+ * in tar, and hopefully won't be required
+ * forever. See RHBZ#771927.
+ */
+ xattrs ? "--xattrs --xattrs-include='*' " : "",
selinux ? "--selinux " : "",
acls ? "--acls " : "",
error_file) == -1) {
--
2.18.4

View File

@ -0,0 +1,155 @@
From 3bceb391d14aeebb21dd9742108fa98945a32c5c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 May 2020 16:44:14 +0100
Subject: [PATCH] mlcustomize: Refactor SELinux_relabel code.
This shouldn't change the effect of this code.
Cherry picked from libguestfs-common
commit 3493d9fcaab6de1c09528e55a01bc24f0fb6c03c and backported
to libguestfs 1.40 branch (which predates the common submodule).
---
customize/SELinux_relabel.ml | 127 +++++++++++++++++++----------------
1 file changed, 68 insertions(+), 59 deletions(-)
diff --git a/customize/SELinux_relabel.ml b/customize/SELinux_relabel.ml
index 44995df6b..5df1f0895 100644
--- a/customize/SELinux_relabel.ml
+++ b/customize/SELinux_relabel.ml
@@ -28,65 +28,74 @@ module G = Guestfs
let array_find a l =
List.mem a (Array.to_list l)
-let relabel (g : G.guestfs) =
- (* Is the guest using SELinux? *)
- if g#is_file ~followsymlinks:true "/usr/sbin/load_policy" &&
- g#is_file ~followsymlinks:true "/etc/selinux/config" then (
- (* Is setfiles / SELinux relabelling functionality available? *)
- if g#feature_available [| "selinuxrelabel" |] then (
- (* Use Augeas to parse /etc/selinux/config. *)
- g#aug_init "/" (16+32) (* AUG_SAVE_NOOP | AUG_NO_LOAD *);
- (* See: https://bugzilla.redhat.com/show_bug.cgi?id=975412#c0 *)
- ignore (g#aug_rm "/augeas/load/*[\"/etc/selinux/config/\" !~ regexp('^') + glob(incl) + regexp('/.*')]");
- g#aug_load ();
- debug_augeas_errors g;
-
- (* Get the SELinux policy name, eg. "targeted", "minimum".
- * Use "targeted" if not specified, just like libselinux does.
- *)
- let policy =
- let config_path = "/files/etc/selinux/config" in
- let selinuxtype_path = config_path ^ "/SELINUXTYPE" in
- let keys = g#aug_ls config_path in
- if array_find selinuxtype_path keys then
- g#aug_get selinuxtype_path
- else
- "targeted" in
-
- g#aug_close ();
-
- (* Get the spec file name. *)
- let specfile =
- sprintf "/etc/selinux/%s/contexts/files/file_contexts" policy in
-
- (* RHEL 6.2 - 6.5 had a malformed specfile that contained the
- * invalid regular expression "/var/run/spice-vdagentd.\pid"
- * (instead of "\.p"). This stops setfiles from working on
- * the guest.
- *
- * Because an SELinux relabel writes all over the filesystem,
- * it seems reasonable to fix this problem in the specfile
- * at the same time. (RHBZ#1374232)
- *)
- if g#grep ~fixed:true "vdagentd.\\pid" specfile <> [||] then (
- debug "fixing invalid regular expression in %s" specfile;
- let old_specfile = specfile ^ "~" in
- g#mv specfile old_specfile;
- let content = g#read_file old_specfile in
- let content =
- String.replace content "vdagentd.\\pid" "vdagentd\\.pid" in
- g#write specfile content;
- g#copy_attributes ~all:true old_specfile specfile
- );
-
- (* Relabel everything. *)
- g#selinux_relabel ~force:true specfile "/";
-
- (* If that worked, we don't need to autorelabel. *)
+let rec relabel (g : G.guestfs) =
+ (* Is the guest using SELinux? (Otherwise this is a no-op). *)
+ if is_selinux_guest g then (
+ try
+ use_setfiles g;
+ (* That worked, so we don't need to autorelabel. *)
g#rm_f "/.autorelabel"
- )
- else (
- (* SELinux guest, but not SELinux host. Fallback to this. *)
+ with Failure _ ->
+ (* This is the fallback in case something in the setfiles
+ * method didn't work. That includes the case where a non-SELinux
+ * host is processing an SELinux guest, and other things.
+ *)
g#touch "/.autorelabel"
- )
)
+
+and is_selinux_guest g =
+ g#is_file ~followsymlinks:true "/usr/sbin/load_policy" &&
+ g#is_file ~followsymlinks:true "/etc/selinux/config"
+
+and use_setfiles g =
+ (* Is setfiles / SELinux relabelling functionality available? *)
+ if not (g#feature_available [| "selinuxrelabel" |]) then
+ failwith "no selinux relabel feature";
+
+ (* Use Augeas to parse /etc/selinux/config. *)
+ g#aug_init "/" (16+32) (* AUG_SAVE_NOOP | AUG_NO_LOAD *);
+ (* See: https://bugzilla.redhat.com/show_bug.cgi?id=975412#c0 *)
+ ignore (g#aug_rm "/augeas/load/*[\"/etc/selinux/config/\" !~ regexp('^') + glob(incl) + regexp('/.*')]");
+ g#aug_load ();
+ debug_augeas_errors g;
+
+ (* Get the SELinux policy name, eg. "targeted", "minimum".
+ * Use "targeted" if not specified, just like libselinux does.
+ *)
+ let policy =
+ let config_path = "/files/etc/selinux/config" in
+ let selinuxtype_path = config_path ^ "/SELINUXTYPE" in
+ let keys = g#aug_ls config_path in
+ if array_find selinuxtype_path keys then
+ g#aug_get selinuxtype_path
+ else
+ "targeted" in
+
+ g#aug_close ();
+
+ (* Get the spec file name. *)
+ let specfile =
+ sprintf "/etc/selinux/%s/contexts/files/file_contexts" policy in
+
+ (* RHEL 6.2 - 6.5 had a malformed specfile that contained the
+ * invalid regular expression "/var/run/spice-vdagentd.\pid"
+ * (instead of "\.p"). This stops setfiles from working on
+ * the guest.
+ *
+ * Because an SELinux relabel writes all over the filesystem,
+ * it seems reasonable to fix this problem in the specfile
+ * at the same time. (RHBZ#1374232)
+ *)
+ if g#grep ~fixed:true "vdagentd.\\pid" specfile <> [||] then (
+ debug "fixing invalid regular expression in %s" specfile;
+ let old_specfile = specfile ^ "~" in
+ g#mv specfile old_specfile;
+ let content = g#read_file old_specfile in
+ let content =
+ String.replace content "vdagentd.\\pid" "vdagentd\\.pid" in
+ g#write specfile content;
+ g#copy_attributes ~all:true old_specfile specfile
+ );
+
+ (* Relabel everything. *)
+ g#selinux_relabel ~force:true specfile "/"
--
2.18.4

View File

@ -0,0 +1,41 @@
From a5e6e764c8753c254e801b32059530fbc2e86e8d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 5 May 2020 16:44:15 +0100
Subject: [PATCH] mlcustomize: Fall back to autorelabel if specfile does not
exist (RHBZ#1828952).
https://bugzilla.redhat.com/show_bug.cgi?id=1828952#c2
Cherry picked from libguestfs-common
commit 101dac2eac8c61f0081c343b5d69cfa4efbc2a98 and backported
to libguestfs 1.40 branch (which predates the common submodule).
If SELINUXTYPE is set to some value other than targeted then we look
for a directory /etc/selinux/<SELINUXTYPE> which does not exist.
However this should not cause a fatal error. Using setfiles to do the
relabelling immediately is a nice-to-have, but we can fallback to
using autorelabel if we're unable to achieve it.
---
customize/SELinux_relabel.ml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/customize/SELinux_relabel.ml b/customize/SELinux_relabel.ml
index 5df1f0895..5ecf7bd7e 100644
--- a/customize/SELinux_relabel.ml
+++ b/customize/SELinux_relabel.ml
@@ -77,6 +77,12 @@ and use_setfiles g =
let specfile =
sprintf "/etc/selinux/%s/contexts/files/file_contexts" policy in
+ (* If the spec file doesn't exist then fall back to using
+ * autorelabel (RHBZ#1828952).
+ *)
+ if not (g#is_file ~followsymlinks:true specfile) then
+ failwith "no spec file";
+
(* RHEL 6.2 - 6.5 had a malformed specfile that contained the
* invalid regular expression "/var/run/spice-vdagentd.\pid"
* (instead of "\.p"). This stops setfiles from working on
--
2.18.4

View File

@ -6,7 +6,7 @@ set -e
# directory. Use it like this: # directory. Use it like this:
# ./copy-patches.sh # ./copy-patches.sh
rhel_version=8.3.0 rhel_version=8.4.0
# Check we're in the right directory. # Check we're in the right directory.
if [ ! -f libguestfs.spec ]; then if [ ! -f libguestfs.spec ]; then

View File

@ -36,7 +36,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.40.2 Version: 1.40.2
Release: 24%{?dist} Release: 27%{?dist}
License: LGPLv2+ License: LGPLv2+
# Source and patches. # Source and patches.
@ -54,87 +54,101 @@ ExclusiveArch: x86_64 %{power64} aarch64 s390x
# to the current directory. # to the current directory.
# Patches. # Patches.
Patch0001: 0001-common-mlpcre-add-offset-flag-for-PCRE.matches.patch Patch0001: 0001-daemon-lib-Replace-deprecated-security_context_t-wit.patch
Patch0002: 0002-v2v-add-Var_expander.patch Patch0002: 0002-caml_named_value-returns-const-value-pointer-in-OCam.patch
Patch0003: 0003-v2v-add-o-json-output-mode.patch Patch0003: 0003-ocaml-Change-calls-to-caml_named_value-to-cope-with-.patch
Patch0004: 0004-inspect-fix-icon-of-RHEL.patch Patch0004: 0004-ocaml-Use-caml_alloc_initialized_string-instead-of-m.patch
Patch0005: 0005-v2v-warn-when-the-guest-has-direct-network-interface.patch Patch0005: 0005-ocaml-Use-caml_alloc_initialized_string-instead-of-m.patch
Patch0006: 0006-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch Patch0006: 0006-ocaml-Change-calls-to-caml_named_value-to-cope-with-.patch
Patch0007: 0007-v2v-linux-do-not-uninstall-open-vm-tools-w-ubuntu-se.patch Patch0007: 0007-cat-Fix-GCC-10-warning.patch
Patch0008: 0008-v2v-linux-canonicalize-module-path-for-arch-detectio.patch Patch0008: 0008-builder-Fix-const-correctness-for-OCaml-4.10.patch
Patch0009: 0009-v2v-linux-improve-arch-detection-from-modules-RHBZ-1.patch Patch0009: 0009-mlxml-Fix-pointed-target-signedness.patch
Patch0010: 0010-Use-proper-label-for-nbdkit-sockets.patch Patch0010: 0010-common-mlpcre-add-offset-flag-for-PCRE.matches.patch
Patch0011: 0011-v2v-start-reading-the-new-libvirt-firmware-autoselec.patch Patch0011: 0011-v2v-add-Var_expander.patch
Patch0012: 0012-common-mltools-move-the-code-for-machine-readable-up.patch Patch0012: 0012-v2v-add-o-json-output-mode.patch
Patch0013: 0013-common-mltools-make-sure-machine-readable-output-is-.patch Patch0013: 0013-inspect-fix-icon-of-RHEL.patch
Patch0014: 0014-common-mltools-allow-fd-for-machine-readable-output.patch Patch0014: 0014-v2v-warn-when-the-guest-has-direct-network-interface.patch
Patch0015: 0015-OCaml-tools-output-messages-into-JSON-for-machine-re.patch Patch0015: 0015-v2v-update-documentation-on-nbdkit-RHBZ-1605242.patch
Patch0016: 0016-OCaml-tools-fix-3999-3339-typo.patch Patch0016: 0016-v2v-linux-do-not-uninstall-open-vm-tools-w-ubuntu-se.patch
Patch0017: 0017-v2v-remove-extra-nbdkit-bit-from-documentation-RHBZ-.patch Patch0017: 0017-v2v-linux-canonicalize-module-path-for-arch-detectio.patch
Patch0018: 0018-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch Patch0018: 0018-v2v-linux-improve-arch-detection-from-modules-RHBZ-1.patch
Patch0019: 0019-v2v-Allow-Windows-virtio-ISO-to-be-a-block-device-as.patch Patch0019: 0019-Use-proper-label-for-nbdkit-sockets.patch
Patch0020: 0020-v2v-Set-DISKTYPE-2-in-RHV-and-VDSM-meta-files-RHBZ-1.patch Patch0020: 0020-v2v-start-reading-the-new-libvirt-firmware-autoselec.patch
Patch0021: 0021-v2v-rhv-upload-plugin-improve-wait-logic-after-final.patch Patch0021: 0021-common-mltools-move-the-code-for-machine-readable-up.patch
Patch0022: 0022-v2v-o-rhv-upload-check-whether-the-cluster-exists.patch Patch0022: 0022-common-mltools-make-sure-machine-readable-output-is-.patch
Patch0023: 0023-v2v-o-rhv-upload-split-vmcheck-out-of-precheck.patch Patch0023: 0023-common-mltools-allow-fd-for-machine-readable-output.patch
Patch0024: 0024-v2v-o-rhv-upload-change-precheck-script-to-return-a-.patch Patch0024: 0024-OCaml-tools-output-messages-into-JSON-for-machine-re.patch
Patch0025: 0025-v2v-o-rhv-upload-improve-lookup-of-specified-resourc.patch Patch0025: 0025-OCaml-tools-fix-3999-3339-typo.patch
Patch0026: 0026-v2v-o-rhv-upload-tell-whether-a-SD-actually-exists.patch Patch0026: 0026-v2v-remove-extra-nbdkit-bit-from-documentation-RHBZ-.patch
Patch0027: 0027-v2v-add-output-disk_copied-hook.patch Patch0027: 0027-v2v-i-vmx-Use-scp-T-option-if-available-to-unbreak-s.patch
Patch0028: 0028-v2v-o-rhv-upload-collect-disks-UUIDs-right-after-cop.patch Patch0028: 0028-v2v-Allow-Windows-virtio-ISO-to-be-a-block-device-as.patch
Patch0029: 0029-v2v-o-rhv-upload-add-oo-rhv-disk-uuid-option.patch Patch0029: 0029-v2v-Set-DISKTYPE-2-in-RHV-and-VDSM-meta-files-RHBZ-1.patch
Patch0030: 0030-v2v-o-rhv-upload-make-oo-rhv-cafile-optional.patch Patch0030: 0030-v2v-rhv-upload-plugin-improve-wait-logic-after-final.patch
Patch0031: 0031-v2v-Fix-default-graphics-driver-for-SUSE-guests.patch Patch0031: 0031-v2v-o-rhv-upload-check-whether-the-cluster-exists.patch
Patch0032: 0032-v2v-windows-Add-a-helper-function-for-installing-Pow.patch Patch0032: 0032-v2v-o-rhv-upload-split-vmcheck-out-of-precheck.patch
Patch0033: 0033-v2v-Copy-static-IP-address-information-over-for-Wind.patch Patch0033: 0033-v2v-o-rhv-upload-change-precheck-script-to-return-a-.patch
Patch0034: 0034-New-API-luks_uuid.patch Patch0034: 0034-v2v-o-rhv-upload-improve-lookup-of-specified-resourc.patch
Patch0035: 0035-options-Fix-segfault-when-multiple-key-parameters-gi.patch Patch0035: 0035-v2v-o-rhv-upload-tell-whether-a-SD-actually-exists.patch
Patch0036: 0036-options-Simplify-selector-parsing-for-key-options.patch Patch0036: 0036-v2v-add-output-disk_copied-hook.patch
Patch0037: 0037-options-Allow-multiple-key-parameters.patch Patch0037: 0037-v2v-o-rhv-upload-collect-disks-UUIDs-right-after-cop.patch
Patch0038: 0038-options-rename-key.device-as-key.id.patch Patch0038: 0038-v2v-o-rhv-upload-add-oo-rhv-disk-uuid-option.patch
Patch0039: 0039-options-allow-a-UUID-as-identifier-for-key.patch Patch0039: 0039-v2v-o-rhv-upload-make-oo-rhv-cafile-optional.patch
Patch0040: 0040-docs-remove-paragraph-about-VMware-tools-on-Windows-.patch Patch0040: 0040-v2v-Fix-default-graphics-driver-for-SUSE-guests.patch
Patch0041: 0041-mlcustomize-Trim-whitespaces-from-commands-read-from.patch Patch0041: 0041-v2v-windows-Add-a-helper-function-for-installing-Pow.patch
Patch0042: 0042-openstack-Increase-Cinder-volume-attach-timeout-to-5.patch Patch0042: 0042-v2v-Copy-static-IP-address-information-over-for-Wind.patch
Patch0043: 0043-v2v-o-rhv-upload-check-for-a-valid-image-transfer-ri.patch Patch0043: 0043-New-API-luks_uuid.patch
Patch0044: 0044-rhv-upload-Check-status-more-frequently.patch Patch0044: 0044-options-Fix-segfault-when-multiple-key-parameters-gi.patch
Patch0045: 0045-rhv-upload-Show-transfer-id-in-error-message.patch Patch0045: 0045-options-Simplify-selector-parsing-for-key-options.patch
Patch0046: 0046-rhv-upload-Fix-waiting-for-transfer.patch Patch0046: 0046-options-Allow-multiple-key-parameters.patch
Patch0047: 0047-v2v-Optimize-convert-for-images-with-small-holes.patch Patch0047: 0047-options-rename-key.device-as-key.id.patch
Patch0048: 0048-v2v-o-rhv-upload-Make-oo-rhv-cafile-optional-in-all-.patch Patch0048: 0048-options-allow-a-UUID-as-identifier-for-key.patch
Patch0049: 0049-docs-Fix-update-crypto-policies-command-RHBZ-1791257.patch Patch0049: 0049-docs-remove-paragraph-about-VMware-tools-on-Windows-.patch
Patch0050: 0050-add-versioned-directory-for-guest-agent-on-EL8.patch Patch0050: 0050-mlcustomize-Trim-whitespaces-from-commands-read-from.patch
Patch0051: 0051-v2v-fix-path-to-source-when-copying-files-from-guest.patch Patch0051: 0051-openstack-Increase-Cinder-volume-attach-timeout-to-5.patch
Patch0052: 0052-v2v-windows-install-QEMU-Guest-Agent-MSI.patch Patch0052: 0052-v2v-o-rhv-upload-check-for-a-valid-image-transfer-ri.patch
Patch0053: 0053-windows-small-tweaks-of-qemu-ga-firstboot-script.patch Patch0053: 0053-rhv-upload-Check-status-more-frequently.patch
Patch0054: 0054-windows-fix-detection-of-qemu-ga-installer-on-RHV.patch Patch0054: 0054-rhv-upload-Show-transfer-id-in-error-message.patch
Patch0055: 0055-windows-delay-installation-of-qemu-ga-MSI.patch Patch0055: 0055-rhv-upload-Fix-waiting-for-transfer.patch
Patch0056: 0056-daemon-xattr-Refactor-code-which-splits-attr-names-f.patch Patch0056: 0056-v2v-Optimize-convert-for-images-with-small-holes.patch
Patch0057: 0057-daemon-Add-filter_list-utility-function.patch Patch0057: 0057-v2v-o-rhv-upload-Make-oo-rhv-cafile-optional-in-all-.patch
Patch0058: 0058-daemon-xattr-Filter-out-user.WofCompressedData-from-.patch Patch0058: 0058-docs-Fix-update-crypto-policies-command-RHBZ-1791257.patch
Patch0059: 0059-mltools-add-run_in_guest_command-helper.patch Patch0059: 0059-add-versioned-directory-for-guest-agent-on-EL8.patch
Patch0060: 0060-customize-port-do_run-to-run_in_guest_command.patch Patch0060: 0060-v2v-fix-path-to-source-when-copying-files-from-guest.patch
Patch0061: 0061-sysprep-add-a-update_system_ca_store-side-effect.patch Patch0061: 0061-v2v-windows-install-QEMU-Guest-Agent-MSI.patch
Patch0062: 0062-sysprep-ca-certificates-request-system-CA-store-upda.patch Patch0062: 0062-windows-small-tweaks-of-qemu-ga-firstboot-script.patch
Patch0063: 0063-sysprep-add-IPA-offline-unenrollment-RHBZ-1789592.patch Patch0063: 0063-windows-fix-detection-of-qemu-ga-installer-on-RHV.patch
Patch0064: 0064-sysprep-add-Kerberos-keytab-file-removal.patch Patch0064: 0064-windows-delay-installation-of-qemu-ga-MSI.patch
Patch0065: 0065-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch Patch0065: 0065-daemon-xattr-Refactor-code-which-splits-attr-names-f.patch
Patch0066: 0066-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch Patch0066: 0066-daemon-Add-filter_list-utility-function.patch
Patch0067: 0067-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch Patch0067: 0067-daemon-xattr-Filter-out-user.WofCompressedData-from-.patch
Patch0068: 0068-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch Patch0068: 0068-mltools-add-run_in_guest_command-helper.patch
Patch0069: 0069-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch Patch0069: 0069-customize-port-do_run-to-run_in_guest_command.patch
Patch0070: 0070-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch Patch0070: 0070-sysprep-add-a-update_system_ca_store-side-effect.patch
Patch0071: 0071-RHEL-8-Disable-alternate-Augeas-lenses.patch Patch0071: 0071-sysprep-ca-certificates-request-system-CA-store-upda.patch
Patch0072: 0072-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch Patch0072: 0072-sysprep-add-IPA-offline-unenrollment-RHBZ-1789592.patch
Patch0073: 0073-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch Patch0073: 0073-sysprep-add-Kerberos-keytab-file-removal.patch
Patch0074: 0074-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch Patch0074: 0074-vCenter-fix-parsing-of-HTTP-status-string-RHBZ-18373.patch
Patch0075: 0075-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch Patch0075: 0075-RHEL-8-Remove-libguestfs-live-RHBZ-798980.patch
Patch0076: 0076-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch Patch0076: 0076-RHEL-8-Remove-9p-APIs-from-RHEL-RHBZ-921710.patch
Patch0077: 0077-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch Patch0077: 0077-RHEL-8-Disable-unsupported-remote-drive-protocols-RH.patch
Patch0078: 0078-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch Patch0078: 0078-RHEL-8-Remove-User-Mode-Linux-RHBZ-1144197.patch
Patch0079: 0079-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch Patch0079: 0079-RHEL-8-v2v-Select-correct-qemu-binary-for-o-qemu-mod.patch
Patch0080: 0080-RHEL-8-use-platform-python.patch Patch0080: 0080-RHEL-8-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
Patch0081: 0081-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch Patch0081: 0081-RHEL-8-Disable-alternate-Augeas-lenses.patch
Patch0082: 0082-RHEL-8-Fix-list-of-supported-sound-cards-to-match-RH.patch
Patch0083: 0083-RHEL-8-Reject-use-of-libguestfs-winsupport-features-.patch
Patch0084: 0084-RHEL-8-Fix-tests-for-libguestfs-winsupport.patch
Patch0085: 0085-RHEL-8-tests-Disable-daemon-tests-that-require-the-u.patch
Patch0086: 0086-RHEL-8-v2v-Disable-the-virt-v2v-in-place-option.patch
Patch0087: 0087-RHEL-8-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
Patch0088: 0088-RHEL-8-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-143020.patch
Patch0089: 0089-RHEL-8-v2v-rhv-upload-Remove-restriction-on-oa-spars.patch
Patch0090: 0090-RHEL-8-use-platform-python.patch
Patch0091: 0091-RHEL-8-point-to-KB-for-supported-v2v-hypervisors-gue.patch
Patch0092: 0092-lib-Increase-default-memsize-to-1280-RHBZ-1837765.patch
Patch0093: 0093-tar-in-Add-workaround-because-tar-doesn-t-restore-ca.patch
Patch0094: 0094-mlcustomize-Refactor-SELinux_relabel-code.patch
Patch0095: 0095-mlcustomize-Fall-back-to-autorelabel-if-specfile-doe.patch
# Use git for patch management. # Use git for patch management.
BuildRequires: git BuildRequires: git
@ -1265,6 +1279,19 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%changelog %changelog
* Tue Jan 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.40.2-27
- selinux-relabel does not work if SELINUXTYPE != targeted
- tar-in command does not allow restoring file capabilities
resolves: rhbz#1384241 rhbz#1828952
* Mon Jan 04 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.40.2-26
- insufficient default memsize to open anaconda default RHEL 8.2 luks device
resolves: rhbz#1837765
* Mon Jul 20 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.40.2-25
- v2v: handle HTTP/2 replies from vCenter
resolves: rhbz#1854380
* Wed Jun 24 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.40.2-24 * Wed Jun 24 2020 Pino Toscano <ptoscano@redhat.com> - 1:1.40.2-24
- v2v: ship a newer version of rhev-apt.exe - v2v: ship a newer version of rhev-apt.exe
resolves: rhbz#1849997 resolves: rhbz#1849997