xen/pci: Avoid -Wflex-array-member-not-at-end warning
PATCH 1/1 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]
--- drivers/xen/pci.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
drivers/xen/pci.c +5 -9
@@ -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;
Signature · 1 line
2.34.1
Quoted 29 lines · Gustavo A. R. Silva
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 Gustavo A. R. Silva <[email protected]>--- drivers/xen/pci.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)drivers/xen/pci.c +0
-7@@ -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
drivers/xen/pci.c static int xen_add_device(struct device *dev) · line 54
Quoted 10 lines
drivers/xen/pci.c +5
-2- }; -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;
Looks correct to me!
Signature · 1 line
Kees Cook
Hi all,
Friendly ping: who can take this, please? 🙂
Thanks
Signature · 1 line
Gustavo
Quoted 39 lines · Gustavo A. R. Silva
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 Gustavo A. R. Silva <[email protected]>--- drivers/xen/pci.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)drivers/xen/pci.c +5
-9@@ -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;
Jürgen Groß
maintainerQuoted 3 lines · Gustavo A. R. Silva
Hi all,
Friendly ping: who can take this, please? 🙂
I can carry it via the Xen tree.
Juergen
Quoted 6 lines · Jürgen Groß
Quoted 3 lines · Gustavo A. R. Silva
Hi all,
Friendly ping: who can take this, please? 🙂
I can carry it via the Xen tree.
Sounds good. :)
Thank you!
--
Gustavo