shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-23 17:34:21 +03:00
Code Issues Projects Releases Wiki Activity

nodedev: Remove subdev for pretty_name, it's pointless

Browse Source
This commit is contained in:
Cole Robinson 2014-01-12 14:52:15 -05:00
parent dd57f2f221
commit cad64c0dc1
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtManager/addhardware.py
View File

@ -586,7 +586,7 @@ class vmmAddHardware(vmmGObjectUI):
for subdev in subdevs:
if dev.name == subdev.parent:
prettyname = dev.pretty_name(subdev)
prettyname += " (%s)" % subdev.pretty_name()
model.append([prettyname, dev.name, devtype, dev])

28
virtinst/nodedev.py
View File

@ -110,18 +110,14 @@ class NodeDevice(XMLBuilder):
parent = XMLProperty("./parent")
device_type = XMLProperty("./capability/@type")
def pretty_name(self, child_dev=None):
def pretty_name(self):
"""
Use device information to attempt to print a human readable device
name.
@param child_dev: Child node device to display in description
@type child_dev: L{NodeDevice}
@returns: Device description string
@rtype C{str}
"""
ignore = child_dev
return self.name
@ -135,8 +131,7 @@ class SystemDevice(NodeDevice):
fw_version = XMLProperty("./capability/firmware/version")
fw_date = XMLProperty("./capability/firmware/release_date")
def pretty_name(self, child_dev=None):
ignore = child_dev
def pretty_name(self):
desc = _("System")
if self.hw_vendor:
desc += ": %s" % self.hw_vendor
@ -151,8 +146,7 @@ class NetDevice(NodeDevice):
address = XMLProperty("./capability/address")
capability_type = XMLProperty("./capability/capability/@type")
def pretty_name(self, child_dev=None):
ignore = child_dev
def pretty_name(self):
desc = self.name
if self.interface:
desc = _("Interface %s") % self.interface
@ -173,16 +167,12 @@ class PCIDevice(NodeDevice):
iommu_group = XMLProperty("./capability/iommuGroup/@number", is_int=True)
def pretty_name(self, child_dev=None):
def pretty_name(self):
devstr = "%.2X:%.2X:%X" % (int(self.bus),
int(self.slot),
int(self.function))
if child_dev:
desc = "%s %s (%s)" % (devstr, child_dev.pretty_name(),
str(self.product_name))
else:
desc = "%s %s" % (devstr, str(self.product_name))
return desc
return "%s %s %s" % (devstr, self.product_name)
class USBDevice(NodeDevice):
@ -194,8 +184,7 @@ class USBDevice(NodeDevice):
vendor_name = XMLProperty("./capability/vendor")
vendor_id = XMLProperty("./capability/vendor/@id")
def pretty_name(self, child_dev=None):
ignore = child_dev
def pretty_name(self):
devstr = "%.3d:%.3d" % (int(self.bus), int(self.device))
desc = "%s %s %s" % (devstr, str(self.vendor_name),
str(self.product_name))
@ -232,8 +221,7 @@ class StorageDevice(NodeDevice):
self._media_available = val
media_available = property(_get_media_available, _set_media_available)
def pretty_name(self, child_dev=None):
ignore = child_dev
def pretty_name(self):
desc = ""
if self.drive_type:
desc = self.drive_type