Skip to content

Commit 7e2a342

Browse files
qinz0822MarkSymsCtx
authored andcommitted
Remove unused scripts and code
Signed-off-by: Qin Zhang <qin.zhang@citrix.com>
1 parent 5deac9e commit 7e2a342

File tree

6 files changed

+6
-73
lines changed

6 files changed

+6
-73
lines changed

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@ install: precheck
212212
ln -sf $(SM_DEST)lcache.py $(SM_STAGING)$(BIN_DEST)tapdisk-cache-stats
213213
ln -sf /dev/null $(SM_STAGING)$(UDEV_RULES_DIR)/69-dm-lvm-metad.rules
214214
install -m 755 scripts/xs-mpath-scsidev.sh $(SM_STAGING)$(UDEV_SCRIPTS_DIR)
215-
install -m 755 scripts/xe-getarrayidentifier $(SM_STAGING)$(BIN_DEST)
216-
install -m 755 scripts/xe-getlunidentifier $(SM_STAGING)$(BIN_DEST)
217215
install -m 755 scripts/make-dummy-sr $(SM_STAGING)$(LIBEXEC)
218216
install -m 755 scripts/storage-init $(SM_STAGING)$(LIBEXEC)
219217

drivers/scsiutil.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -357,16 +357,6 @@ def rescan(ids, fullrescan=True):
357357
refresh_HostID(id, fullrescan)
358358

359359

360-
def _genArrayIdentifier(dev):
361-
try:
362-
cmd = ["sg_inq", "--page=0xc8", "-r", dev]
363-
id = util.pread2(cmd)
364-
#pylint: disable=no-member
365-
return id.encode("hex")[180:212]
366-
except:
367-
return ""
368-
369-
370360
def _genHostList(procname):
371361
# loop through and check all adapters
372362
ids = []

drivers/util.py

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,16 +1232,6 @@ def daemon():
12321232
os.open('/dev/null', os.O_RDWR)
12331233
os.dup2(0, 1)
12341234
os.dup2(0, 2)
1235-
#########################
1236-
1237-
if __debug__:
1238-
try:
1239-
#pylint: disable=used-before-assignment
1240-
XE_IOFI_IORETRY
1241-
except NameError:
1242-
XE_IOFI_IORETRY = os.environ.get('XE_IOFI_IORETRY', None)
1243-
if __name__ == 'util' and XE_IOFI_IORETRY is not None:
1244-
__import__('iofi')
12451235

12461236
################################################################################
12471237
#
@@ -1777,18 +1767,18 @@ def hideValuesInPropMap(propmap, propnames):
17771767

17781768
def hidePasswdInConfig(config):
17791769
"""
1780-
Function to hide passwd values in a simple prop map,
1770+
Function to hide passwd values in a simple prop map,
17811771
for example "device_config"
17821772
"""
17831773
return hideValuesInPropMap(config, PASSWD_PROP_KEYS)
17841774

17851775

17861776
def hidePasswdInParams(params, configProp):
17871777
"""
1788-
Function to hide password values in a specified property which
1778+
Function to hide password values in a specified property which
17891779
is a simple map of prop name/values, and is itself an prop entry
17901780
in a larger property map.
1791-
For example, param maps containing "device_config", or
1781+
For example, param maps containing "device_config", or
17921782
"sm_config", etc
17931783
"""
17941784
params[configProp] = hideValuesInPropMap(params[configProp], PASSWD_PROP_KEYS)
@@ -1797,11 +1787,11 @@ def hidePasswdInParams(params, configProp):
17971787

17981788
def hideMemberValuesInXmlParams(xmlParams, propnames=PASSWD_PROP_KEYS):
17991789
"""
1800-
Function to hide password values in XML params, specifically
1790+
Function to hide password values in XML params, specifically
18011791
for the XML format of incoming params to SR modules.
1802-
Uses text parsing: loop through the list of specific propnames
1792+
Uses text parsing: loop through the list of specific propnames
18031793
whose values we want to hide, and:
1804-
- Assemble a full "prefix" containing each property name, e.g.,
1794+
- Assemble a full "prefix" containing each property name, e.g.,
18051795
"<member><name>password</name><value>"
18061796
- Test the XML if it contains that string, save the index.
18071797
- If found, get the index of the ending tag

mk/sm.spec.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ tests/run_python_unittests.sh
118118
/etc/xensource/master.d/02-vhdcleanup
119119
/opt/xensource/bin/blktap2
120120
/opt/xensource/bin/tapdisk-cache-stats
121-
/opt/xensource/bin/xe-getarrayidentifier
122-
/opt/xensource/bin/xe-getlunidentifier
123121
/opt/xensource/debug/tp
124122
/opt/xensource/libexec/check-device-sharing
125123
/opt/xensource/libexec/dcopy

scripts/xe-getarrayidentifier

Lines changed: 0 additions & 21 deletions
This file was deleted.

scripts/xe-getlunidentifier

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)