ioctl: correct nvme_copy reftag parameter type #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

ikegami-t wants to merge 68 commits into nvme-experiments:libnvme2 from ikegami-t:nvme-copy-reftag

examples/discover-loop.c

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,12 +1,12 @@
  
    // SPDX-License-Identifier: LGPL-2.1-or-later

    /**

    /*

     * This file is part of libnvme.

     * Copyright (c) 2020 Western Digital Corporation or its affiliates.

     *

     * Authors: Keith Busch <[email protected]>

     */

    /**

    /*

     * discover-loop: Use fabrics commands to discover any loop targets and print

     * those records. You must have at least one configured nvme loop target on the

     * system (no existing connection required). The output will look more

    @@ -59,22 +59,24 @@ int main()
  
    	nvmf_default_config(&cfg);

    	r = nvme_scan(NULL);

    	h = nvme_default_host(r);

    	if (!h) {

    	ret = nvme_scan(NULL, &r);

    	if (ret)

    		return ret;

    	ret = nvme_default_host(r, &h);

    	if (ret) {

    		fprintf(stderr, "Failed to allocated memory\n");

    		return ENOMEM;

    		return ret;

    	}

    	c = nvme_create_ctrl(r, NVME_DISC_SUBSYS_NAME, "loop",

    			     NULL, NULL, NULL, NULL);

    	if (!c) {

    	ret = nvme_create_ctrl(r, NVME_DISC_SUBSYS_NAME, "loop",

    			       NULL, NULL, NULL, NULL, &c);

    	if (ret) {

    		fprintf(stderr, "Failed to allocate memory\n");

    		return ENOMEM;

    	}

    	ret = nvmf_add_ctrl(h, c, &cfg);

    	if (ret < 0) {

    	if (ret) {

    		fprintf(stderr, "no controller found\n");

    		return errno;

    		return ret;

    	}

    	ret = nvmf_get_discovery_log(c, &log, 4);

    @@ -86,7 +88,7 @@ int main()
  
    	else

    		print_discover_log(log);

    	nvme_free_tree(r);

    	nvme_free_root(r);

    	free(log);

    	return 0;

    }

examples/display-columnar.c

-Original file line number
+Diff line change
@@ -1,12 +1,12 @@
     // SPDX-License-Identifier: LGPL-2.1-or-later
-    /**
+    /*
      * This file is part of libnvme.
      * Copyright (c) 2020 Western Digital Corporation or its affiliates.
      *
      * Authors: Keith Busch <[email protected]>
      */
-    /**
+    /*
      * display-columnar: Scans the nvme topology, prints each record type in a
      * column format for easy visual scanning.
      */
@@ Expand All / @@ -24,8 +24,7 @@ int main() @@
     	nvme_path_t p;
     	nvme_ns_t n;
-    	r = nvme_scan(NULL);
-    	if (!r)
+    	if (nvme_scan(NULL, &r))
     		return -1;
@@ Expand Down @@

examples/display-tree.c

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,12 +1,12 @@
  
    // SPDX-License-Identifier: LGPL-2.1-or-later

    /**

    /*

     * This file is part of libnvme.

     * Copyright (c) 2020 Western Digital Corporation or its affiliates.

     *

     * Authors: Keith Busch <[email protected]>

     */

    /**

    /*

     * display-tree: Scans the nvme topology, prints as an ascii tree with some

     * selected attributes for each component.

     */

    @@ -23,8 +23,7 @@ int main()
  
    	nvme_path_t p, _p;

    	nvme_ns_t n, _n;

    	r = nvme_scan(NULL);

    	if (!r)

    	if (nvme_scan(NULL, &r))

    		return -1;

    	printf(".\n");

    @@ -67,6 +66,6 @@ int main()
  
    			}

    		}

    	}

    	nvme_free_tree(r);

    	nvme_free_root(r);

    	return 0;

    }

examples/mi-conf.c

-Original file line number
+Diff line change
@@ -1,12 +1,12 @@
     // SPDX-License-Identifier: LGPL-2.1-or-later
-    /**
+    /*
      * This file is part of libnvme.
      * Copyright (c) 2022 Code Construct Pty Ltd.
      *
      * Authors: Jeremy Kerr <[email protected]>
      */
-    /**
+    /*
      * mi-conf: query a device for optimal MTU and set for both the local MCTP
      * route (through dbus to mctpd) and the device itself (through NVMe-MI
      * configuration commands)
@@ Expand Down @@

examples/mi-mctp-ae.c

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    // SPDX-License-Identifier: LGPL-2.1-or-later

    /**

    /*

     * This file is part of libnvme.

     */

    /**

    /*

     * mi-mctp-ae: open a MI connection over MCTP, supporting asynchronous event messages

     */

    @@ -131,7 +131,7 @@ int main(int argc, char **argv)
  
    	}

    	rc = nvme_mi_aem_enable(ep, &aem_config, &data);

    	if (rc && errno == EOPNOTSUPP)

    	if (rc == EOPNOTSUPP)

    		errx(EXIT_FAILURE, "MCTP Peer-Bind is required for AEM");

    	else if (rc)

    		err(EXIT_FAILURE, "Can't enable aem:%d", rc);

examples/mi-mctp-csi-test.c

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,9 +1,9 @@
  
    // SPDX-License-Identifier: LGPL-2.1-or-later

    /**

    /*

     * This file is part of libnvme.

     */

    /**

    /*

     * mi-mctp-csi-test: open a MI connection over MCTP, and send two commands

     * in parallel with different CSI buffers

     */

    @@ -56,8 +56,8 @@ void hexdump(const unsigned char *buf, int len)
  
    int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)

    {

    	struct nvme_get_log_args args = { 0 };

    	struct nvme_mi_ctrl *ctrl;

    	enum nvme_cmd_get_log_lid lid;

    	struct nvme_link *link;

    	uint8_t buf[4096];

    	uint16_t ctrl_id;

    	int rc, tmp;

    @@ -75,31 +75,31 @@ int do_get_log_page(nvme_mi_ep_t ep, int argc, char **argv)
  
    	ctrl_id = tmp & 0xffff;

    	args.args_size = sizeof(args);

    	args.log = buf;

    	args.len = sizeof(buf);

    	if (argc > 2) {

    		tmp = atoi(argv[2]);

    		args.lid = tmp & 0xff;

    		lid = tmp & 0xff;

    	} else {

    		args.lid = 0x1;

    		lid = 0x1;

    	}

    	ctrl = nvme_mi_init_ctrl(ep, ctrl_id);

    	if (!ctrl) {

    	link = nvme_mi_init_link(ep, ctrl_id);

    	if (!link) {

    		warn("can't create controller");

    		return -1;

    	}

    	rc = nvme_mi_admin_get_log(ctrl, &args);

    	rc = nvme_get_log(link, NVME_NSID_NONE, false, NVME_LOG_LSP_NONE,

    		lid, NVME_LOG_LSI_NONE, NVME_CSI_NVM,

    		false, NVME_UUID_NONE,

    		0, buf, sizeof(buf),

    		sizeof(buf), NULL);

    	if (rc) {

    		warn("can't perform Get Log page command");

    		return -1;

    	}

    	printf("Get log page (log id = 0x%02x) data:\n", args.lid);

    	hexdump(buf, args.len);

    	printf("Get log page (log id = 0x%02x) data:\n", lid);

    	hexdump(buf, sizeof(buf));

    	return 0;

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ioctl: correct nvme_copy reftag parameter type #37

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!