misc: Remove pre-C99/C11 checks
cover misc: Remove pre-C99/C11 checks
We uses C11 since 5 years now, time to
remove few obsolete __STDC_VERSION__ checks.
Philippe Mathieu-Daudé (2):
hw/xen/interface: Remove pre-C99 checks
qom/object: Remove pre-C11 check
include/hw/xen/interface/physdev.h | 2 +- include/hw/xen/interface/version.h | 5 ++--- include/hw/xen/interface/xen-compat.h | 2 -- include/hw/xen/interface/xen.h | 14 -------------- qom/object.c | 14 +------------- 5 files changed, 4 insertions(+), 33 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/2 hw/xen/interface: Remove pre-C99 checks
We mandate a compiler supporting C99 since 2019-01-17 in commit 7be41675f7c ("configure: Force the C standard to gnu99"), thus supporting flexible array members. Remove what is now dead code.
--- include/hw/xen/interface/physdev.h | 2 +- include/hw/xen/interface/version.h | 5 ++--- include/hw/xen/interface/xen-compat.h | 2 -- include/hw/xen/interface/xen.h | 14 -------------- 4 files changed, 3 insertions(+), 20 deletions(-)
include/hw/xen/interface/physdev.h +1 -1
@@ -283,7 +283,7 @@ struct physdev_pci_device_add {* First element ([0]) is PXM domain associated with the device (if * XEN_PCI_DEV_PXM is set) */ -uint32_t optarr[XEN_FLEX_ARRAY_DIM ]; +uint32_t optarr[0 ]; };typedef struct physdev_pci_device_add physdev_pci_device_add_t ;DEFINE_XEN_GUEST_HANDLE (physdev_pci_device_add_t);
include/hw/xen/interface/version.h +2 -3
@@ -77,9 +77,8 @@ typedef char xen_commandline_t[1024];*/ #define XENVER_build_id 10struct xen_build_id { -uint32_t len;/* IN: size of buf[]. */ -unsigned char buf[XEN_FLEX_ARRAY_DIM ]; -/* OUT: Variable length buffer with build_id. */ +uint32_t len;/* IN: size of buf[]. */ +unsigned char buf[0 ];/* OUT: Variable length buffer with build_id. */ };typedef struct xen_build_id xen_build_id_t ;
include/hw/xen/interface/xen-compat.h +0 -2
@@ -24,6 +24,4 @@#error "These header files do not support the requested interface version."#endif -#define COMPAT_FLEX_ARRAY_DIM XEN_FLEX_ARRAY_DIM -#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
include/hw/xen/interface/xen.h +0 -14
@@ -36,15 +36,6 @@ DEFINE_XEN_GUEST_HANDLE(uint64_t);DEFINE_XEN_GUEST_HANDLE (xen_pfn_t);DEFINE_XEN_GUEST_HANDLE (xen_ulong_t); -/* Define a variable length array (depends on compiler). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >=199901L -#define XEN_FLEX_ARRAY_DIM -#elif defined(__GNUC__) -#define XEN_FLEX_ARRAY_DIM 0 -#else -#define XEN_FLEX_ARRAY_DIM 1/* variable size */ -#endif -/* Turn a plain number into a C unsigned (long (long)) constant. */ #define __xen_mk_uint (x) x ## U#define __xen_mk_ulong (x) x ## UL
@@ -986,13 +977,8 @@ typedef struct { ((d) >> 8) & 0xFF, ((d) >> 0) & 0xFF, \ e1, e2, e3, e4, e5, e6}} -#if defined(__STDC_VERSION__) ? __STDC_VERSION__ >= 199901L : defined(__GNUC__)#define XEN_DEFINE_UUID (a, b, c, d, e1, e2, e3, e4, e5, e6) \ ((xen_uuid_t)XEN_DEFINE_UUID_(a, b, c, d, e1, e2, e3, e4, e5, e6)) -#else -#define XEN_DEFINE_UUID (a, b, c, d, e1, e2, e3, e4, e5, e6) \ - XEN_DEFINE_UUID_(a, b, c, d, e1, e2, e3, e4, e5, e6) -#endif /* __STDC_VERSION__ / __GNUC__ */ #endif /* !__ASSEMBLY__ */
Signature · 1 line
2.53.0
Re: [PATCH 1/2] hw/xen/interface: Remove pre-C99 checks
Quoted 6 lines · Philippe Mathieu-Daudé
We mandate a compiler supporting C99 since 2019-01-17 in commit
7be41675f7c("configure: Force the C standard to gnu99"), thus supporting flexible array members. Remove what is now dead code.+
uint32_toptarr[0];
This is no flexible array member. "optarr[]" would be.
https://www.gnu.org/software/c-intro-and-ref/manual/html_node/Flexible-Array-Fields.html
Or are you talking about something different?
Bastian
Signature · 2 lines
The best diplomat I know is a fully activated phaser bank. -- Scotty
Re: [PATCH 1/2] hw/xen/interface: Remove pre-C99 checks
Quoted 9 lines · Bastian Blank
Quoted 6 lines · Philippe Mathieu-Daudé
We mandate a compiler supporting C99 since 2019-01-17 in commit
7be41675f7c("configure: Force the C standard to gnu99"), thus supporting flexible array members. Remove what is now dead code.+
uint32_toptarr[0];This is no flexible array member. "optarr[]" would be.
Oops yes you are right... This is what we want here.
Quoted 7 lines
https://www.gnu.org/software/c-intro-and-ref/manual/html_node/Flexible-Array-Fields.html
Or are you talking about something different?
Bastian
PATCH 2/2 qom/object: Remove pre-C11 check
In reply to Philippe Mathieu-DaudéWe mandate a compiler supporting C11 since 2021-06-15 in commit d22797ce36a ("configure: Use -std=gnu11"), thus the max_align_t type definition exists. Remove what is now dead code.
--- qom/object.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)
qom/object.c +1 -13
@@ -675,18 +675,6 @@ static void object_finalize(void *data) } } -/* Find the minimum alignment guaranteed by the system malloc. */ -#if __STDC_VERSION__ >=201112L -typedef max_align_t qemu_max_align_t ; -#else -typedef union { -long l; -void *p; -double d; -long double ld; -}qemu_max_align_t ; -#endif -static Object *object_new_with_type (Type type) {Object *obj;
@@ -703,7 +691,7 @@ static Object *object_new_with_type(Type type)* Do not use qemu_memalign unless required. Depending on the * implementation, extra alignment implies extra overhead. */ -if (likely (align <= __alignof__(qemu_max_align_t ))) { +if (likely (align <= __alignof__(max_align_t ))) { obj =g_malloc (size); obj_free = g_free; }else {
Signature · 1 line
2.53.0
Re: [PATCH 2/2] qom/object: Remove pre-C11 check
Quoted 35 lines · Philippe Mathieu-Daudé
We mandate a compiler supporting C11 since 2021-06-15 in commit
d22797ce36a("configure: Use -std=gnu11"), thus themax_align_ttype definition exists. Remove what is now dead code.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- qom/object.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)qom/object.c +0
-12@@ -675,18 +675,6 @@ static void object_finalize(void *data) } } -/* Find the minimum alignment guaranteed by the system malloc. */ -#if __STDC_VERSION__ >=201112L -typedef max_align_t qemu_max_align_t ; -#else -typedef union { -long l; -void *p; -double d; -long double ld; -}qemu_max_align_t ; -#endif -static Object *object_new_with_type (Type type) {Object *obj;
qom/object.c static Object *object_new_with_type(Type type) · line 697
Quoted 8 lines
qom/object.c +1
-1@@ -703,7 +691,7 @@ static Object *object_new_with_type(Type type)* Do not use qemu_memalign unless required. Depending on the * implementation, extra alignment implies extra overhead. */ -if (likely (align <= __alignof__(qemu_max_align_t ))) { +if (likely (align <= __alignof__(max_align_t ))) { obj =g_malloc (size); obj_free = g_free; }else {
obj = qemu_memalign(align, size);
obj_free = qemu_vfree;
}Context leads me to qemu_try_memalign() via qemu_memalign():
#elif defined(CONFIG_ALIGNED_MALLOC)
ptr = _aligned_malloc(size, alignment);
#elif defined(CONFIG_VALLOC)
ptr = valloc(size);
#elif defined(CONFIG_MEMALIGN)
ptr = memalign(alignment, size);
#else
#error No function to allocate aligned memory available
#endifC11 provides aligned_alloc().