Attachment 297539 Details for Bug 436755 – Fix use of DBus interface

[patch] Fix use of DBus interface

virt-manager-0.4.0-dbus-interface.patch (text/plain), 6.11 KB, created by Daniel Berrangé on 2008-03-11 00:31:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2008-03-11 00:31:49 UTC

Size: 6.11 KB

patch

obsolete

>diff -rup virt-manager-0.4.0.orig/src/virtManager/connection.py virt-manager-0.4.0.new/src/virtManager/connection.py
>--- virt-manager-0.4.0.orig/src/virtManager/connection.py	2008-03-06 15:45:02.000000000 -0500
>+++ virt-manager-0.4.0.new/src/virtManager/connection.py	2008-03-06 15:50:09.000000000 -0500
>@@ -112,10 +112,11 @@ class vmmConnection(gobject.GObject):
> 
>     def _device_added(self, path):
>         obj = self.bus.get_object("org.freedesktop.Hal", path)
>-        if obj.QueryCapability("net"):
>+        objif = dbus.Interface(obj, "org.freedesktop.Hal.Device")
>+        if objif.QueryCapability("net"):
>             if not self.netdevs.has_key(path):
>-                name = obj.GetPropertyString("net.interface")
>-                mac = obj.GetPropertyString("net.address")
>+                name = objif.GetPropertyString("net.interface")
>+                mac = objif.GetPropertyString("net.address")
> 
>                 # Now magic to determine if the device is part of a bridge
>                 shared = False
>@@ -123,7 +124,7 @@ class vmmConnection(gobject.GObject):
>                 try:
>                     # XXX Linux specific - needs porting for other OS - patches
>                     # welcomed...
>-                    sysfspath = obj.GetPropertyString("linux.sysfs_path")
>+                    sysfspath = objif.GetPropertyString("linux.sysfs_path")
> 
>                     # Sick, disgusting hack for Xen netloop crack which renames
>                     # ethN -> pethN, but which HAL never sees
>diff -rup virt-manager-0.4.0.orig/src/virtManager/createnet.py virt-manager-0.4.0.new/src/virtManager/createnet.py
>--- virt-manager-0.4.0.orig/src/virtManager/createnet.py	2007-04-16 09:31:47.000000000 -0400
>+++ virt-manager-0.4.0.new/src/virtManager/createnet.py	2008-03-06 15:45:18.000000000 -0500
>@@ -387,10 +387,11 @@ class vmmCreateNetwork(gobject.GObject):
>         # Find info about all current present media
>         for d in self.hal_iface.FindDeviceByCapability("volume"):
>             vol = self.bus.get_object("org.freedesktop.Hal", d)
>-            if vol.GetPropertyBoolean("volume.is_disc") and \
>-                   vol.GetPropertyBoolean("volume.disc.has_data"):
>-                devnode = vol.GetProperty("block.device")
>-                label = vol.GetProperty("volume.label")
>+            volif = dbus.Interface(vol, "org.freedesktop.Hal.Device")
>+            if volif.GetPropertyBoolean("volume.is_disc") and \
>+                   volif.GetPropertyBoolean("volume.disc.has_data"):
>+                devnode = volif.GetProperty("block.device")
>+                label = volif.GetProperty("volume.label")
>                 if label == None or len(label) == 0:
>                     label = devnode
>                 vollabel[devnode] = label
>@@ -399,7 +400,8 @@ class vmmCreateNetwork(gobject.GObject):
> 
>         for d in self.hal_iface.FindDeviceByCapability("storage.cdrom"):
>             dev = self.bus.get_object("org.freedesktop.Hal", d)
>-            devnode = dev.GetProperty("block.device")
>+            devif = dbus.Interface(dev, "org.freedesktop.Hal.Device")
>+            devnode = devif.GetProperty("block.device")
>             if vollabel.has_key(devnode):
>                 model.append([devnode, vollabel[devnode], True, volpath[devnode]])
>             else:
>diff -rup virt-manager-0.4.0.orig/src/virtManager/create.py virt-manager-0.4.0.new/src/virtManager/create.py
>--- virt-manager-0.4.0.orig/src/virtManager/create.py	2008-03-06 15:45:02.000000000 -0500
>+++ virt-manager-0.4.0.new/src/virtManager/create.py	2008-03-06 15:52:04.000000000 -0500
>@@ -978,10 +978,11 @@ class vmmCreate(gobject.GObject):
>         # Find info about all current present media
>         for d in self.hal_iface.FindDeviceByCapability("volume"):
>             vol = self.bus.get_object("org.freedesktop.Hal", d)
>-            if vol.GetPropertyBoolean("volume.is_disc") and \
>-                   vol.GetPropertyBoolean("volume.disc.has_data"):
>-                devnode = vol.GetProperty("block.device")
>-                label = vol.GetProperty("volume.label")
>+            volif = dbus.Interface(vol, "org.freedesktop.Hal.Device")
>+            if volif.GetPropertyBoolean("volume.is_disc") and \
>+                   volif.GetPropertyBoolean("volume.disc.has_data"):
>+                devnode = volif.GetProperty("block.device")
>+                label = volif.GetProperty("volume.label")
>                 if label == None or len(label) == 0:
>                     label = devnode
>                 vollabel[devnode] = label
>@@ -990,7 +991,8 @@ class vmmCreate(gobject.GObject):
> 
>         for d in self.hal_iface.FindDeviceByCapability("storage.cdrom"):
>             dev = self.bus.get_object("org.freedesktop.Hal", d)
>-            devnode = dev.GetProperty("block.device")
>+            devif = dbus.Interface(dev, "org.freedesktop.Hal.Device")
>+            devnode = devif.GetProperty("block.device")
>             if vollabel.has_key(devnode):
>                 model.append([devnode, vollabel[devnode], True, volpath[devnode]])
>             else:
>@@ -998,11 +1000,12 @@ class vmmCreate(gobject.GObject):
> 
>     def _device_added(self, path):
>         vol = self.bus.get_object("org.freedesktop.Hal", path)
>-        if vol.QueryCapability("volume"):
>-            if vol.GetPropertyBoolean("volume.is_disc") and \
>-                   vol.GetPropertyBoolean("volume.disc.has_data"):
>-                devnode = vol.GetProperty("block.device")
>-                label = vol.GetProperty("volume.label")
>+        volif = dbus.Interface(vol, "org.freedesktop.Hal.Device")
>+        if volif.QueryCapability("volume"):
>+            if volif.GetPropertyBoolean("volume.is_disc") and \
>+                   volif.GetPropertyBoolean("volume.disc.has_data"):
>+                devnode = volif.GetProperty("block.device")
>+                label = volif.GetProperty("volume.label")
>                 if label == None or len(label) == 0:
>                     label = devnode
> 
>@@ -1018,7 +1021,6 @@ class vmmCreate(gobject.GObject):
>                         row[3] = path
> 
>     def _device_removed(self, path):
>-        vol = self.bus.get_object("org.freedesktop.Hal", path)
>         cdlist = self.window.get_widget("cd-path")
>         model = cdlist.get_model()
>

Actions: View | Diff

Attachments on bug 436755: 297539