Commit 67eb36c7 authored by Changpeng Liu's avatar Changpeng Liu Committed by Tomasz Zawadzki
Browse files

nvme: remove aligned attribute 



When testing vfio-user target with QEMU, there is following error log:

ctrlr.c:2143:31: runtime error: member access within misaligned address 0x7fe526a73d98 for type 'struct spdk_nvme_ctrlr_data', which requires 16 byte alignment

For vfio-user transport, the memory buffer is allocated by clients, so
we can't assume the memory is always aligned, just remove the
aligned attribute.

Change-Id: Ie80530415013ebd7bcb8cdabca97d7d0e34857f9
Signed-off-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7797


Community-CI: Broadcom CI
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent 744f401c

examples/nvme/identify/identify.c

+6 −6
Original line number Diff line number Diff line
@@ -1659,18 +1659,18 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport 
		printf("Number of Power States:      %u\n", cdata->npss + 1);

		printf("Current Power State:         Power State #%u\n", ps);

		for (i = 0; i <= cdata->npss; i++) {

			const struct spdk_nvme_power_state *psd = &cdata->psd[i];

			const struct spdk_nvme_power_state psd = cdata->psd[i];

			printf("Power State #%u:  ", i);

			if (psd->mps) {

			if (psd.mps) {

				/* MP scale is 0.0001 W */

				printf("Max Power: %u.%04u W\n",

				       psd->mp / 10000,

				       psd->mp % 10000);

				       psd.mp / 10000,

				       psd.mp % 10000);

			} else {

				/* MP scale is 0.01 W */

				printf("Max Power: %3u.%02u W\n",

				       psd->mp / 100,

				       psd->mp % 100);

				       psd.mp / 100,

				       psd.mp % 100);

			}

			/* TODO: print other power state descriptor fields */

		}

include/spdk/nvme_spec.h

+1 −1
Original line number Diff line number Diff line
@@ -1840,7 +1840,7 @@ struct spdk_nvme_cdata_sgls { 
	uint32_t	reserved2 : 10;

};



struct __attribute__((packed)) __attribute__((aligned)) spdk_nvme_ctrlr_data {

struct __attribute__((packed)) spdk_nvme_ctrlr_data {

	/* bytes 0-255: controller capabilities and features */



	/** pci vendor id */