[gnome-boxes/wip/system-libvirt-import2: 2/2] tmp

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 3df44b9cac76c72f5004e5a97790575b18b0e5b2
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Tue Oct 15 20:49:41 2013 -0400

    tmp

 src/Makefile.am                     |    3 ++
 src/installed-media.vala            |    9 ++++-
 src/libvirt-broker.vala             |    8 +++-
 src/libvirt-system-importer.vala    |   67 +++++++++++++++++++++++++++++++++++
 src/libvirt-system-media.vala       |   25 +++++++++++++
 src/libvirt-system-vm-importer.vala |   38 ++++++++++++++++++++
 src/vm-configurator.vala            |    8 ++++
 src/vm-importer.vala                |   12 ++++--
 8 files changed, 162 insertions(+), 8 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 12c41db..cbfec97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,6 +88,7 @@ gnome_boxes_SOURCES =                         \
        i-properties-provider.vala              \
        installer-media.vala                    \
        installed-media.vala                    \
+       libvirt-system-media.vala               \
        iso-extractor.vala                      \
        libvirt-broker.vala                     \
        libvirt-machine.vala                    \
@@ -113,6 +114,8 @@ gnome_boxes_SOURCES =                               \
        vm-configurator.vala                    \
        vm-creator.vala                         \
        vm-importer.vala                        \
+       libvirt-system-importer.vala            \
+       libvirt-system-vm-importer.vala         \
        vnc-display.vala                        \
        wizard-source.vala                      \
        wizard.vala                             \
