Commit a8d0b5eb authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Juergen Gross
Browse files

xen/pci: Avoid -Wflex-array-member-not-at-end warning 



Use the `DEFINE_RAW_FLEX()` helper for an on-stack definition of
a flexible structure where the size of the flexible-array member
is known at compile-time, and refactor the rest of the code,
accordingly.

So, with this, fix the following warning:

drivers/xen/pci.c:48:55: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]

Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: default avatarKees Cook <kees@kernel.org>
Message-ID: <ZsU58MvoYEEqBHZl@elsanto>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent 3adc73ef

drivers/xen/pci.c

+5 −9
Original line number Diff line number Diff line
@@ -44,15 +44,11 @@ static int xen_add_device(struct device *dev) 
	}

#endif

	if (pci_seg_supported) {

		struct {

			struct physdev_pci_device_add add;

			uint32_t pxm;

		} add_ext = {

			.add.seg = pci_domain_nr(pci_dev->bus),

			.add.bus = pci_dev->bus->number,

			.add.devfn = pci_dev->devfn

		};

		struct physdev_pci_device_add *add = &add_ext.add;

		DEFINE_RAW_FLEX(struct physdev_pci_device_add, add, optarr, 1);



		add->seg = pci_domain_nr(pci_dev->bus);

		add->bus = pci_dev->bus->number;

		add->devfn = pci_dev->devfn;



#ifdef CONFIG_ACPI

		acpi_handle handle;