NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rework disk target assignment

Browse Source 
Using previous patches, this one makes the disk target generation a
bit more intelligent, so adding multiple disks with various
controllers is not a problem anymore.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1036716

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2014-02-12 15:58:40 +01:00
parent 6c4302b0a7
commit 078e1a4d05
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
virtManager/addhardware.py
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2007, 2013, 2014 Red Hat, Inc. # Copyright (C) 2006-2007, 2012-2014 Red Hat, Inc.
# Copyright (C) 2006 Hugh O. Brock <hbrock@redhat.com> # Copyright (C) 2006 Hugh O. Brock <hbrock@redhat.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -20,6 +20,7 @@
import logging import logging
import traceback import traceback
import collections
# pylint: disable=E0611 # pylint: disable=E0611
from gi.repository import Gtk from gi.repository import Gtk
@ -1412,34 +1413,45 @@ class vmmAddHardware(vmmGObjectUI):
self._dev.validate() self._dev.validate()
return ret return ret
def _set_disk_controller(self, disk, controller_model): def _set_disk_controller(self, disk, controller_model, used_disks):
# Add a SCSI controller with model virtio-scsi if needed # Add a SCSI controller with model virtio-scsi if needed
disk.vmm_controller = None disk.vmm_controller = None
if controller_model != "virtio-scsi": if controller_model != "virtio-scsi":
return return None
# Get SCSI controllers
controllers = self.vm.get_controller_devices() controllers = self.vm.get_controller_devices()
ctrls_scsi = [x for x in controllers if ctrls_scsi = [x for x in controllers if
(x.type == VirtualController.TYPE_SCSI)] (x.type == VirtualController.TYPE_SCSI)]
if len(ctrls_scsi) > 0:
index_new = max([x.index for x in ctrls_scsi]) + 1
else:
index_new = 0
# Create possible new controller
controller = VirtualController(self.conn.get_backend()) controller = VirtualController(self.conn.get_backend())
controller.type = "scsi" controller.type = "scsi"
controller.model = controller_model controller.model = controller_model
disk.vmm_controller = controller
for d in controllers:
if controller.type == d.type:
controller.index = index_new
if controller_model == d.model:
disk.vmm_controller = None
controller = d
break
disk.address.type = disk.address.ADDRESS_TYPE_DRIVE # And set its index
disk.address.controller = controller.index controller.index = 0
if ctrls_scsi:
controller.index = max([x.index for x in ctrls_scsi]) + 1
# Take only virtio-scsi ones
ctrls_scsi = [x for x in ctrls_scsi
if x.model == controller_model]
# Save occupied places per controller
occupied = collections.defaultdict(int)
for d in used_disks:
if d.bus == disk.bus:
num = virtinst.VirtualDisk.target_to_num(d.target)
occupied[num / 7] += 1
for c in ctrls_scsi:
if occupied[c.index] < 7:
controller = c
break
else:
disk.vmm_controller = controller
return controller.index
def validate_page_storage(self): def validate_page_storage(self):
bus = self.get_config_disk_bus() bus = self.get_config_disk_bus()
@ -1471,9 +1483,9 @@ class vmmAddHardware(vmmGObjectUI):
for d in disks: for d in disks:
used.append(d.target) used.append(d.target)
disk.generate_target(used) prefer_ctrl = self._set_disk_controller(disk, controller_model, disks)
disk.generate_target(used, prefer_ctrl)
self._set_disk_controller(disk, controller_model)
except Exception, e: except Exception, e:
return self.err.val_err(_("Storage parameter error."), e) return self.err.val_err(_("Storage parameter error."), e)