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

disk: generate target controller-wise

Browse Source 
Add an optional parameter to generate_target() that controls what
controller the disk should reside in (using libvirt's rules to create
addresses).

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

29
virtinst/devicedisk.py
View File

@ -902,14 +902,18 @@ class VirtualDisk(VirtualDevice):
return _return(pref) return _return(pref)
return _return("sd") return _return("sd")
def generate_target(self, skip_targets): def generate_target(self, skip_targets, pref_ctrl=None):
""" """
Generate target device ('hda', 'sdb', etc..) for disk, excluding Generate target device ('hda', 'sdb', etc..) for disk, excluding
any targets in 'skip_targets'. Sets self.target, and returns the any targets in 'skip_targets'. If given the 'pref_ctrl'
generated value parameter, it tries to select the target so that the disk is
mapped onto that controller.
Sets self.target, and returns the generated value.
@param skip_targets: list of targets to exclude @param skip_targets: list of targets to exclude
@type skip_targets: C{list} @type skip_targets: C{list}
@param pref_ctrl: preferred controller to connect the disk to
@type pref_ctrl: C{int}
@raise ValueError: can't determine target type, no targets available @raise ValueError: can't determine target type, no targets available
@returns generated target @returns generated target
@rtype C{str} @rtype C{str}
@ -921,7 +925,13 @@ class VirtualDisk(VirtualDevice):
def get_target(): def get_target():
first_found = None first_found = None
for i in range(1, maxnode + 1): ran = range(1, maxnode + 1)
if pref_ctrl:
# We assume narrow SCSI bus and libvirt assigning 7
# (0-6, 7-13, etc.) devices per controller
ran = range(pref_ctrl * 7, (pref_ctrl + 1) * 7)
for i in ran:
gen_t = prefix + self.num_to_target(i) gen_t = prefix + self.num_to_target(i)
if gen_t in skip_targets: if gen_t in skip_targets:
skip_targets.remove(gen_t) skip_targets.remove(gen_t)
@ -937,7 +947,14 @@ class VirtualDisk(VirtualDevice):
if ret: if ret:
self.target = ret self.target = ret
return ret return ret
raise ValueError(_("Only %s disks of type '%s' are supported"
% (maxnode, prefix))) if pref_ctrl:
# This basically means that we either chose full
# controller or didn't add any
raise ValueError(_("Controller number %d for disk of type %s has "
"no empty slot to use" % (pref_ctrl, prefix)))
else:
raise ValueError(_("Only %s disks of type '%s' are supported"
% (maxnode, prefix)))
VirtualDisk.register_type() VirtualDisk.register_type()