Add --os-type/variant options to virt-image.

Author: crobinso

man/en/virt-convert.pod

@@ -76,7 +76,7 @@ Avoid verbose output.
 Optimize the guest configuration for a type of operating system (ex. 'linux',
 'windows'). This will attempt to pick the most suitable ACPI & APIC settings,
 optimally supported mouse drivers, virtio, and generally accommodate other
-operating system quirks.
+operating system quirks.  See L<virt-install(1)> for valid values.
 
 =item --os-variant=OS_VARIANT
 

man/en/virt-image.pod

@@ -58,6 +58,20 @@ C</image/devices/vcpu> in the XML descriptor.
 
 Check that vcpus do not exceed physical CPUs and warn if they do.
 
+=item  --os-type=OS_TYPE
+
+Optimize the guest configuration for a type of operating system (ex. 'linux',
+'windows'). This will attempt to pick the most suitable ACPI & APIC settings,
+optimally supported mouse drivers, virtio, and generally accommodate other
+operating system quirks.  See L<virt-install(1)> for valid values.
+
+=item --os-variant=OS_VARIANT
+
+Further optimize the guest configuration for a specific operating system
+variant (ex. 'fedora8', 'winxp'). This parameter is optional, and does not
+require an C<--os-type> to be specified. See L<virt-install(1)> for valid
+values.
+
 =item -m MAC, --mac=MAC
 
 Fixed MAC address for the guest. See L<virt-install(1)> for details

virt-image

@@ -106,6 +106,14 @@ def parse_args():
     geng.add_option("", "--cpuset", type="string", dest="cpuset",
                     action="callback", callback=cli.check_before_store,
                     help=_("Set which physical CPUs Domain can use."))
+    geng.add_option("", "--os-type", type="string", dest="distro_type",
+                    action="callback", callback=cli.check_before_store,
+                    help=_("The OS type being installed, e.g. "
+                           "'linux', 'unix', 'windows'"))
+    geng.add_option("", "--os-variant", type="string", dest="distro_variant",
+                      action="callback", callback=cli.check_before_store,
+                      help=_("The OS variant being installed, "
+                             "e.g. 'fedora6', 'rhel5', 'solaris10', 'win2k'"))
     parser.add_option_group(geng)
 
     fulg = OptionGroup(parser, _("Full Virtualization specific options."))
@@ -169,6 +177,7 @@ def parse_args():
     parser.add_option_group(misc)
 
     (options,args) = parser.parse_args()
+
     if len(args) < 1:
         parser.error(_("You need to provide an image XML descriptor"))
     options.image = args[0]
@@ -220,6 +229,11 @@ def main():
     get_graphics(image.domain, options.vnc, options.vncport,
                  options.nographics, options.sdl, options.keymap, guest)
 
+    if options.distro_type:
+        guest.set_os_type(options.distro_type)
+    if options.distro_variant:
+        guest.set_os_variant(options.distro_variant)
+
     if installer.is_hvm():
         if options.noacpi:
             guest.features["acpi"] = False