fix the valgrind uninit error for MI tests
Google-Bug-Id: 367716722
Change-Id: I64bf0dedd9af650af02afe61212aeb4bd458abe5
Signed-off-by: Muhammad Usama <muhammadusama@google.com>
(cherry picked from commit 8dc350d28a584413be8cb491027b2be23a32bf5b)
diff --git a/subprojects/libnvme.wrap b/subprojects/libnvme.wrap
index 58ba3e9..19051f1 100644
--- a/subprojects/libnvme.wrap
+++ b/subprojects/libnvme.wrap
@@ -2,7 +2,7 @@
directory = libnvme
url = https://github.com/linux-nvme/libnvme.git
revision = bf85536ff5640e9e3ee04e13d8e5eedd70add550
-diff_files = libnvme/0001-mi_admin_xfer-set-data-fields-based-on-opcode.patch,libnvme/0002-mi-fix-the-return-error-code.patch,libnvme/0003-mi-fix-the-rc-for-nvme_mi_scan_ep.patch,libnvme/0004-mi-avoid-changing-default-ep-timeout-during-admin_pa.patch,libnvme/0005-libnvme-mi-add-timeout-functions-to-.map.patch,libnvme/0001-mi-don-t-return-from-mi_mctp_submit-with-a-tag-held.patch,libnvme/0001-Assign-default-value-on-variable-definition.patch
+diff_files = libnvme/0001-mi_admin_xfer-set-data-fields-based-on-opcode.patch,libnvme/0002-mi-fix-the-return-error-code.patch,libnvme/0003-mi-fix-the-rc-for-nvme_mi_scan_ep.patch,libnvme/0004-mi-avoid-changing-default-ep-timeout-during-admin_pa.patch,libnvme/0005-libnvme-mi-add-timeout-functions-to-.map.patch,libnvme/0001-mi-don-t-return-from-mi_mctp_submit-with-a-tag-held.patch,libnvme/0001-Assign-default-value-on-variable-definition.patch,libnvme/0001-test-Intialize-the-variables-for-mi-tests.patch
[provide]
dependency_names = libnvme_dep, libnvme_mi_dep
diff --git a/subprojects/packagefiles/libnvme/0001-test-Intialize-the-variables-for-mi-tests.patch b/subprojects/packagefiles/libnvme/0001-test-Intialize-the-variables-for-mi-tests.patch
new file mode 100644
index 0000000..2572325
--- /dev/null
+++ b/subprojects/packagefiles/libnvme/0001-test-Intialize-the-variables-for-mi-tests.patch
@@ -0,0 +1,80 @@
+From 18c70f77e6e59c45197371d11efae7adeca61c3c Mon Sep 17 00:00:00 2001
+From: Muhammad Usama <muhammadusama@google.com>
+Date: Tue, 24 Sep 2024 19:44:15 +0000
+Subject: [PATCH] test: Intialize the variables for mi-tests
+
+Signed-off-by: Muhammad Usama <muhammadusama@google.com>
+---
+ test/mi.c | 29 ++++++++++++-----------------
+ 1 file changed, 12 insertions(+), 17 deletions(-)
+
+diff --git a/test/mi.c b/test/mi.c
+index d945bed8..4db60291 100644
+--- a/test/mi.c
++++ b/test/mi.c
+@@ -577,20 +577,15 @@ static void test_admin_invalid_formats(nvme_mi_ep_t ep)
+ {
+ struct nvme_mi_admin_resp_hdr resp = { 0 };
+ struct nvme_mi_admin_req_hdr req = { 0 };
+- nvme_mi_ctrl_t ctrl;
+- size_t len;
+- int rc;
++ nvme_mi_ctrl_t ctrl = { 0 };
++ size_t len = 0;
++ int rc = 0;
+
+ test_set_transport_callback(ep, test_admin_invalid_formats_cb, NULL);
+
+ ctrl = nvme_mi_init_ctrl(ep, 1);
+ assert(ctrl);
+
+- /* unaligned req size */
+- len = 0;
+- rc = nvme_mi_admin_xfer(ctrl, &req, 1, &resp, 0, &len);
+- assert(rc != 0);
+-
+ /* unaligned resp size */
+ len = 1;
+ rc = nvme_mi_admin_xfer(ctrl, &req, 0, &resp, 0, &len);
+@@ -996,8 +991,8 @@ static int test_admin_set_features_cb(struct nvme_mi_ep *ep,
+ static void test_set_features(nvme_mi_ep_t ep)
+ {
+ struct nvme_set_features_args args = { 0 };
+- struct nvme_timestamp tstamp;
+- nvme_mi_ctrl_t ctrl;
++ struct nvme_timestamp tstamp = { 0 };
++ nvme_mi_ctrl_t ctrl = { 0 };
+ uint32_t res;
+ int rc, i;
+
+@@ -1339,9 +1334,9 @@ static int test_admin_ns_mgmt_cb(struct nvme_mi_ep *ep,
+
+ static void test_admin_ns_mgmt_create(struct nvme_mi_ep *ep)
+ {
+- struct nvme_id_ns nsid;
+- nvme_mi_ctrl_t ctrl;
+- __u32 ns;
++ struct nvme_id_ns nsid = { 0 };
++ nvme_mi_ctrl_t ctrl = { 0 };
++ __u32 ns = 0;
+ int rc;
+
+ test_set_transport_callback(ep, test_admin_ns_mgmt_cb, NULL);
+@@ -1828,10 +1823,10 @@ static int test_admin_get_log_split_cb(struct nvme_mi_ep *ep,
+
+ static void test_admin_get_log_split(struct nvme_mi_ep *ep)
+ {
+- unsigned char buf[4096 * 2 + 4];
+- struct nvme_get_log_args args;
+- struct log_data ldata;
+- nvme_mi_ctrl_t ctrl;
++ unsigned char buf[4096 * 2 + 4] = { 0 };
++ struct nvme_get_log_args args = { 0 };
++ struct log_data ldata = { 0 };
++ nvme_mi_ctrl_t ctrl = { 0 };
+ int rc;
+
+ ldata.n = 0;
+--
+2.46.0.792.g87dc391469-goog
+