From d46b89ec096c5480b95950e153373c803431183d Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Wed, 29 Jan 2020 05:49:13 -0500 Subject: [PATCH] devices: disk: Remove dead code in get_target_prefix The goal of this was to handle the case of a new libvirt bus that we didn't know the prefix for. I suspect all new buses will in practice use the 'sd' prefix, so this will never trigger Signed-off-by: Cole Robinson --- virtinst/devices/disk.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/virtinst/devices/disk.py b/virtinst/devices/disk.py index b5e2c7ca4..93ae9e5bc 100644 --- a/virtinst/devices/disk.py +++ b/virtinst/devices/disk.py @@ -802,7 +802,7 @@ class DeviceDisk(Device): return ret - def get_target_prefix(self, used_targets=None): + def get_target_prefix(self): """ Returns the suggested disk target prefix (hd, xvd, sd ...) for the disk. @@ -828,18 +828,10 @@ class DeviceDisk(Device): return _return("fd") elif self.bus == "ide": return _return("hd") - elif self.bus or not used_targets: - # sata, scsi, usb, sd - return _return("sd") - - # If guest already has some disks defined - preforder = ["vd", "xvd", "sd", "hd"] - for pref in preforder: - for target in used_targets: - if target.startswith(pref): - return _return(pref) + # sata, scsi, usb, sd return _return("sd") + def generate_target(self, skip_targets): """ Generate target device ('hda', 'sdb', etc..) for disk, excluding @@ -849,7 +841,7 @@ class DeviceDisk(Device): :param skip_targets: list of targets to exclude :returns: generated target """ - prefix, maxnode = self.get_target_prefix(skip_targets) + prefix, maxnode = self.get_target_prefix() skip_targets = [t for t in skip_targets if t and t.startswith(prefix)] skip_targets.sort()