virtManager: Remove disk SGIO UI
This is a very advanced field that is only shown for a quite advanced disk device='lun' config. Users that know they need this can easily set the value via the XML editor Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson
parent
79fe886ac8
commit
d9c0384607
|
|
@ -3077,37 +3077,6 @@
|
|||
<property name="top_attach">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="label66">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="halign">end</property>
|
||||
<property name="label" translatable="yes">_SGIO:</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="mnemonic_widget">disk-sgio-text</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">0</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkComboBox" id="disk-sgio">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="has_entry">True</property>
|
||||
<child internal-child="entry">
|
||||
<object class="GtkEntry" id="disk-sgio-text">
|
||||
<property name="can_focus">True</property>
|
||||
<signal name="changed" handler="on_disk_sgio_entry_changed" swapped="no"/>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="left_attach">1</property>
|
||||
<property name="top_attach">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkLabel" id="disk-pr-label">
|
||||
<property name="visible">True</property>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ from ..xmleditor import vmmXMLEditor
|
|||
EDIT_DISK_DISCARD,
|
||||
EDIT_DISK_DETECT_ZEROES,
|
||||
EDIT_DISK_BUS,
|
||||
EDIT_DISK_SGIO,
|
||||
EDIT_DISK_PATH,
|
||||
EDIT_DISK_PR,
|
||||
|
||||
|
|
@ -100,7 +99,7 @@ from ..xmleditor import vmmXMLEditor
|
|||
|
||||
EDIT_FS,
|
||||
|
||||
EDIT_HOSTDEV_ROMBAR) = range(1, 55)
|
||||
EDIT_HOSTDEV_ROMBAR) = range(1, 54)
|
||||
|
||||
|
||||
# Columns in hw list model
|
||||
|
|
@ -500,7 +499,6 @@ class vmmDetails(vmmGObjectUI):
|
|||
"on_disk_discard_combo_changed": lambda *x: self.enable_apply(x, EDIT_DISK_DISCARD),
|
||||
"on_disk_detect_zeroes_combo_changed": lambda *x: self.enable_apply(x, EDIT_DISK_DETECT_ZEROES),
|
||||
"on_disk_bus_combo_changed": lambda *x: self.enable_apply(x, EDIT_DISK_BUS),
|
||||
"on_disk_sgio_entry_changed": lambda *x: self.enable_apply(x, EDIT_DISK_SGIO),
|
||||
"on_disk_pr_checkbox_toggled": lambda *x: self.enable_apply(x, EDIT_DISK_PR),
|
||||
|
||||
"on_network_model_combo_changed": lambda *x: self.enable_apply(x, EDIT_NET_MODEL),
|
||||
|
|
@ -1723,10 +1721,6 @@ class vmmDetails(vmmGObjectUI):
|
|||
kwargs["detect_zeroes"] = uiutil.get_list_selection(
|
||||
self.widget("disk-detect-zeroes"))
|
||||
|
||||
if self.edited(EDIT_DISK_SGIO):
|
||||
sgio = uiutil.get_list_selection(self.widget("disk-sgio"))
|
||||
kwargs["sgio"] = sgio
|
||||
|
||||
if self.edited(EDIT_DISK_PR):
|
||||
kwargs["managed_pr"] = self.widget("disk-pr-checkbox").get_active()
|
||||
|
||||
|
|
@ -2234,16 +2228,6 @@ class vmmDetails(vmmGObjectUI):
|
|||
ignore, upper = maxmem.get_range()
|
||||
maxmem.set_range(curmem.get_value(), upper)
|
||||
|
||||
@staticmethod
|
||||
def build_disk_sgio(vm, combo):
|
||||
ignore = vm
|
||||
model = Gtk.ListStore(str, str)
|
||||
combo.set_model(model)
|
||||
uiutil.init_combo_text_column(combo, 1)
|
||||
model.append([None, _("Hypervisor default")])
|
||||
model.append(["filtered", "filtered"])
|
||||
model.append(["unfiltered", "unfiltered"])
|
||||
|
||||
def refresh_disk_page(self, disk):
|
||||
path = disk.path
|
||||
devtype = disk.device
|
||||
|
|
@ -2284,11 +2268,8 @@ class vmmDetails(vmmGObjectUI):
|
|||
can_set_removable)
|
||||
|
||||
is_lun = disk.device == virtinst.DeviceDisk.DEVICE_LUN
|
||||
uiutil.set_grid_row_visible(self.widget("disk-sgio"), is_lun)
|
||||
uiutil.set_grid_row_visible(self.widget("disk-pr-checkbox"), is_lun)
|
||||
if is_lun:
|
||||
self.build_disk_sgio(self.vm, self.widget("disk-sgio"))
|
||||
uiutil.set_list_selection(self.widget("disk-sgio"), disk.sgio)
|
||||
managed = disk.reservations_managed == "yes"
|
||||
self.widget("disk-pr-checkbox").set_active(managed)
|
||||
|
||||
|
|
|
|||
|
|
@ -659,7 +659,7 @@ class vmmDomain(vmmLibvirtObject):
|
|||
shareable=_SENTINEL, removable=_SENTINEL, cache=_SENTINEL,
|
||||
io=_SENTINEL, discard=_SENTINEL, detect_zeroes=_SENTINEL,
|
||||
bus=_SENTINEL, addrstr=_SENTINEL,
|
||||
sgio=_SENTINEL, managed_pr=_SENTINEL):
|
||||
managed_pr=_SENTINEL):
|
||||
xmlobj = self._make_xmlobj_to_define()
|
||||
editdev = self._lookup_device_to_define(xmlobj, devobj, do_hotplug)
|
||||
if not editdev:
|
||||
|
|
@ -712,9 +712,6 @@ class vmmDomain(vmmLibvirtObject):
|
|||
if detect_zeroes != _SENTINEL:
|
||||
editdev.driver_detect_zeroes = detect_zeroes or None
|
||||
|
||||
if sgio != _SENTINEL:
|
||||
editdev.sgio = sgio or None
|
||||
|
||||
if managed_pr != _SENTINEL:
|
||||
editdev.reservations_managed = "yes" if managed_pr else None
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue