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

See: https://bugzilla.redhat.com/show_bug.cgi?id=1614948#c23 Thanks: David Gibson. --- lib/launch-direct.c | 4 ++++ lib/launch-libvirt.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/lib/launch-direct.c b/lib/launch-direct.c index 47e8f37de..e99c33347 100644 --- a/lib/launch-direct.c +++ b/lib/launch-direct.c @@ -523,6 +523,10 @@ 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__ + if (guestfs_int_version_ge (&data->qemu_version, 2, 11, 2)) + 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..1a074fd6c 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -1181,6 +1181,16 @@ construct_libvirt_xml_boot (guestfs_h *g, } } +#ifdef __powerpc64__ + if (guestfs_int_version_ge (&params->data->libvirt_version, 4, 6, 0)) { + start_element ("features") { + start_element ("htm") { + attribute ("state", "off"); + } end_element (); + } end_element (); + } +#endif + start_element ("kernel") { string (params->kernel); } end_element (); -- 2.18.0