diff --git a/docs/guestfs-building.pod b/docs/guestfs-building.pod index df833cddf..4d2c06ea9 100644 --- a/docs/guestfs-building.pod +++ b/docs/guestfs-building.pod @@ -190,7 +190,7 @@ Optional if compiling from tarball. I. ocaml-hivex is the OCaml binding for hivex, which is required when building the daemon. -=item libvirt E 0.10.2 +=item libvirt E 9.0.0 Optional. Always use the latest possible version of libvirt. diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c index 31e53e198..b12344c6e 100644 --- a/lib/launch-libvirt.c +++ b/lib/launch-libvirt.c @@ -1384,17 +1384,9 @@ construct_libvirt_xml_devices (guestfs_h *g, if (g->enable_network) { start_element ("interface") { attribute ("type", "user"); - /* If libvirt is 9.0.0+ and "passt" is available, ask for passt rather - * than SLIRP (RHBZ#2184967). Note that this causes some - * appliance-visible changes (although network connectivity is certainly - * functional); refer to RHBZ#2222766 about those. - */ - if (guestfs_int_version_ge (¶ms->data->libvirt_version, 9, 0, 0) && - guestfs_int_passt_runnable (g)) { - start_element ("backend") { - attribute ("type", "passt"); - } end_element (); - } + start_element ("backend") { + attribute ("type", "passt"); + } end_element (); start_element ("model") { attribute ("type", "virtio"); } end_element (); diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4 index 2ec1b0164..5e6ebf23c 100644 --- a/m4/guestfs-libraries.m4 +++ b/m4/guestfs-libraries.m4 @@ -264,7 +264,7 @@ AC_ARG_WITH([libvirt],[ [], [with_libvirt=check]) AS_IF([test "$with_libvirt" != "no"],[ - PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 0.10.2],[ + PKG_CHECK_MODULES([LIBVIRT], [libvirt >= 9.0.0],[ AC_SUBST([LIBVIRT_CFLAGS]) AC_SUBST([LIBVIRT_LIBS]) AC_DEFINE([HAVE_LIBVIRT],[1],[libvirt found at compile time.])