From e0d23c861cc1955c80ae04ba59a86b6aef18c1f5 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 17 Jan 2023 11:14:05 +0000
Subject: [PATCH] generator: customize: Add --inject-qemu-ga and
 --inject-virtio-win

Add the new flags / operations for virt-customize.
---
 common                 |  2 +-
 generator/customize.ml | 56 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/common b/common
index 7ba9d5b56..bf79ef4e8 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 7ba9d5b5699b5b1f4f91caf82ca99afe0c23584e
+Subproject commit bf79ef4e804c8c96d80fdd62bfb6386a94763567
diff --git a/generator/customize.ml b/generator/customize.ml
index 5abaf206f..aa7ac8e8a 100644
--- a/generator/customize.ml
+++ b/generator/customize.ml
@@ -237,6 +237,62 @@ Set the hostname of the guest to C<HOSTNAME>.  You can use a
 dotted hostname.domainname (FQDN) if you want.";
   };
 
+  { op_name = "inject-qemu-ga";
+    op_type = String "METHOD";
+    op_discrim = "`InjectQemuGA";
+    op_shortdesc = "Inject the QEMU Guest Agent into a Windows guest";
+    op_pod_longdesc = "\
+Inject the QEMU Guest Agent into a Windows guest.  The guest
+agent communicates with qemu through a socket in order to
+provide enhanced features (see L<qemu-ga(8)>).  This operation
+also injects a firstboot script so that the Guest Agent is
+installed when the guest boots.
+
+The parameter is the same as used by the I<--inject-virtio-win> operation.
+
+Note that to do a full conversion of a Windows guest from a
+foreign hypervisor like VMware (which involves many other operations)
+you should use the L<virt-v2v(1)> tool instead of this.";
+  };
+
+  { op_name = "inject-virtio-win";
+    op_type = String "METHOD";
+    op_discrim = "`InjectVirtioWin";
+    op_shortdesc = "Inject virtio-win drivers into a Windows guest";
+    op_pod_longdesc = "\
+Inject virtio-win drivers into a Windows guest.  These drivers
+add virtio accelerated drivers suitable when running on top of
+a hypervisor that supports virtio (such as qemu/KVM).  The
+operation also adjusts the Windows Registry so that the drivers
+are installed when the guest boots.
+
+The parameter can be one of:
+
+=over 4
+
+=item ISO
+
+The path to the ISO image containing the virtio-win drivers
+(eg. F</usr/share/virtio-win/virtio-win.iso>).
+
+=item DIR
+
+The directory containing the unpacked virtio-win drivers
+(eg. F</usr/share/virtio-win>).
+
+=item B<\"osinfo\">
+
+The literal string C<\"osinfo\"> means to use the
+libosinfo database to locate the drivers.  (See
+L<osinfo-query(1)>.
+
+=back
+
+Note that to do a full conversion of a Windows guest from a
+foreign hypervisor like VMware (which involves many other operations)
+you should use the L<virt-v2v(1)> tool instead of this.";
+  };
+
   { op_name = "install";
     op_type = StringList "PKG,PKG..";
     op_discrim = "`InstallPackages";