From d8b08eac385f80e41da33ccb70652a84ceb8a0aa Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Sep 2025 13:20:36 +0100
Subject: [PATCH] lib/launch-libvirt.c: Don't store libvirt_version in handle

We no longer use the libvirt version anywhere, except when reporting
the version.  Remove this from the handle.

Simplify the remaining code.  In particular:

* don't bother parsing the libvirt version, just print what
  virGetVersion gives us

* guestfs_int_version_from_libvirt is dead code, so it can be removed
---
 lib/guestfs-internal.h | 1 -
 lib/launch-libvirt.c   | 9 ++-------
 lib/version.c          | 8 --------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lib/guestfs-internal.h b/lib/guestfs-internal.h
index 0f2a38845..abda32322 100644
--- a/lib/guestfs-internal.h
+++ b/lib/guestfs-internal.h
@@ -813,7 +813,6 @@ struct rusage;
 extern int guestfs_int_wait4 (guestfs_h *g, pid_t pid, int *status, struct rusage *rusage, const char *errmsg);
 
 /* version.c */
-extern void guestfs_int_version_from_libvirt (struct version *v, int vernum);
 extern void guestfs_int_version_from_values (struct version *v, int maj, int min, int mic);
 extern int guestfs_int_version_from_x_y (guestfs_h *g, struct version *v, const char *str);
 extern int guestfs_int_version_from_x_y_re (guestfs_h *g, struct version *v, const char *str, const pcre2_code *re);
diff --git a/lib/launch-libvirt.c b/lib/launch-libvirt.c
index b12344c6e..56176f4fb 100644
--- a/lib/launch-libvirt.c
+++ b/lib/launch-libvirt.c
@@ -124,7 +124,6 @@ struct backend_libvirt_data {
   bool selinux_norelabel_disks;
   char name[DOMAIN_NAME_LEN];   /* random name */
   bool is_kvm;                  /* false = qemu, true = kvm (from capabilities)*/
-  struct version libvirt_version; /* libvirt version */
   struct secret *secrets;       /* list of secrets */
   size_t nr_secrets;
   char *uefi_code;		/* UEFI (firmware) code and variables. */
@@ -341,12 +340,8 @@ launch_libvirt (guestfs_h *g, void *datav, const char *libvirt_uri)
   }
 
   virGetVersion (&version_number, NULL, NULL);
-  guestfs_int_version_from_libvirt (&data->libvirt_version, version_number);
-  debug (g, "libvirt version = %lu (%d.%d.%d)",
-         version_number,
-         data->libvirt_version.v_major,
-         data->libvirt_version.v_minor,
-         data->libvirt_version.v_micro);
+  debug (g, "libvirt version = %lu", version_number);
+
   guestfs_int_launch_send_progress (g, 0);
 
   /* Create a random name for the guest. */
diff --git a/lib/version.c b/lib/version.c
index bbe84038c..f136f41dc 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -38,14 +38,6 @@ COMPILE_REGEXP (re_major_minor, "(\\d+)\\.(\\d+)", 0)
 
 static int version_from_x_y_or_x (guestfs_h *g, struct version *v, const char *str, const pcre2_code *re, bool allow_only_x);
 
-void
-guestfs_int_version_from_libvirt (struct version *v, int vernum)
-{
-  v->v_major = vernum / 1000000UL;
-  v->v_minor = vernum / 1000UL % 1000UL;
-  v->v_micro = vernum % 1000UL;
-}
-
 void
 guestfs_int_version_from_values (struct version *v, int maj, int min, int mic)
 {