File ad606291-vm-configurator-Don-t-access-invalid-d... of Package gnome-boxes

Overview Repositories Revisions Requests Users Attributes Meta

File ad606291-vm-configurator-Don-t-access-invalid-device-objects.patch of Package gnome-boxes (Revision acde141de17a5ec91c1b8a8361dcbcc7)

Currently displaying revision acde141de17a5ec91c1b8a8361dcbcc7 , Show latest

From ad60629187c21b8fd9335e1aa83f5dceee12a56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 26 Oct 2016 17:38:53 +0200
Subject: [PATCH] vm-configurator: Don't access invalid device objects

The GVirConfig.DomainInterface or GVirConfig.DomainGraphics
references kept in update_existing_domain() will get their
XML node destroyed when running GVirConfig.Domain.set_devices().

To workaround this problem, add the updated devices to the devices list
before calling set_devices().

https://bugzilla.gnome.org/show_bug.cgi?id=769718
---
 src/vm-configurator.vala | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/vm-configurator.vala b/src/vm-configurator.vala
index 3efe1e6..94f4341 100644
--- a/src/vm-configurator.vala
+++ b/src/vm-configurator.vala
@@ -74,7 +74,8 @@ public static Domain create_domain_config (InstallerMedia install_media, string
         set_target_media_config (domain, target_path, install_media);
         install_media.setup_domain_config (domain);
 
-        add_graphics_device (domain);
+        var graphics = create_graphics_device ();
+        domain.add_device (graphics);
 
         // SPICE agent channel. This is needed for features like copy&paste between host and guest etc to work.
         var channel = new DomainChannel ();
@@ -106,7 +107,10 @@ public static Domain create_domain_config (InstallerMedia install_media, string
         console.set_source (new DomainChardevSourcePty ());
         domain.add_device (console);
 
-        add_network_interface (domain, is_libvirt_bridge_net_available (), install_media.supports_virtio_net);
+        var iface = create_network_interface (domain,
+                                              is_libvirt_bridge_net_available (),
+                                              install_media.supports_virtio_net);
+        domain.add_device (iface);
 
         return domain;
     }
@@ -260,19 +264,20 @@ else if (device is DomainGraphicsSpice)
             else
                 devices.prepend (device);
         }
-        devices.reverse ();
-        domain.set_devices (devices);
 
         // If user interface device was found and removed, let's add bridge device now.
         if (iface != null) {
             var bridge = is_libvirt_bridge_net_available ();
             var virtio = iface.get_model () == "virtio";
 
-            add_network_interface (domain, bridge, virtio);
+            devices.prepend (create_network_interface (domain, bridge, virtio));
         }
 
         if (graphics != null)
-            add_graphics_device (domain);
+            devices.prepend (create_graphics_device ());
+
+        devices.reverse ();
+        domain.set_devices (devices);
     }
 
     public static void set_target_media_config (Domain         domain,
@@ -488,30 +493,31 @@ public static void add_usb_support (Domain domain) {
         domain.add_device (controller);
     }
 
-    public static void add_network_interface (Domain domain, bool bridge, bool virtio) {
+    public static DomainInterface create_network_interface (Domain domain, bool bridge, bool virtio) {
         DomainInterface iface;
 
         if (bridge) {
-            debug ("Adding bridge network to %s", domain.get_name ());
+            debug ("Creating bridge network device for %", domain.get_name ());
             var bridge_iface = new DomainInterfaceBridge ();
             bridge_iface.set_source ("virbr0");
             iface = bridge_iface;
         } else {
-            debug ("Adding user network to %s", domain.get_name ());
+            debug ("Creating user network device for %", domain.get_name ());
             iface = new DomainInterfaceUser ();
         }
 
         if (virtio)
             iface.set_model ("virtio");
 
-        domain.add_device (iface);
+        return iface;
     }
 
-    public static void add_graphics_device (Domain domain) {
+    public static DomainGraphicsSpice create_graphics_device () {
         var graphics = new DomainGraphicsSpice ();
         graphics.set_autoport (false);
         graphics.set_image_compression (DomainGraphicsSpiceImageCompression.OFF);
-        domain.add_device (graphics);
+
+        return graphics;
     }
 
     private static DomainControllerUsb create_usb_controller (DomainControllerUsbModel model,
-- 
2.10.1

Places

File ad606291-vm-configurator-Don-t-access-invalid-device-objects.patch of Package gnome-boxes (Revision acde141de17a5ec91c1b8a8361dcbcc7)

Places