diff options
| author | Cole Robinson <crobinso@redhat.com> | 2020-01-25 12:36:03 -0500 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2020-01-25 13:45:43 -0500 |
| commit | 106686758346c7f7f0f25ce2a29e36fa6dff0547 (patch) | |
| tree | 5af8b44fa3ca7597a50700eca3180ef0b4ca8ad0 /virtManager | |
| parent | bd82ef65292cc47cffc27b8f67d7987679c61bf3 (diff) | |
| download | virt-manager-106686758346c7f7f0f25ce2a29e36fa6dff0547.tar.gz | |
virtManager: Remove disk serial UI
This was proposed here:
https://www.redhat.com/archives/virt-tools-list/2019-June/msg00117.html
"""
* disk: serial: I know this is useful in some cases but seems quite
obscure. I think the XML editor is fine unless there's some common
usecase I'm missing
"""
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'virtManager')
| -rw-r--r-- | virtManager/details/details.py | 9 | ||||
| -rw-r--r-- | virtManager/object/domain.py | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/virtManager/details/details.py b/virtManager/details/details.py index 39303c5f..b45f1b94 100644 --- a/virtManager/details/details.py +++ b/virtManager/details/details.py @@ -62,7 +62,6 @@ from ..xmleditor import vmmXMLEditor EDIT_DISK_DISCARD, EDIT_DISK_DETECT_ZEROES, EDIT_DISK_BUS, - EDIT_DISK_SERIAL, EDIT_DISK_FORMAT, EDIT_DISK_SGIO, EDIT_DISK_PATH, @@ -102,7 +101,7 @@ from ..xmleditor import vmmXMLEditor EDIT_FS, - EDIT_HOSTDEV_ROMBAR) = range(1, 57) + EDIT_HOSTDEV_ROMBAR) = range(1, 56) # Columns in hw list model @@ -503,7 +502,6 @@ class vmmDetails(vmmGObjectUI): "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_format_changed": self.disk_format_changed, - "on_disk_serial_changed": lambda *x: self.enable_apply(x, EDIT_DISK_SERIAL), "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), @@ -1734,9 +1732,6 @@ class vmmDetails(vmmGObjectUI): if self.edited(EDIT_DISK_FORMAT): kwargs["driver_type"] = self.widget("disk-format").get_text() - if self.edited(EDIT_DISK_SERIAL): - kwargs["serial"] = self.get_text("disk-serial") - if self.edited(EDIT_DISK_SGIO): sgio = uiutil.get_list_selection(self.widget("disk-sgio")) kwargs["sgio"] = sgio @@ -2270,7 +2265,6 @@ class vmmDetails(vmmGObjectUI): discard = disk.driver_discard detect_zeroes = disk.driver_detect_zeroes driver_type = disk.driver_type or "" - serial = disk.serial size = "-" if path: @@ -2321,7 +2315,6 @@ class vmmDetails(vmmGObjectUI): vmmAddHardware.populate_disk_bus_combo(self.vm, devtype, self.widget("disk-bus").get_model()) uiutil.set_list_selection(self.widget("disk-bus"), bus) - self.widget("disk-serial").set_text(serial or "") is_removable = disk.is_cdrom() or disk.is_floppy() self.widget("disk-source-box").set_visible(is_removable) diff --git a/virtManager/object/domain.py b/virtManager/object/domain.py index 789774af..6375dfe8 100644 --- a/virtManager/object/domain.py +++ b/virtManager/object/domain.py @@ -655,7 +655,7 @@ class vmmDomain(vmmLibvirtObject): ###################### def define_disk(self, devobj, do_hotplug, - path=_SENTINEL, readonly=_SENTINEL, serial=_SENTINEL, + path=_SENTINEL, readonly=_SENTINEL, shareable=_SENTINEL, removable=_SENTINEL, cache=_SENTINEL, io=_SENTINEL, discard=_SENTINEL, detect_zeroes=_SENTINEL, driver_type=_SENTINEL, bus=_SENTINEL, addrstr=_SENTINEL, @@ -713,8 +713,6 @@ class vmmDomain(vmmLibvirtObject): editdev.driver_detect_zeroes = detect_zeroes or None if driver_type != _SENTINEL: editdev.driver_type = driver_type or None - if serial != _SENTINEL: - editdev.serial = serial or None if sgio != _SENTINEL: editdev.sgio = sgio or None |