Merging upstream version 1.2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
de317aafca
commit
a2fa71affa
762 changed files with 7536 additions and 1096 deletions
|
@ -19,7 +19,6 @@
|
|||
#include <string.h>
|
||||
#include <stdbool.h>
|
||||
#include <inttypes.h>
|
||||
#include <uuid.h>
|
||||
#include <libnvme.h>
|
||||
|
||||
#include <ccan/endian/endian.h>
|
||||
|
@ -377,8 +376,8 @@ int main(int argc, char **argv)
|
|||
nvme_ctrl_get_state(c));
|
||||
|
||||
nvme_ctrl_for_each_ns(c, n) {
|
||||
char uuid_str[40];
|
||||
uuid_t uuid;
|
||||
char uuid_str[NVME_UUID_LEN_STRING];
|
||||
unsigned char uuid[NVME_UUID_LEN];
|
||||
printf(" `- %s lba size:%d lba max:%" PRIu64 "\n",
|
||||
nvme_ns_get_name(n),
|
||||
nvme_ns_get_lba_size(n),
|
||||
|
@ -388,7 +387,7 @@ int main(int argc, char **argv)
|
|||
printf(" nguid:");
|
||||
print_hex(nvme_ns_get_nguid(n), 16);
|
||||
nvme_ns_get_uuid(n, uuid);
|
||||
uuid_unparse_lower(uuid, uuid_str);
|
||||
nvme_uuid_to_string(uuid, uuid_str);
|
||||
printf(" uuid:%s csi:%d\n", uuid_str,
|
||||
nvme_ns_get_csi(n));
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue