fixup: include: update Linux headers to 4.21-rc1/5.0-rc1
PATCH 1/1 fixup: include: update Linux headers to 4.21-rc1/5.0-rc1
This update switched structures from __u64 to uint64_t. Accordingly, need to print with PRIx64.
--- contrib/libvhost-user/libvhost-user.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
contrib/libvhost-user/libvhost-user.c +4 -4
@@ -790,10 +790,10 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)DPRINT ("vhost_vring_addr:\n" );DPRINT (" index: %d\n" , vra->index);DPRINT (" flags: %d\n" , vra->flags); -DPRINT (" desc_user_addr: 0x%016llx\n" , vra->desc_user_addr); -DPRINT (" used_user_addr: 0x%016llx\n" , vra->used_user_addr); -DPRINT (" avail_user_addr: 0x%016llx\n" , vra->avail_user_addr); -DPRINT (" log_guest_addr: 0x%016llx\n" , vra->log_guest_addr); +DPRINT (" desc_user_addr: 0x%016" PRIx64"\n" , vra->desc_user_addr); +DPRINT (" used_user_addr: 0x%016" PRIx64"\n" , vra->used_user_addr); +DPRINT (" avail_user_addr: 0x%016" PRIx64"\n" , vra->avail_user_addr); +DPRINT (" log_guest_addr: 0x%016" PRIx64"\n" , vra->log_guest_addr); vq->vring.flags = vra->flags; vq->vring.desc =qva_to_va (dev, vra->desc_user_addr);
Signature · 1 line
MST
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===
Configure options:
--enable-werror --target-list=x86_64-softmmu,aarch64-softmmu --prefix=/tmp/qemu-test/install --python=/usr/bin/python3 --cross-prefix=x86_64-w64-mingw32- --enable-trace-backends=simple --enable-gnutls --enable-nettle --enable-curl --enable-vnc --enable-bzip2 --enable-guest-agent --with-sdlabi=2.0
ERROR: unknown option --with-sdlabi=2.0
Try '/tmp/qemu-test/src/configure --help' for more information
# QEMU configure log Mon Feb 4 05:00:41 UTC 2019
# Configured with: '/tmp/qemu-test/src/configure' '--enable-werror' '--target-list=x86_64-softmmu,aarch64-softmmu' '--prefix=/tmp/qemu-test/install' '--python=/usr/bin/python3' '--cross-prefix=x86_64-w64-mingw32-' '--enable-trace-backends=simple' '--enable-gnutls' '--enable-nettle' '--enable-curl' '--enable-vnc' '--enable-bzip2' '--enable-guest-agent' '--with-sdlabi=2.0'
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 634 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.cconfig-temp/qemu-conf.c:2:2: error: #error __linux__ not defined
#error __linux__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 686 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __i386__ not defined
#error __i386__ not defined
^~~~~
---
funcs: do_compiler do_cc compile_object check_define main
lines: 92 122 617 689 0
x86_64-w64-mingw32-gcc -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -c -o config-temp/qemu-conf.o config-temp/qemu-conf.c config-temp/qemu-conf.c:2:2: error: #error __ILP32__ not defined
#error __ILP32__ not defined
^~~~~
---
lines: 92 128 920 0
x86_64-w64-mingw32-gcc -mthreads -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -std=gnu99 -o config-temp/qemu-conf.exe config-temp/qemu-conf.c -g -liberty /usr/lib/gcc/x86_64-w64-mingw32/8.2.0/../../../../x86_64-w64-mingw32/bin/ld: cannot find -liberty
collect2: error: ld returned 1 exit status
Failed to run 'configure'
Traceback (most recent call last):
File "./tests/docker/docker.py", line 563, in <module>
The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]
Quoted 5 lines · Michael S. Tsirkin
This update switched structures from
__u64touint64_t. Accordingly, need to print with PRIx64.Signed-off-by Michael S. Tsirkin <[email protected]>
Quoted 26 lines
--- contrib/libvhost-user/libvhost-user.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)contrib/libvhost-user/libvhost-user.c +4
-5@@ -790,10 +790,10 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)DPRINT ("vhost_vring_addr:\n" );DPRINT (" index: %d\n" , vra->index);DPRINT (" flags: %d\n" , vra->flags); -DPRINT (" desc_user_addr: 0x%016llx\n" , vra->desc_user_addr); -DPRINT (" used_user_addr: 0x%016llx\n" , vra->used_user_addr); -DPRINT (" avail_user_addr: 0x%016llx\n" , vra->avail_user_addr); -DPRINT (" log_guest_addr: 0x%016llx\n" , vra->log_guest_addr); +DPRINT (" desc_user_addr: 0x%016" PRIx64"\n" , vra->desc_user_addr); +DPRINT (" used_user_addr: 0x%016" PRIx64"\n" , vra->used_user_addr); +DPRINT (" avail_user_addr: 0x%016" PRIx64"\n" , vra->avail_user_addr); +DPRINT (" log_guest_addr: 0x%016" PRIx64"\n" , vra->log_guest_addr); vq->vring.flags = vra->flags; vq->vring.desc =qva_to_va (dev, vra->desc_user_addr); --MST
Signature · 1 line
Marc-André Lureau