diff --git a/src/installed-media.vala b/src/installed-media.vala
index 31e41bc..301aeae 100644
--- a/src/installed-media.vala
+++ b/src/installed-media.vala
@@ -18,6 +18,8 @@ private class Boxes.InstalledMedia : Boxes.InstallerMedia {
 
     public string format { get { return device_file.has_suffix (".qcow2")? "qcow2" : "raw"; } }
 
+    protected string qemu_img_cmd = "qemu-img";
+
     protected override string? architecture {
         owned get {
             // Many distributors provide arch name on the image file so lets try to use that if possible
@@ -36,7 +38,7 @@ private class Boxes.InstalledMedia : Boxes.InstallerMedia {
         }
     }
 
-    public async InstalledMedia (string path, MediaManager media_manager) throws GLib.Error {
+    public async InstalledMedia (string path, MediaManager? media_manager = null) throws GLib.Error {
         var supported = false;
         foreach (var extension in supported_extensions) {
             supported = path.has_suffix (extension);
@@ -50,6 +52,9 @@ private class Boxes.InstalledMedia : Boxes.InstallerMedia {
         device_file = path;
         from_image = true;
 
+        if (media_manager == null)
+            return;
+
         if (path.contains ("gnome-continuous") || path.contains ("gnome-ostree")) {
             try {
                 os = yield media_manager.os_db.get_os_by_id ("http://gnome.org/continuous/3.10";);
@@ -70,7 +75,7 @@ private class Boxes.InstalledMedia : Boxes.InstallerMedia {
     public async void copy (string destination_path) throws GLib.Error {
         var decompressed = yield decompress ();
 
-        string[] argv = { "qemu-img", "convert", "-O", "qcow2", device_file, destination_path };
+        string[] argv = { qemu_img_cmd, "convert", "-O", "qcow2", device_file, destination_path };
 
         var converting = !device_file.has_suffix (".qcow2");
 
diff --git a/src/libvirt-broker.vala b/src/libvirt-broker.vala
index 2073570..af4adf2 100644
--- a/src/libvirt-broker.vala
+++ b/src/libvirt-broker.vala
@@ -53,12 +53,16 @@ private class Boxes.LibvirtBroker : Boxes.Broker {
             var machine = add_domain (source, connection, domain);
             var config = machine.domain_config;
 
+            // These instance will take care of their own lifecycles
             if (VMConfigurator.is_install_config (config) || VMConfigurator.is_live_config (config)) {
                 debug ("Continuing installation/live session for '%s', ..", machine.name);
-                new VMCreator.for_install_completion (machine); // This instance will take care of its own 
lifecycle
+                new VMCreator.for_install_completion (machine);
             } else if (VMConfigurator.is_import_config (config)) {
                 debug ("Continuing import of '%s', ..", machine.name);
-                new VMImporter.for_import_completion (machine); // This instance will take care of its own 
lifecycle
+                new VMImporter.for_import_completion (machine);
+            } else if (VMConfigurator.is_libvirt_system_import_config (config)) {
+                debug ("Continuing import of '%s', ..", machine.name);
+                new LibvirtSystemVMImporter.for_import_completion (machine);
             }
         } catch (GLib.Error error) {
             warning ("Failed to create source '%s': %s", source.name, error.message);
diff --git a/src/libvirt-system-importer.vala b/src/libvirt-system-importer.vala
new file mode 100644
index 0000000..d85a98e
--- /dev/null
+++ b/src/libvirt-system-importer.vala
@@ -0,0 +1,67 @@
+// This file is part of GNOME Boxes. License: LGPLv2+
+using GVir;
+
+private class Boxes.LibvirtSystemImporter: GLib.Object {
+    public bool import_needed {
+        get {
+            return (domains.length () + pools.length ()) != 0;
+        }
+    }
+
+    private GVir.Connection connection;
+    private GLib.List<GVir.Domain> domains;
+    private GLib.List<GVir.StoragePool> pools;
+
+    public async LibvirtSystemImporter () throws GLib.Error {
+        connection = new GVir.Connection ("qemu+unix:///system");
+
+        yield connection.open_read_only_async (null);
+        yield connection.fetch_domains_async (null);
+
+        domains = connection.get_domains ();
+    }
+
+    public void import () {
+        foreach (var domain in domains)
+            try {
+                import_domain (domain);
+            } catch (GLib.Error error) {
+                warning ("Failed to import '%s': %s", domain.get_name (), error.message);
+            }
+    }
+
+    private void import_domain (Domain domain) throws GLib.Error {
+        string device_file = null;
+
+        var config = domain.get_config (DomainXMLFlags.INACTIVE);
+        var devices = config.get_devices ();
+        foreach (var device in devices) {
+            if (!(device is DomainDisk))
+                continue;
+
+            var disk = device as GVirConfig.DomainDisk;
+            if (disk.get_guest_device_type () == GVirConfig.DomainDiskGuestDeviceType.DISK) {
+                device_file = disk.get_source ();
+
+                break;
+            }
+        }
+
+        if (device_file == null) {
+            warning ("Failed to find suitable disk to import for '%s'", config.name);
+
+            return;
+        }
+
+        var media = new LibvirtSystemMedia (device_file, config);
+        var vm_importer = media.get_vm_creator ();
+        vm_importer.create_vm.begin (null, (obj, result) => {
+            try {
+                var machine = vm_importer.create_vm.end (result);
+                vm_importer.launch_vm (machine);
+            } catch (GLib.Error error) {
+                warning ("Failed to import '%s': %s", config.name, error.message);
+            }
+        });
+    }
+}
diff --git a/src/libvirt-system-media.vala b/src/libvirt-system-media.vala
new file mode 100644
index 0000000..75225d6
--- /dev/null
+++ b/src/libvirt-system-media.vala
@@ -0,0 +1,25 @@
+// This file is part of GNOME Boxes. License: LGPLv2+
+
+using GVirConfig;
+
+private class Boxes.LibvirtSystemMedia : Boxes.InstalledMedia {
+    protected override string? architecture {
+        owned get {
+            return domain_config.get_os ().get_arch ();
+        }
+    }
+
+    public Domain domain_config { get; private set; }
+
+    public async LibvirtSystemMedia (string path, Domain domain_config) throws GLib.Error {
+        base (path);
+
+        this.domain_config = domain_config;
+        label = domain_config.title?? domain_config.name;
+        qemu_img_cmd = "pkexec qemu-img";
+    }
+
+    public override VMCreator get_vm_creator () {
+        return new LibvirtSystemVMImporter (this);
+    }
+}
diff --git a/src/libvirt-system-vm-importer.vala b/src/libvirt-system-vm-importer.vala
new file mode 100644
index 0000000..75bc31f
--- /dev/null
+++ b/src/libvirt-system-vm-importer.vala
@@ -0,0 +1,38 @@
+// This file is part of GNOME Boxes. License: LGPLv2+
+
+using Osinfo;
+using GVirConfig;
+
+private class Boxes.LibvirtSystemVMImporter : Boxes.VMImporter {
+    public LibvirtSystemVMImporter (InstalledMedia source_media) {
+        base (source_media);
+        start_after_import = false;
+    }
+
+    public LibvirtSystemVMImporter.for_import_completion (LibvirtMachine machine) {
+        base.for_install_completion (machine);
+        start_after_import = false;
+    }
+
+    protected override async Domain create_domain_config (string          name,
+                                                          string          title,
+                                                          GVir.StorageVol volume,
+                                                          Cancellable?    cancellable) throws GLib.Error {
+        var media = install_media as LibvirtSystemMedia;
+        var devices = media.domain_config.get_devices ();
+        foreach (var device in devices) {
+            if (!(device is DomainDisk))
+                continue;
+
+            var disk = device as DomainDisk;
+            if (disk.get_source () == media.device_file) {
+                disk.set_source (volume.get_path ());
+
+                break;
+            }
+        }
+        media.domain_config.set_devices (devices);
+
+        return media.domain_config;
+    }
+}
diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 491a2ec..b1669cd 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -14,10 +14,12 @@ private class Boxes.VMConfigurator {
     private const string LIVE_STATE = "live";
     private const string INSTALLATION_STATE = "installation";
     private const string IMPORT_STATE = "importing";
+    private const string LIBVIRT_SYS_IMPORT_STATE = "libvirt-system-importing";
     private const string INSTALLED_STATE = "installed";
     private const string LIVE_XML = "<os-state>" + LIVE_STATE + "</os-state>";
     private const string INSTALLATION_XML = "<os-state>" + INSTALLATION_STATE + "</os-state>";
     private const string IMPORT_XML = "<os-state>" + IMPORT_STATE + "</os-state>";
+    private const string LIBVIRT_SYS_IMPORT_XML = "<os-state>" + LIBVIRT_SYS_IMPORT_STATE + "</os-state>";
     private const string INSTALLED_XML = "<os-state>" + INSTALLED_STATE + "</os-state>";
 
     private const string OS_ID_XML = "<os-id>%s</os-id>";
@@ -133,6 +135,10 @@ private class Boxes.VMConfigurator {
         return get_os_state (domain) == IMPORT_STATE;
     }
 
+    public static bool is_libvirt_system_import_config (Domain domain) {
+        return get_os_state (domain) == LIBVIRT_SYS_IMPORT_STATE;
+    }
+
     public static StorageVol create_volume_config (string name, int64 storage) throws GLib.Error {
         var volume = new StorageVol ();
         volume.set_name (name);
@@ -340,6 +346,8 @@ private class Boxes.VMConfigurator {
             custom_xml = INSTALLED_XML;
         else if (install_media is InstalledMedia)
             custom_xml = IMPORT_XML;
+        else if (install_media is LibvirtSystemMedia)
+            custom_xml = LIBVIRT_SYS_IMPORT_XML;
         else
             custom_xml = (install_media.live) ? LIVE_XML : INSTALLATION_XML;
 
diff --git a/src/vm-importer.vala b/src/vm-importer.vala
index 262451a..a53232c 100644
--- a/src/vm-importer.vala
+++ b/src/vm-importer.vala
@@ -6,6 +6,8 @@ using GVir;
 private class Boxes.VMImporter : Boxes.VMCreator {
     public InstalledMedia source_media { get { return install_media as InstalledMedia; } }
 
+    protected bool start_after_import = true;
+
     public VMImporter (InstalledMedia source_media) {
         base (source_media);
     }
@@ -56,10 +58,12 @@ private class Boxes.VMImporter : Boxes.VMCreator {
         }
 
         set_post_install_config (machine);
-        try {
-            machine.domain.start (0);
-        } catch (GLib.Error error) {
-            warning ("Failed to start domain '%s': %s", machine.domain.get_name (), error.message);
+        if (start_after_import) {
+            try {
+                machine.domain.start (0);
+            } catch (GLib.Error error) {
+                warning ("Failed to start domain '%s': %s", machine.domain.get_name (), error.message);
+            }
         }
         machine.info = null;
         machine.vm_creator = null;