Subject: Add virtio lun and virtio-scsi lun disk bus option
From: Chen Hanxiao chenhanxiao@cn.fujitsu.com Tue Dec 11 17:06:38 2012 +0800
Date: Fri Dec 14 19:21:35 2012 -0500:
Git: 8b22d7a763acab05558f36818b8f890c4b428c1d

 As a result of CVE-2011-4127, libvirt disabled generic SCSI
 commands passed through to the underlying disk by qemu
 from a guest to a virtio disk when device type is "disk"
 afer commit 177db087757e4adb02c211de56336a5991c8eb20.
 And libvirt introduce a new device type "lun"
 to allow SG_IO commands passing through.
 This patch allows VM admin to configure this via virt-manager.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>

Index: virt-manager-0.9.4/src/virtManager/addhardware.py
===================================================================
--- virt-manager-0.9.4.orig/src/virtManager/addhardware.py
+++ virt-manager-0.9.4/src/virtManager/addhardware.py
@@ -540,8 +540,12 @@ class vmmAddHardware(vmmGObjectUI):
         if self.vm.get_hv_type() == "kvm":
             add_dev("sata", virtinst.VirtualDisk.DEVICE_DISK, "SATA disk")
             add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio disk")
+            add_dev("virtio", virtinst.VirtualDisk.DEVICE_LUN,
+                    _("Virtio lun"))
             add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_DISK,
                     _("Virtio SCSI disk"))
+            add_dev("virtio-scsi", virtinst.VirtualDisk.DEVICE_LUN,
+                    _("Virtio SCSI lun"))
         if self.conn.is_xen():
             add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk")