diff --git a/tests/uitests/details.py b/tests/uitests/details.py index a3b45740e..ec19eda6c 100644 --- a/tests/uitests/details.py +++ b/tests/uitests/details.py @@ -229,7 +229,6 @@ class Details(uiutils.UITestCase): tab.find("Readonly:", "check box").click() tab.find("Advanced options", "toggle button").click_expander() tab.find("Storage format:", "text").text = "vmdk" - tab.find("Serial number:", "text").text = "1234-ABCD" tab.find("Disk bus:", "text").text = "usb" tab.find("Performance options", "toggle button").click_expander() tab.find("IO mode:", "text").text = "threads" diff --git a/ui/details.ui b/ui/details.ui index fe973b1b3..655cef4ce 100644 --- a/ui/details.ui +++ b/ui/details.ui @@ -3060,19 +3060,6 @@ 0 - - - True - True - - 20 - - - - 1 - 1 - - True @@ -3090,20 +3077,6 @@ 0 - - - True - False - end - Seria_l number: - True - disk-serial - - - 0 - 1 - - True diff --git a/virtManager/details/details.py b/virtManager/details/details.py index 39303c5f8..b45f1b94d 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 789774af9..6375dfe85 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