UnattendedInstaller.set_direct_boot_params -> InstallerMedia

Move set_direct_boot_params from UnattendedInstaller to parent
InstallerMedia so that users of this function don't need type checks and
casting to be able to use it.

https://bugzilla.gnome.org/show_bug.cgi?id=679706

3 files changed, 5 insertions, 10 deletions

diff --git a/src/installer-media.vala b/src/installer-media.vala
index fa848c5..8b5dd65 100644
--- a/src/installer-media.vala
+++ b/src/installer-media.vala
@@ -2,8 +2,9 @@
 
 using Osinfo;
 using GUdev;
+using GVirConfig;
 
-private class Boxes.InstallerMedia : Object {
+private class Boxes.InstallerMedia : GLib.Object {
     public Os? os;
     public Osinfo.Resources? resources;
     public Media? os_media;
@@ -57,6 +58,8 @@ private class Boxes.InstallerMedia : Object {
         resources = media_manager.os_db.get_resources_for_os (os, architecture);
     }
 
+    public virtual void set_direct_boot_params (DomainOs os) {}
+
     public bool is_architecture_compatible (string architecture) {
         return os_media == null || // Unknown media
                os_media.architecture == architecture ||
diff --git a/src/unattended-installer.vala b/src/unattended-installer.vala
index 8f7e206..93315e6 100644
--- a/src/unattended-installer.vala
+++ b/src/unattended-installer.vala
@@ -140,7 +140,6 @@ private abstract class Boxes.UnattendedInstaller: InstallerMedia {
         setup_vbox.pack_start (setup_hbox, false, false);
     }
 
-    public virtual void set_direct_boot_params (DomainOs os) {}
 
     public virtual DomainDisk? get_unattended_disk_config () {
         if (!express_toggle.active)
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index c393bc8..550983d 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -250,7 +250,7 @@ private class Boxes.VMConfigurator {
         os.set_arch (guest_caps.get_arch ().get_name ());
 
         var boot_devices = new GLib.List<DomainOsBootDevice> ();
-        set_direct_boot_params (os, install_media);
+        install_media.set_direct_boot_params (os);
         boot_devices.append (DomainOsBootDevice.CDROM);
         boot_devices.append (DomainOsBootDevice.HD);
         os.set_boot_devices (boot_devices);
@@ -258,13 +258,6 @@ private class Boxes.VMConfigurator {
         domain.set_os (os);
     }
 
-    private static void set_direct_boot_params (DomainOs os, InstallerMedia install_media) {
-        if (!(install_media is UnattendedInstaller))
-            return;
-
-        (install_media as UnattendedInstaller).set_direct_boot_params (os);
-    }
-
     private static void set_video_config (Domain domain, InstallerMedia install_media) {
         var video = new DomainVideo ();
         var device = get_os_device_by_prop (install_media.os, DEVICE_PROP_CLASS, "video");