QEMU_PACKED: Remove gcc_struct attribute in Windows non x86 targets
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v3 1/4 QEMU_PACKED: Remove gcc_struct attribute in Windows non x86 targets
gcc_struct is for x86 only, and it generates an warning on ARM64 Clang/MinGW targets.
--- contrib/libvhost-user/libvhost-user.h | 2 +- include/qemu/compiler.h | 2 +- scripts/cocci-macro-file.h | 7 ++++++- slirp/src/util.h | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-)
contrib/libvhost-user/libvhost-user.h +1 -1
@@ -148,7 +148,7 @@ typedef struct VhostUserInflight {uint16_t queue_size; } VhostUserInflight; -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))# define VU_PACKED __attribute__((gcc_struct, packed))#else # define VU_PACKED __attribute__((packed))
include/qemu/compiler.h +1 -1
@@ -28,7 +28,7 @@#define QEMU_SENTINEL __attribute__((sentinel)) -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))# define QEMU_PACKED __attribute__((gcc_struct, packed))#else # define QEMU_PACKED __attribute__((packed))
scripts/cocci-macro-file.h +6 -1
@@ -23,7 +23,12 @@#define QEMU_NORETURN __attribute__ ((__noreturn__))#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))#define QEMU_SENTINEL __attribute__((sentinel)) -#define QEMU_PACKED __attribute__((gcc_struct, packed)) + +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__)) +# define QEMU_PACKED __attribute__((gcc_struct, packed)) +#else +# define QEMU_PACKED __attribute__((packed)) +#endif #define cat (x,y) x ## y#define cat2 (x,y) cat(x,y)
slirp/src/util.h +1 -1
@@ -43,7 +43,7 @@#include <netinet/in.h> #endif -#if defined(_WIN32) +#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))# define SLIRP_PACKED __attribute__((gcc_struct, packed))#else # define SLIRP_PACKED __attribute__((packed))
Signature · 1 line
2.17.1
PATCH v3 2/4 qga: Fix mingw compilation warnings on enum conversion
In reply to a message not in the archiveThe win2qemu[] is supposed to be the conversion table to convert between STORAGE_BUS_TYPE in Windows SDK and GuestDiskBusType in qga.
But it was incorrectly written that it forces to set a GuestDiskBusType value to STORAGE_BUS_TYPE, which generates an enum conversion warning in clang.
--- qga/commands-win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qga/commands-win32.c +1 -1
@@ -457,7 +457,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)#ifdef CONFIG_QGA_NTDDSCSI -static STORAGE_BUS_TYPE win2qemu[] = { +static GuestDiskBusType win2qemu[] = { [BusTypeUnknown] =GUEST_DISK_BUS_TYPE_UNKNOWN , [BusTypeScsi] =GUEST_DISK_BUS_TYPE_SCSI , [BusTypeAtapi] = GUEST_DISK_BUS_TYPE_IDE,
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v3 2/4] qga: Fix mingw compilation warnings on enum conversion
Quoted 6 lines · Cao Jiaxi
The win2qemu[] is supposed to be the conversion table to convert between
STORAGE_BUS_TYPEin Windows SDK and GuestDiskBusType in qga.But it was incorrectly written that it forces to set a GuestDiskBusType value to
STORAGE_BUS_TYPE, which generates an enum conversion warning in clang.
Quoted 1 line
Signed-off-by Cao Jiaxi <[email protected]>
Quoted 18 lines
--- qga/commands-win32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)qga/commands-win32.c +1
-1@@ -457,7 +457,7 @@ void qmp_guest_file_flush(int64_t handle, Error **errp)#ifdef CONFIG_QGA_NTDDSCSI -static STORAGE_BUS_TYPE win2qemu[] = { +static GuestDiskBusType win2qemu[] = { [BusTypeUnknown] =GUEST_DISK_BUS_TYPE_UNKNOWN , [BusTypeScsi] =GUEST_DISK_BUS_TYPE_SCSI , [BusTypeAtapi] = GUEST_DISK_BUS_TYPE_IDE,
PATCH v3 3/4 util/cacheinfo: Use uint64_t on LLP64 model to satisfy Windows ARM64
In reply to a message not in the archiveWindows ARM64 uses LLP64 model, which breaks current assumptions.
--- util/cacheinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
util/cacheinfo.c +1 -1
@@ -107,7 +107,7 @@ static void sys_cache_info(int *isize, int *dsize)static void arch_cache_info (int *isize,int *dsize) {if (*isize ==0 || *dsize ==0 ) { -unsigned long ctr; +uint64_t ctr;/* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1, but (at least under Linux) these are marked protected by the
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v3 3/4] util/cacheinfo: Use uint64_t on LLP64 model to satisfy Windows ARM64
Quoted 13 lines · Cao Jiaxi
Windows ARM64 uses LLP64 model, which breaks current assumptions.
Signed-off-by Cao Jiaxi <[email protected]>--- util/cacheinfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)util/cacheinfo.c +0
-0
util/cacheinfo.c static void sys_cache_info(int *isize, int *dsize) · line 113
Quoted 8 lines
util/cacheinfo.c +1
-1@@ -107,7 +107,7 @@ static void sys_cache_info(int *isize, int *dsize)static void arch_cache_info (int *isize,int *dsize) {if (*isize ==0 || *dsize ==0 ) { -unsigned long ctr; +uint64_t ctr;/* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1, but (at least under Linux) these are marked protected by the
PATCH v3 4/4 osdep: Fix mingw compilation regarding stdio formats
In reply to a message not in the archiveI encountered the following compilation error on mingw:
/mnt/d/qemu/include/qemu/osdep.h:97:9: error: '__USE_MINGW_ANSI_STDIO' macro redefined [-Werror,-Wmacro-redefined]
#define __USE_MINGW_ANSI_STDIO 1
^/mnt/d/llvm-mingw/aarch64-w64-mingw32/include/_mingw.h:433:9: note: previous definition is here
#define __USE_MINGW_ANSI_STDIO 0 /* was not defined so it should be 0 */
It turns out that __USE_MINGW_ANSI_STDIO must be set before any system headers are included, not just before stdio.h.
--- include/qemu/osdep.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
include/qemu/osdep.h +5 -5
@@ -85,17 +85,17 @@ extern int daemon(int, int);#endif #endif +/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ +#ifdef __MINGW32__ +#define __USE_MINGW_ANSI_STDIO 1 +#endif +#include <stdarg.h> #include <stddef.h> #include <stdbool.h> #include <stdint.h> #include <sys/types.h> #include <stdlib.h> - -/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ -#ifdef __MINGW32__ -#define __USE_MINGW_ANSI_STDIO 1 -#endif #include <stdio.h> #include <string.h>
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH v3 4/4] osdep: Fix mingw compilation regarding stdio formats
Quoted 34 lines · Cao Jiaxi
I encountered the following compilation error on mingw:
/mnt/d/qemu/include/qemu/osdep.h:97:9: error: '__USE_MINGW_ANSI_STDIO' macro redefined [-Werror,-Wmacro-redefined]#define __USE_MINGW_ANSI_STDIO 1 ^
/mnt/d/llvm-mingw/aarch64-w64-mingw32/include/_mingw.h:433:9: note: previous definition is here
#define__USE_MINGW_ANSI_STDIO0 /* was not defined so it should be 0 */It turns out that
__USE_MINGW_ANSI_STDIOmust be set before any system headers are included, not just beforestdio.h.Signed-off-by Cao Jiaxi <[email protected]>--- include/qemu/osdep.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)include/qemu/osdep.h +5
-0@@ -85,17 +85,17 @@ extern int daemon(int, int);#endif #endif +/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ +#ifdef __MINGW32__ +#define __USE_MINGW_ANSI_STDIO 1 +#endif +#include <stdarg.h> #include <stddef.h> #include <stdbool.h> #include <stdint.h>
include/qemu/osdep.h extern int daemon(int, int); · line 101
Quoted 10 lines
include/qemu/osdep.h +0
-5#include <sys/types.h> #include <stdlib.h> - -/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */ -#ifdef __MINGW32__ -#define __USE_MINGW_ANSI_STDIO 1 -#endif #include <stdio.h> #include <string.h>