[virt-tools-list] [virt-manager PATCH 1/2] Revert "create: customize: Hide bus=virtio-scsi"

Pavel Hrdina phrdina at redhat.com
Mon Aug 3 16:52:06 UTC 2015


This reverts commit cca34185c01971e9433c162abf0eee1525322516.

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 virtManager/addhardware.py | 5 ++---
 virtManager/details.py     | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py
index 7607529..088085e 100644
--- a/virtManager/addhardware.py
+++ b/virtManager/addhardware.py
@@ -708,7 +708,7 @@ class vmmAddHardware(vmmGObjectUI):
         combo.set_active(-1)
 
     @staticmethod
-    def populate_disk_bus_combo(vm, devtype, model, do_virtio_scsi=True):
+    def populate_disk_bus_combo(vm, devtype, model):
         rows = []
         if vm.is_hvm():
             if not vm.get_xmlobj().os.is_q35():
@@ -723,8 +723,7 @@ class vmmAddHardware(vmmGObjectUI):
         if vm.get_hv_type() in ["qemu", "kvm", "test"]:
             rows.append(["sd", "SD"])
             rows.append(["virtio", "VirtIO"])
-            if do_virtio_scsi:
-                rows.append(["virtio-scsi", "VirtIO SCSI"])
+            rows.append(["virtio-scsi", "VirtIO SCSI"])
             if vm.xmlobj.os.is_pseries():
                 rows.append(["spapr-vscsi", "sPAPR-vSCSI"])
 
diff --git a/virtManager/details.py b/virtManager/details.py
index 718f50a..6ab1bad 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -2757,11 +2757,8 @@ class vmmDetails(vmmGObjectUI):
         self.widget("disk-format").get_child().set_text(driver_type)
         self.widget("disk-format-warn").hide()
 
-        # skip virtio-scsi since we don't handle it correctly yet, need
-        # to duplicate the addhw logic
         vmmAddHardware.populate_disk_bus_combo(self.vm, devtype,
-            self.widget("disk-bus").get_model(),
-            do_virtio_scsi=False)
+            self.widget("disk-bus").get_model())
         uiutil.set_list_selection(self.widget("disk-bus"), bus)
         self.widget("disk-serial").set_text(serial or "")
 
-- 
2.4.6




More information about the virt-tools-list mailing list