diff --git a/ui/details.ui b/ui/details.ui index f63819a03..8f8c2280d 100644 --- a/ui/details.ui +++ b/ui/details.ui @@ -3077,33 +3077,6 @@ 0 - - - True - False - end - Persistent _Reservations: - True - disk-pr-checkbox - - - 0 - 4 - - - - - True - True - False - False - - - - 1 - 4 - - False diff --git a/virtManager/details/details.py b/virtManager/details/details.py index 94e41c421..08f91cfd7 100644 --- a/virtManager/details/details.py +++ b/virtManager/details/details.py @@ -63,7 +63,6 @@ from ..xmleditor import vmmXMLEditor EDIT_DISK_DETECT_ZEROES, EDIT_DISK_BUS, EDIT_DISK_PATH, - EDIT_DISK_PR, EDIT_SOUND_MODEL, @@ -99,7 +98,7 @@ from ..xmleditor import vmmXMLEditor EDIT_FS, - EDIT_HOSTDEV_ROMBAR) = range(1, 54) + EDIT_HOSTDEV_ROMBAR) = range(1, 53) # Columns in hw list model @@ -499,7 +498,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_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), "on_network_mac_entry_changed": lambda *x: self.enable_apply(x, @@ -1721,9 +1719,6 @@ class vmmDetails(vmmGObjectUI): kwargs["detect_zeroes"] = uiutil.get_list_selection( self.widget("disk-detect-zeroes")) - if self.edited(EDIT_DISK_PR): - kwargs["managed_pr"] = self.widget("disk-pr-checkbox").get_active() - if self.edited(EDIT_DISK_BUS): bus = uiutil.get_list_selection(self.widget("disk-bus")) addr = None @@ -2267,12 +2262,6 @@ class vmmDetails(vmmGObjectUI): uiutil.set_grid_row_visible(self.widget("disk-removable"), can_set_removable) - is_lun = disk.device == virtinst.DeviceDisk.DEVICE_LUN - uiutil.set_grid_row_visible(self.widget("disk-pr-checkbox"), is_lun) - if is_lun: - managed = disk.reservations_managed == "yes" - self.widget("disk-pr-checkbox").set_active(managed) - self.widget("disk-size").set_text(size) uiutil.set_list_selection(self.widget("disk-cache"), cache) uiutil.set_list_selection(self.widget("disk-io"), io) diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index fba586355..a8b077c8a 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -658,8 +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, - managed_pr=_SENTINEL): + bus=_SENTINEL, addrstr=_SENTINEL): xmlobj = self._make_xmlobj_to_define() editdev = self._lookup_device_to_define(xmlobj, devobj, do_hotplug) if not editdev: @@ -712,9 +711,6 @@ class vmmDomain(vmmLibvirtObject): if detect_zeroes != _SENTINEL: editdev.driver_detect_zeroes = detect_zeroes or None - if managed_pr != _SENTINEL: - editdev.reservations_managed = "yes" if managed_pr else None - if bus != _SENTINEL: _change_bus()