Change in vdsm[master]: vdsm: move general devices to vmdevices

mpolednik at redhat.com mpolednik at redhat.com
Tue Sep 2 09:32:21 UTC 2014


Martin Polednik has uploaded a new change for review.

Change subject: vdsm: move general devices to vmdevices
......................................................................

vdsm: move general devices to vmdevices

No code changes, only moving around

Change-Id: I2a904346d7ef3b4f3a89e68030e44e21377b7645
Signed-off-by: Martin Polednik <mpolednik at redhat.com>
---
M vdsm/virt/vm.py
M vdsm/virt/vmdevices.py
2 files changed, 10 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/32294/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 4579fdc..e71c08c 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -682,15 +682,6 @@
         return f
 
 
-class GeneralDevice(vmdevices.Base):
-
-    def getXML(self):
-        """
-        Create domxml for general device
-        """
-        return self.createXmlElem(self.type, self.device, ['address'])
-
-
 class ControllerDevice(vmdevices.Base):
     __slots__ = ('address', 'model', 'index', 'master')
 
@@ -1428,7 +1419,7 @@
                      (VIDEO_DEVICES, VideoDevice),
                      (GRAPHICS_DEVICES, GraphicsDevice),
                      (CONTROLLER_DEVICES, ControllerDevice),
-                     (GENERAL_DEVICES, GeneralDevice),
+                     (GENERAL_DEVICES, vmdevices.GeneralDevice),
                      (BALLOON_DEVICES, BalloonDevice),
                      (WATCHDOG_DEVICES, WatchdogDevice),
                      (CONSOLE_DEVICES, ConsoleDevice),
diff --git a/vdsm/virt/vmdevices.py b/vdsm/virt/vmdevices.py
index bdb0908..c4f26bc 100644
--- a/vdsm/virt/vmdevices.py
+++ b/vdsm/virt/vmdevices.py
@@ -43,3 +43,12 @@
         attrs = [':'.join((a, str(getattr(self, a, None)))) for a in dir(self)
                  if not a.startswith('__')]
         return ' '.join(attrs)
+
+
+class GeneralDevice(Base):
+
+    def getXML(self):
+        """
+        Create domxml for general device
+        """
+        return self.createXmlElem(self.type, self.device, ['address'])


-- 
To view, visit http://gerrit.ovirt.org/32294
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a904346d7ef3b4f3a89e68030e44e21377b7645
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik at redhat.com>


More information about the vdsm-patches mailing list