summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChen Hanxiao <chenhanxiao@cn.fujitsu.com>2012-12-11 17:06:38 +0800
committerCole Robinson <crobinso@redhat.com>2012-12-14 19:21:35 -0500
commit8b22d7a763acab05558f36818b8f890c4b428c1d (patch)
treedbc925b467a1a8499128314fc011efef2621ed0f
parentad1b24e885670d36b4ffd3a96434fd19dbe2ce98 (diff)
downloadvirt-manager-8b22d7a763acab05558f36818b8f890c4b428c1d.tar.gz
Add virtio lun and virtio-scsi lun disk bus option
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>
-rw-r--r--src/virtManager/addhardware.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
index 25a3068b..be40ff84 100644
--- a/src/virtManager/addhardware.py
+++ b/src/virtManager/addhardware.py
@@ -544,8 +544,12 @@ class vmmAddHardware(vmmGObjectUI):
_("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() or self.conn.is_test_conn():
add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK,
_("Xen virtual disk"))