@@ -62,59 +62,67 @@ static int test_ctrl(nvme_ctrl_t c)
6262 printf ("ERROR: no identify for:%s\n" , nvme_ctrl_get_name (c ));
6363 return ret ;
6464 }
65+ else {
66+ printf ("PASSED: Identify controller\n" );
67+ }
6568
6669 ret = nvme_get_log_smart (fd , NVME_NSID_ALL , true, & smart );
6770 if (ret ) {
68- printf ("ERROR: no smart log for:%s %x\n" , nvme_ctrl_get_name (c ), ret );
71+ printf ("ERROR: no smart log for:%s %# x\n" , nvme_ctrl_get_name (c ), ret );
6972 return ret ;
7073 }
74+ else {
75+ printf ("PASSED: smart log\n" );
76+ }
7177
7278 temp = ((smart .temperature [1 ] << 8 ) | smart .temperature [0 ]) - 273 ;
7379 printf ("Controller:%s\n" , nvme_ctrl_get_name (c ));
7480 printf ("\nIdentify:\n" );
75- printf (" vid:%04x ssvid:%04x oacs:%x lpa%x\n" ,
76- le16_to_cpu (id .vid ), le16_to_cpu (id .ssvid ),
77- id .oacs , id .lpa );
78- printf (" sn:%-.20s model:%-.40s\n" , id .sn , id .mn );
81+ printf (" vid:%#04x\n" , le16_to_cpu (id .vid ));
82+ printf (" ssvid:%#04x\n" , le16_to_cpu (id .ssvid ));
83+ printf (" oacs:%#x\n" , id .oacs );
84+ printf (" lpa:%#x\n" , id .lpa );
85+ printf (" sn:%-.20s\n" , id .sn );
86+ printf (" model:%-.40s\n" , id .mn );
7987
8088 ret = nvme_identify_allocated_ns_list (fd , 0 , & ns_list );
8189 if (!ret )
82- printf (" Allocated NS List: \n" );
90+ printf (" PASSED: Allocated NS List\n" );
8391 else
8492 printf (" ERROR: Allocated NS List:%x\n" , ret );
8593 ret = nvme_identify_active_ns_list (fd , 0 , & ns_list );
8694 if (!ret )
87- printf (" Active NS List: \n" );
95+ printf (" PASSED: Active NS List\n" );
8896 else
8997 printf (" ERROR: Active NS List:%x\n" , ret );
9098 ret = nvme_identify_ctrl_list (fd , 0 , & ctrlist );
9199 if (!ret )
92- printf (" Ctrl List: \n" );
100+ printf (" PASSED: Ctrl List\n" );
93101 else
94102 printf (" ERROR: CtrlList:%x\n" , ret );
95103 ret = nvme_identify_nsid_ctrl_list (fd , 1 , 0 , & ctrlist );
96104 if (!ret )
97- printf (" NSID Ctrl List: \n" );
105+ printf (" PASSED: NSID Ctrl List\n" );
98106 else
99107 printf (" ERROR: NSID CtrlList:%x\n" , ret );
100108 ret = nvme_identify_primary_ctrl (fd , 0 , & prim );
101109 if (!ret )
102- printf (" Identify Primary: \n" );
110+ printf (" PASSED: Identify Primary\n" );
103111 else
104112 printf (" ERROR: Identify Primary:%x\n" , ret );
105113 ret = nvme_identify_secondary_ctrl_list (fd , 1 , 0 , & sec );
106114 if (!ret )
107- printf (" Identify Secondary: \n" );
115+ printf (" PASSED: Identify Secondary\n" );
108116 else
109117 printf (" ERROR: Identify Secondary:%x\n" , ret );
110118 ret = nvme_identify_ns_granularity (fd , & gran );
111119 if (!ret )
112- printf (" Identify NS granularity: \n" );
120+ printf (" PASSED: Identify NS granularity\n" );
113121 else
114122 printf (" ERROR: Identify NS granularity:%x\n" , ret );
115123 ret = nvme_identify_uuid (fd , & uuid );
116124 if (!ret )
117- printf (" Identify UUID List: \n" );
125+ printf (" PASSED: Identify UUID List\n" );
118126 else
119127 printf (" ERROR: Identify UUID List:%x\n" , ret );
120128
0 commit comments