1
0
Fork 0

Adding upstream version 2.8.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-16 12:25:56 +01:00
parent e08cb5ae68
commit 8229b972f0
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
407 changed files with 2341 additions and 926 deletions

17
nbft.c
View file

@ -5,10 +5,12 @@
#include <fnmatch.h>
#include <stdlib.h>
#include <libnvme.h>
#include "nvme.h"
#include "nbft.h"
#include "libnvme.h"
#include "fabrics.h"
#include "nvme-print.h"
#include "util/types.h"
@ -47,10 +49,8 @@ int read_nbft_files(struct list_head *nbft_list, char *path)
struct nbft_info *nbft;
count = scandir(path, &dent, nbft_filter, NULL);
if (count < 0) {
fprintf(stderr, "Failed to open %s.\n", path);
return -1;
}
if (count < 0)
return -errno;
for (i = 0; i < count; i++) {
snprintf(filename, sizeof(filename), "%s/%s", path, dent[i]->d_name);
@ -97,8 +97,11 @@ int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg,
list_head_init(&nbft_list);
ret = read_nbft_files(&nbft_list, nbft_path);
if (ret)
if (ret) {
if (ret != ENOENT)
nvme_show_perror("Failed to access ACPI tables directory");
goto out_free_2;
}
list_for_each(&nbft_list, entry, node)
for (ss = entry->nbft->subsystem_ns_list; ss && *ss; ss++)
@ -164,7 +167,7 @@ int discover_from_nbft(nvme_root_t r, char *hostnqn_arg, char *hostid_arg,
* obtains a different local IP address than the
* firmware had. Retry without host_traddr.
*/
if (ret == -1 && errno == ENVME_CONNECT_WRITE &&
if (ret == -1 && errno == ENVME_CONNECT_ADDRNOTAVAIL &&
!strcmp((*ss)->transport, "tcp") &&
strlen(hfi->tcp_info.dhcp_server_ipaddr) > 0) {
nvme_free_ctrl(c);