[PULL 00/10] Trivial branch for 7.2 patches

Laurent Vivier posted 10 patches 1 year, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20221103161727.4116147-1-laurent@vivier.eu
Maintainers: Peter Maydell <peter.maydell@linaro.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Michael Roth <michael.roth@amd.com>, Konstantin Kostiuk <kkostiuk@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Richard Henderson <richard.henderson@linaro.org>, Ilya Leoshkevich <iii@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
There is a newer version of this series
docs/devel/testing.rst                        |  2 +-
docs/system/arm/cpu-features.rst              |  2 +-
docs/system/loongarch/loongson3.rst           |  2 +-
docs/tools/virtiofsd.rst                      |  2 +-
hw/xen/meson.build                            |  2 +-
include/exec/memory.h                         |  2 +-
qapi/qom.json                                 |  2 +-
qapi/virtio.json                              | 34 +++++++++----------
qemu-options.hx                               | 10 +++---
qga/qapi-schema.json                          |  2 +-
subprojects/libvhost-user/libvhost-user.c     | 19 ++++++++---
target/m68k/{qregs.def => qregs.h.inc}        |  0
target/m68k/translate.c                       |  4 +--
.../tcg/{insn-data.def => insn-data.h.inc}    |  2 +-
.../{insn-format.def => insn-format.h.inc}    |  0
target/s390x/tcg/translate.c                  | 10 +++---
target/tricore/{csfr.def => csfr.h.inc}       |  0
target/tricore/translate.c                    |  4 +--
tests/qtest/libqtest.h                        |  2 +-
tests/unit/test-io-channel-command.c          | 14 +++-----
20 files changed, 60 insertions(+), 55 deletions(-)
rename target/m68k/{qregs.def => qregs.h.inc} (100%)
rename target/s390x/tcg/{insn-data.def => insn-data.h.inc} (99%)
rename target/s390x/tcg/{insn-format.def => insn-format.h.inc} (100%)
rename target/tricore/{csfr.def => csfr.h.inc} (100%)
[PULL 00/10] Trivial branch for 7.2 patches
Posted by Laurent Vivier 1 year, 6 months ago
The following changes since commit a11f65ec1b8adcb012b89c92819cbda4dc25aaf1:

  Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2022-11-01 13:49:33 -0400)

are available in the Git repository at:

  https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.2-pull-request

for you to fetch changes up to 489db95896b86dacdde9dab1de84745880449e37:

  tests/unit: simpler variable sequence for test-io-channel (2022-11-03 17:16:34 +0100)

----------------------------------------------------------------
Pull request trivial branch 20221103

----------------------------------------------------------------

Alex Bennée (1):
  tests/unit: simpler variable sequence for test-io-channel

Chuck Zmudzinski (1):
  xen/pt: fix syntax error that causes FTBFS in some configurations

Han Han (1):
  qapi: virtio: Fix the introduced version

Philippe Mathieu-Daudé (3):
  target/m68k: Rename qregs.def -> qregs.h.inc
  target/s390x: Rename insn-data/format.def -> insn-data/format.h.inc
  target/tricore: Rename csfr.def -> csfr.h.inc

Stefan Weil (4):
  Fix some typos in documentation and comments
  libvhost-user: Fix wrong type of argument to formatting function
    (reported by LGTM)
  libvhost-user: Fix format strings
  libvhost-user: Add format attribute to local function vu_panic

 docs/devel/testing.rst                        |  2 +-
 docs/system/arm/cpu-features.rst              |  2 +-
 docs/system/loongarch/loongson3.rst           |  2 +-
 docs/tools/virtiofsd.rst                      |  2 +-
 hw/xen/meson.build                            |  2 +-
 include/exec/memory.h                         |  2 +-
 qapi/qom.json                                 |  2 +-
 qapi/virtio.json                              | 34 +++++++++----------
 qemu-options.hx                               | 10 +++---
 qga/qapi-schema.json                          |  2 +-
 subprojects/libvhost-user/libvhost-user.c     | 19 ++++++++---
 target/m68k/{qregs.def => qregs.h.inc}        |  0
 target/m68k/translate.c                       |  4 +--
 .../tcg/{insn-data.def => insn-data.h.inc}    |  2 +-
 .../{insn-format.def => insn-format.h.inc}    |  0
 target/s390x/tcg/translate.c                  | 10 +++---
 target/tricore/{csfr.def => csfr.h.inc}       |  0
 target/tricore/translate.c                    |  4 +--
 tests/qtest/libqtest.h                        |  2 +-
 tests/unit/test-io-channel-command.c          | 14 +++-----
 20 files changed, 60 insertions(+), 55 deletions(-)
 rename target/m68k/{qregs.def => qregs.h.inc} (100%)
 rename target/s390x/tcg/{insn-data.def => insn-data.h.inc} (99%)
 rename target/s390x/tcg/{insn-format.def => insn-format.h.inc} (100%)
 rename target/tricore/{csfr.def => csfr.h.inc} (100%)

-- 
2.37.3


Re: [PULL 00/10] Trivial branch for 7.2 patches
Posted by Stefan Hajnoczi 1 year, 6 months ago
Hi Stefan and Laurent,
Please take a look at this CI failure, I think it's triggered by this
pull request:

arm-linux-gnueabi-gcc -Isubprojects/libvhost-user/libvhost-user.a.p
-Isubprojects/libvhost-user -I../subprojects/libvhost-user
-fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -g
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64
-D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef
-Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common
-fwrapv -Wold-style-declaration -Wold-style-definition -Wtype-limits
-Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers
-Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined
-Wimplicit-fallthrough=2 -Wno-missing-include-dirs
-Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIE
-pthread -D_GNU_SOURCE -MD -MQ
subprojects/libvhost-user/libvhost-user.a.p/libvhost-user.c.o -MF
subprojects/libvhost-user/libvhost-user.a.p/libvhost-user.c.o.d -o
subprojects/libvhost-user/libvhost-user.a.p/libvhost-user.c.o -c
../subprojects/libvhost-user/libvhost-user.c
../subprojects/libvhost-user/libvhost-user.c: In function ‘generate_faults’:
../subprojects/libvhost-user/libvhost-user.c:664:27: error: format
‘%zx’ expects argument of type ‘size_t’, but argument 6 has type
‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]
664 | vu_panic(dev, "%s: Failed to userfault region %d "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
668 | dev_region->size, dev_region->mmap_offset,
| ~~~~~~~~~~~~~~~~
| |
| uint64_t {aka long long unsigned int}
../subprojects/libvhost-user/libvhost-user.c:665:50: note: format
string is defined here
665 | "@%" PRIx64 " + size:%zx offset: %zx: (ufd=%d)%s\n",
| ~~^
| |
| unsigned int
| %llx
../subprojects/libvhost-user/libvhost-user.c:664:27: error: format
‘%zx’ expects argument of type ‘size_t’, but argument 7 has type
‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]
664 | vu_panic(dev, "%s: Failed to userfault region %d "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
668 | dev_region->size, dev_region->mmap_offset,
| ~~~~~~~~~~~~~~~~~~~~~~~
| |
| uint64_t {aka long long unsigned int}
../subprojects/libvhost-user/libvhost-user.c:665:62: note: format
string is defined here
665 | "@%" PRIx64 " + size:%zx offset: %zx: (ufd=%d)%s\n",
| ~~^
| |
| unsigned int
| %llx
cc1: all warnings being treated as errors

https://gitlab.com/qemu-project/qemu/-/jobs/3275327714

On Thu, 3 Nov 2022 at 12:20, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit a11f65ec1b8adcb012b89c92819cbda4dc25aaf1:
>
>   Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging (2022-11-01 13:49:33 -0400)
>
> are available in the Git repository at:
>
>   https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.2-pull-request
>
> for you to fetch changes up to 489db95896b86dacdde9dab1de84745880449e37:
>
>   tests/unit: simpler variable sequence for test-io-channel (2022-11-03 17:16:34 +0100)
>
> ----------------------------------------------------------------
> Pull request trivial branch 20221103
>
> ----------------------------------------------------------------
>
> Alex Bennée (1):
>   tests/unit: simpler variable sequence for test-io-channel
>
> Chuck Zmudzinski (1):
>   xen/pt: fix syntax error that causes FTBFS in some configurations
>
> Han Han (1):
>   qapi: virtio: Fix the introduced version
>
> Philippe Mathieu-Daudé (3):
>   target/m68k: Rename qregs.def -> qregs.h.inc
>   target/s390x: Rename insn-data/format.def -> insn-data/format.h.inc
>   target/tricore: Rename csfr.def -> csfr.h.inc
>
> Stefan Weil (4):
>   Fix some typos in documentation and comments
>   libvhost-user: Fix wrong type of argument to formatting function
>     (reported by LGTM)
>   libvhost-user: Fix format strings
>   libvhost-user: Add format attribute to local function vu_panic
>
>  docs/devel/testing.rst                        |  2 +-
>  docs/system/arm/cpu-features.rst              |  2 +-
>  docs/system/loongarch/loongson3.rst           |  2 +-
>  docs/tools/virtiofsd.rst                      |  2 +-
>  hw/xen/meson.build                            |  2 +-
>  include/exec/memory.h                         |  2 +-
>  qapi/qom.json                                 |  2 +-
>  qapi/virtio.json                              | 34 +++++++++----------
>  qemu-options.hx                               | 10 +++---
>  qga/qapi-schema.json                          |  2 +-
>  subprojects/libvhost-user/libvhost-user.c     | 19 ++++++++---
>  target/m68k/{qregs.def => qregs.h.inc}        |  0
>  target/m68k/translate.c                       |  4 +--
>  .../tcg/{insn-data.def => insn-data.h.inc}    |  2 +-
>  .../{insn-format.def => insn-format.h.inc}    |  0
>  target/s390x/tcg/translate.c                  | 10 +++---
>  target/tricore/{csfr.def => csfr.h.inc}       |  0
>  target/tricore/translate.c                    |  4 +--
>  tests/qtest/libqtest.h                        |  2 +-
>  tests/unit/test-io-channel-command.c          | 14 +++-----
>  20 files changed, 60 insertions(+), 55 deletions(-)
>  rename target/m68k/{qregs.def => qregs.h.inc} (100%)
>  rename target/s390x/tcg/{insn-data.def => insn-data.h.inc} (99%)
>  rename target/s390x/tcg/{insn-format.def => insn-format.h.inc} (100%)
>  rename target/tricore/{csfr.def => csfr.h.inc} (100%)
>
> --
> 2.37.3
>
>