From f752abd6fa79459ad60219ae9be92345cb8cc0c9 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 15 Jan 2016 13:11:28 -0700 Subject: [PATCH] examples/nvme/identify: use nvme_ctrlr_cmd_get_log_page() Change-Id: Ie7aea41cf3b2e986a5ebf309fda8c8d826fab652 Signed-off-by: Daniel Verkamp --- examples/nvme/identify/identify.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c index 857a5e557..00ce6fe2f 100644 --- a/examples/nvme/identify/identify.c +++ b/examples/nvme/identify/identify.c @@ -169,8 +169,6 @@ get_features(struct nvme_controller *ctrlr) static int get_health_log_page(struct nvme_controller *ctrlr) { - struct nvme_command cmd = {}; - if (health_page == NULL) { health_page = rte_zmalloc("nvme health", sizeof(*health_page), 4096); } @@ -179,13 +177,13 @@ get_health_log_page(struct nvme_controller *ctrlr) exit(1); } - cmd.opc = NVME_OPC_GET_LOG_PAGE; - cmd.cdw10 = NVME_LOG_HEALTH_INFORMATION; - cmd.cdw10 |= ((sizeof(*health_page) / 4) - 1) << 16; // number of dwords - cmd.nsid = NVME_GLOBAL_NAMESPACE_TAG; + if (nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_HEALTH_INFORMATION, NVME_GLOBAL_NAMESPACE_TAG, + health_page, sizeof(*health_page), get_log_page_completion, NULL)) { + printf("nvme_ctrlr_cmd_get_log_page() failed\n"); + exit(1); + } - return nvme_ctrlr_cmd_admin_raw(ctrlr, &cmd, health_page, sizeof(*health_page), - get_log_page_completion, NULL); + return 0; } static void