Skip to content

Commit 641bf5b

Browse files
committed
xenmgr: Remove config.ui idle-time-threshold property
xenmgr no longer acts on the idle time, xcpmd is supposed to handle that. This is no longer used and can be removed. However, the the UI still queries this. Make it just return 0 and drop writes. Later on the UI can remove the use and this can be removed here and from the IDL. Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
1 parent 795a866 commit 641bf5b

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

xenmgr/XenMgr/Config.hs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module XenMgr.Config
2727
, appSvmAutoStartDelay
2828
, appOverwriteServiceVmSettings
2929
, appXcDiagTimeout
30-
, appIdleTimeThreshold
3130
, appArgoHostsFile
3231
, appMultiGpuPt
3332
, appSeamlessTrafficDefault
@@ -43,7 +42,6 @@ module XenMgr.Config
4342
, appSetSvmAutoStartDelay
4443
, appSetOverwriteServiceVmSettings
4544
, appSetXcDiagTimeout
46-
, appSetIdleTimeThreshold
4745
, appSetArgoHostsFile
4846
, appSetPlatformCryptoKeyDirs
4947
, appConfigurableSaveChangesAcrossReboots
@@ -169,15 +167,6 @@ appXcDiagTimeout =
169167
appSetXcDiagTimeout :: Int -> Rpc ()
170168
appSetXcDiagTimeout to = dbWrite "/xenmgr/xc-diag-timeout" to
171169

172-
-- defaults to 0s
173-
appIdleTimeThreshold :: Rpc Int
174-
appIdleTimeThreshold =
175-
dbMaybeRead "/xenmgr/idle-time-threshold" >>= return . fromMaybe 0
176-
177-
appSetIdleTimeThreshold :: Int -> Rpc ()
178-
appSetIdleTimeThreshold to = dbWrite "/xenmgr/idle-time-threshold" to
179-
180-
181170
-- Should we be updating /etc/hosts with argo addresses. defaults to true
182171
appArgoHostsFile :: Rpc Bool
183172
appArgoHostsFile = dbMaybeRead "/xenmgr/argo-hosts-file" >>= return . fromMaybe True

xenmgr/XenMgr/Expose/XenmgrObject.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ implementation xm testingCtx =
100100
, comCitrixXenclientXenmgrConfigGetBypassSha1sumChecks = appBypassSha1SumChecks
101101
, comCitrixXenclientXenmgrConfigGetXcDiagTimeout = fromIntegral <$> appXcDiagTimeout
102102
, comCitrixXenclientXenmgrConfigSetXcDiagTimeout = \t -> appSetXcDiagTimeout (fromIntegral t) >> cc
103-
, comCitrixXenclientXenmgrConfigUiGetIdleTimeThreshold = fromIntegral <$> appIdleTimeThreshold
104-
, comCitrixXenclientXenmgrConfigUiSetIdleTimeThreshold = \t -> appSetIdleTimeThreshold (fromIntegral t) >> cc
103+
, comCitrixXenclientXenmgrConfigUiGetIdleTimeThreshold = return 0
104+
, comCitrixXenclientXenmgrConfigUiSetIdleTimeThreshold = \t -> return () >> cc
105105
, comCitrixXenclientXenmgrConfigGetPlatformCryptoKeyDirs = appGetPlatformCryptoKeyDirs
106106
, comCitrixXenclientXenmgrConfigSetPlatformCryptoKeyDirs = \v -> appSetPlatformCryptoKeyDirs v >> cc
107107
, comCitrixXenclientXenmgrConfigGetGuestOnlyNetworking = appGetGuestOnlyNetworking

0 commit comments

Comments
 (0)