1
0
Fork 0

Merging upstream version 2.4.1.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-04-06 10:19:24 +02:00
parent 79910b508e
commit d898b0e3c1
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
3 changed files with 13 additions and 2 deletions

View file

@ -221,7 +221,12 @@ class Controller(stas.ControllerABC): # pylint: disable=too-many-instance-attri
host_traddr=self.tid.host_traddr if self.tid.host_traddr else None,
host_iface=host_iface,
)
self._ctrl.discovery_ctrl = self._discovery_ctrl
try:
self._ctrl.discovery_ctrl = self._discovery_ctrl
except AttributeError:
# Note: discovery_ctrl_set() is deprecated. We keep it
# for backward compatibility with libnvme 1.11 and earlier.
self._ctrl.discovery_ctrl_set(self._discovery_ctrl)
# Set the DHCHAP host key on the controller
# NOTE that this may eventually have to