mirror of
https://github.com/virt-manager/virt-manager.git
synced 2024-10-27 01:55:20 +03:00
virtManager: Remove magic spapr-* device handling
We have lots of spapr-* pretty printing and some magic handling spread around the codebase. These devices have fallen out of favor and are rarely used, so drop the special handling Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
parent
b583ea7e66
commit
2367e70efa
@ -1106,7 +1106,7 @@ class XMLParseTest(unittest.TestCase):
|
||||
adddev.type = "network"
|
||||
adddev.source = "default"
|
||||
adddev.macaddr = "1A:2A:3A:4A:5A:6A"
|
||||
adddev.address.set_addrstr("spapr-vio")
|
||||
adddev.address.type = "spapr-vio"
|
||||
adddev.set_defaults(guest)
|
||||
|
||||
# Test adding and removing the same device
|
||||
|
@ -491,8 +491,6 @@ class vmmAddHardware(vmmGObjectUI):
|
||||
if dev.type == "scsi":
|
||||
if dev.model == "virtio-scsi":
|
||||
ret = "Virtio " + ret
|
||||
elif dev.address.type == "spapr-vio":
|
||||
ret = "sPAPR " + ret
|
||||
if dev.type == "pci" and dev.model == "pcie-root":
|
||||
ret = "PCIe"
|
||||
return ret
|
||||
|
@ -1720,11 +1720,8 @@ class vmmDetails(vmmGObjectUI):
|
||||
self.widget("disk-detect-zeroes"))
|
||||
|
||||
if self.edited(EDIT_DISK_BUS):
|
||||
bus = uiutil.get_list_selection(self.widget("disk-bus"))
|
||||
addr = None
|
||||
|
||||
kwargs["bus"] = bus
|
||||
kwargs["addrstr"] = addr
|
||||
kwargs["bus"] = uiutil.get_list_selection(
|
||||
self.widget("disk-bus"))
|
||||
|
||||
return vmmAddHardware.change_config_helper(self.vm.define_disk,
|
||||
kwargs, self.vm, self.err,
|
||||
@ -1759,11 +1756,7 @@ class vmmDetails(vmmGObjectUI):
|
||||
|
||||
if self.edited(EDIT_NET_MODEL):
|
||||
model = uiutil.get_list_selection(self.widget("network-model"))
|
||||
addrstr = None
|
||||
if model == "spapr-vlan":
|
||||
addrstr = "spapr-vio"
|
||||
kwargs["model"] = model
|
||||
kwargs["addrstr"] = addrstr
|
||||
|
||||
if self.edited(EDIT_NET_SOURCE):
|
||||
(kwargs["ntype"], kwargs["source"],
|
||||
|
@ -365,8 +365,6 @@ class vmmNetworkList(vmmGObjectUI):
|
||||
net.model = model
|
||||
net.source_mode = mode
|
||||
net.portgroup = portgroup
|
||||
if net.model == "spapr-vlan":
|
||||
net.address.set_addrstr("spapr-vio")
|
||||
|
||||
if net.type == "direct":
|
||||
(vport_type, vport_managerid, vport_typeid,
|
||||
|
@ -658,7 +658,7 @@ class vmmDomain(vmmLibvirtObject):
|
||||
path=_SENTINEL, readonly=_SENTINEL,
|
||||
shareable=_SENTINEL, removable=_SENTINEL, cache=_SENTINEL,
|
||||
io=_SENTINEL, discard=_SENTINEL, detect_zeroes=_SENTINEL,
|
||||
bus=_SENTINEL, addrstr=_SENTINEL):
|
||||
bus=_SENTINEL):
|
||||
xmlobj = self._make_xmlobj_to_define()
|
||||
editdev = self._lookup_device_to_define(xmlobj, devobj, do_hotplug)
|
||||
if not editdev:
|
||||
@ -673,7 +673,6 @@ class vmmDomain(vmmLibvirtObject):
|
||||
return
|
||||
|
||||
editdev.address.clear()
|
||||
editdev.address.set_addrstr(addrstr)
|
||||
|
||||
if oldprefix == editdev.get_target_prefix()[0]:
|
||||
return
|
||||
@ -721,7 +720,7 @@ class vmmDomain(vmmLibvirtObject):
|
||||
|
||||
def define_network(self, devobj, do_hotplug,
|
||||
ntype=_SENTINEL, source=_SENTINEL,
|
||||
mode=_SENTINEL, model=_SENTINEL, addrstr=_SENTINEL,
|
||||
mode=_SENTINEL, model=_SENTINEL,
|
||||
vtype=_SENTINEL, managerid=_SENTINEL, typeid=_SENTINEL,
|
||||
typeidversion=_SENTINEL, instanceid=_SENTINEL,
|
||||
portgroup=_SENTINEL, macaddr=_SENTINEL, linkstate=_SENTINEL):
|
||||
@ -741,7 +740,6 @@ class vmmDomain(vmmLibvirtObject):
|
||||
if model != _SENTINEL:
|
||||
if editdev.model != model:
|
||||
editdev.address.clear()
|
||||
editdev.address.set_addrstr(addrstr)
|
||||
editdev.model = model
|
||||
|
||||
if vtype != _SENTINEL:
|
||||
|
@ -69,8 +69,6 @@ class DeviceAddress(XMLBuilder):
|
||||
self.domain = "0"
|
||||
if ":" in addrstr:
|
||||
self.domain, self.bus = addrstr.split(":", 1)
|
||||
elif addrstr == "spapr-vio":
|
||||
self.type = self.ADDRESS_TYPE_SPAPR_VIO
|
||||
else:
|
||||
raise ValueError(_("Could not determine or unsupported "
|
||||
"format of '%s'") % addrstr)
|
||||
|
Loading…
Reference in New Issue
Block a user