[Libguestfs] [PATCH] ppc64le: Use -machine cap-htm=off unconditionally (RHBZ#1614948).

[Richard W.M. Jones]

See:
https://bugzilla.redhat.com/show_bug.cgi?id=1614948#c23

Thanks: David Gibson.
---
 lib/launch-direct.c  |  3 +++
 lib/launch-libvirt.c | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/lib/launch-direct.c b/lib/launch-direct.c
index 47e8f37de..94dd995c6 100644
--- a/lib/launch-direct.c
+++ b/lib/launch-direct.c
@@ -523,6 +523,9 @@ launch_direct (guestfs_h *g, void *datav, const char *arg)
 #ifdef __aarch64__
     if (has_kvm && !force_tcg)
       append_list ("gic-version=host");
+#endif
+#ifdef __powerpc64__
+    append_list ("cap-htm=off");
 #endif
     append_list_format ("accel=%s", !force_tcg ? "kvm:tcg" : "tcg");
   } end_list ();
diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
index 48404ef93..53284fc08 100644
--- a/lib/launch-libvirt.c
+++ b/lib/launch-libvirt.c
@@ -1181,6 +1181,16 @@ construct_libvirt_xml_boot (guestfs_h *g,
       }
     }
 
+#ifdef __powerpc64__
+    start_element ("features") {
+      start_element ("pseries") {
+        start_element ("htm") {
+          attribute ("state", "on");
+        } end_element ();
+      } end_element ();
+    } end_element ();
+#endif
+
     start_element ("kernel") {
       string (params->kernel);
     } end_element ();
-- 
2.18.0