On Wed, May 7, 2025 at 2:08 PM Michael Tokarev <m...@tls.msk.ru> wrote: > > The following changes since commit c5e2c4042e3c50b96cc5eaa9683325c5a96913b0: > > Merge tag 'pull-loongarch-20250506' of https://github.com/bibo-mao/qemu > into staging (2025-05-06 11:03:45 -0400) > > are available in the Git repository at: > > https://gitlab.com/mjt0k/qemu.git tags/pull-trivial-patches > > for you to fetch changes up to 40d2aa5a7199f783e12818505857c3fd4663080f: > > docs: replace `-hda` with `-drive` & update `root=` kernel parameter > (2025-05-07 21:05:10 +0300) > > ---------------------------------------------------------------- > trivial patches for 2025-05-07 > > Mostly typos in comments by Gustavo Romero, > plus changing -hda in examples to -drive, > plus single linux-user update (new syscall variant) > > v2: update the last patch Author (it was "via qemu-trivial") > ---------------------------------------------------------------- > Gustavo Romero (11): > hw/pci/pci.c: Turn DPRINTF into trace events > hw/isa/ich9: Remove stray empty comment > hw/i386/acpi-build: Fix typo and grammar in comment > hw/i386/acpi-build: Update document reference > hw/acpi/ich9: Remove ICH9_DEBUG macro > hw/i386/acpi-build: Fix typo in function name > hw/core/machine: Fix indentation > qom/object: Fix typo in comment > hw/net/e1000: Remove stray empty comment in header > hw/pci-host/gpex-acpi: Fix typo in comment > hw/acpi/pcihp: Fix typo in function name > > Integral (1): > docs: replace `-hda` with `-drive` & update `root=` kernel parameter > > Michael Tokarev (8): > linux-user/mmap.c: fix "of of" typo in comment > block.c: fix "the the" typo in comment > hw/xen/xen-hvm-common.c: fix "the the" typo in comment > include/exec/cpu-common.h: fix "the the" typo in comment > include/hw/xen/interface/io/blkif.h: fix "the the" typo in comment > qapi/qom.json: fix "the the" typo in comment > hw/display/apple-gfx.m: fix "in in" typo in comment > qapi/machine-target.json: fix "in in" typo in comment > > Zixing Liu (1): > linux-user/syscall.c: add translation logic for epoll_pwait2 syscall
Hi Michael and Zixing Liu, Please take a look at the following build failure in the CI system: arm-linux-gnueabihf-gcc -Ilibqemu-arm-linux-user.a.p -I. -I.. -Itarget/arm -I../target/arm -I../common-user/host/arm -I../linux-user/include/host/arm -I../linux-user/include -Ilinux-user -I../linux-user -Ilinux-user/arm -I../linux-user/arm -Iqapi -Itrace -Iui/shader -I/usr/include/capstone -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g -fstack-protector-strong -Wempty-body -Wendif-labels -Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers -Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes -Wtype-limits -Wundef -Wvla -Wwrite-strings -Wno-missing-include-dirs -Wno-psabi -Wno-shift-negative-value -isystem /builds/qemu-project/qemu/linux-headers -isystem linux-headers -iquote . -iquote /builds/qemu-project/qemu -iquote /builds/qemu-project/qemu/include -iquote /builds/qemu-project/qemu/host/include/generic -iquote /builds/qemu-project/qemu/tcg/arm -pthread -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv -ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -fPIE -isystem../linux-headers -isystemlinux-headers -DCOMPILING_PER_TARGET '-DCONFIG_TARGET="arm-linux-user-config-target.h"' -MD -MQ libqemu-arm-linux-user.a.p/linux-user_syscall.c.o -MF libqemu-arm-linux-user.a.p/linux-user_syscall.c.o.d -o libqemu-arm-linux-user.a.p/linux-user_syscall.c.o -c ../linux-user/syscall.c ../linux-user/syscall.c: In function ‘do_syscall1’: ../linux-user/syscall.c:13434:33: error: implicit declaration of function ‘safe_epoll_pwait2’; did you mean ‘safe_epoll_pwait’? [-Werror=implicit-function-declaration] 13434 | ret = get_errno(safe_epoll_pwait2(epfd, ep, maxevents, ts_arg, | ^~~~~~~~~~~~~~~~~ | safe_epoll_pwait ../linux-user/syscall.c:13434:33: error: nested extern declaration of ‘safe_epoll_pwait2’ [-Werror=nested-externs] https://gitlab.com/qemu-project/qemu/-/jobs/9987233462 Michael: Once the issue is resolved, please send a v2 pull request (either without the commit in question or with an updated version of the commit). Thanks, Stefan > > block.c | 2 +- > docs/system/gdb.rst | 2 +- > docs/system/linuxboot.rst | 6 +++--- > docs/system/target-mips.rst | 2 +- > hw/acpi/acpi-pci-hotplug-stub.c | 2 +- > hw/acpi/ich9.c | 13 +------------ > hw/acpi/pcihp.c | 2 +- > hw/acpi/piix4.c | 2 +- > hw/core/machine.c | 8 ++++---- > hw/display/apple-gfx.m | 2 +- > hw/i386/acpi-build.c | 10 +++++----- > hw/i386/acpi-build.h | 2 +- > hw/isa/lpc_ich9.c | 1 - > hw/net/e1000x_regs.h | 2 +- > hw/pci-host/gpex-acpi.c | 2 +- > hw/pci/pci.c | 19 ++++++------------- > hw/pci/trace-events | 4 ++++ > hw/xen/xen-hvm-common.c | 2 +- > include/exec/cpu-common.h | 2 +- > include/hw/acpi/pcihp.h | 2 +- > include/hw/xen/interface/io/blkif.h | 2 +- > linux-user/mmap.c | 2 +- > linux-user/syscall.c | 36 ++++++++++++++++++++++++++++++++---- > qapi/machine-target.json | 2 +- > qapi/qom.json | 2 +- > qom/object.c | 2 +- > 26 files changed, 73 insertions(+), 60 deletions(-) >
