qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 2c109f: simpletrace: add __all__ to define pu


From: Alex Bennée
Subject: [Qemu-commits] [qemu/qemu] 2c109f: simpletrace: add __all__ to define public interface
Date: Mon, 02 Oct 2023 14:57:13 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2c109f21994a72e9b91c24c422e540b921e84f66
      
https://github.com/qemu/qemu/commit/2c109f21994a72e9b91c24c422e540b921e84f66
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: add __all__ to define public interface

It was unclear what was the supported public interface. I.e. when
refactoring the code, what functions/classes are important to retain.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-2-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 8405ec6ab6a05b8c84f7be1130a7891d1a874624
      
https://github.com/qemu/qemu/commit/8405ec6ab6a05b8c84f7be1130a7891d1a874624
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: annotate magic constants from QEMU code

It wasn't clear where the constants and structs came from, so I added
comments to help.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-3-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: f7bd4f0237ec394198940f5b81cbde280c5b5c01
      
https://github.com/qemu/qemu/commit/f7bd4f0237ec394198940f5b81cbde280c5b5c01
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: improve parsing of sys.argv; fix files never closed.

The arguments extracted from `sys.argv` named and unpacked to make it
clear what the arguments are and what they're used for.

The two input files were opened, but never explicitly closed. File usage
changed to use `with` statement to take care of this. At the same time,
ownership of the file-object is moved up to `run` function. Added option
to process to support file-like objects.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-4-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 3b71b61e9f50cad73958a87216dba7b22b851318
      
https://github.com/qemu/qemu/commit/3b71b61e9f50cad73958a87216dba7b22b851318
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: changed naming of edict and idtoname to improve readability

Readability is subjective, but I've expanded the naming of the variables
and arguments, to help with understanding for new eyes on the code.

Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 20230926103436.25700-5-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: ce96eb334dc0a3a7f570f422e8a578495f34e4f2
      
https://github.com/qemu/qemu/commit/ce96eb334dc0a3a7f570f422e8a578495f34e4f2
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: update code for Python 3.11

The call to `getargspec` was deprecated and in Python 3.11 it has been
removed in favor of `getfullargspec`. `getfullargspec` is compatible
with QEMU's requirement of at least Python version 3.6.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-6-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: d1f9259014317baa3bce7db7d4c2e927341e3cae
      
https://github.com/qemu/qemu/commit/d1f9259014317baa3bce7db7d4c2e927341e3cae
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: improved error handling on struct unpack

A failed call to `read_header` wouldn't be handled the same for the two
different code paths (one path would try to use `None` as a list).
Changed to raise exception to be handled centrally. This also allows for
easier unpacking, as errors has been filtered out.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-7-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 1990fb98934d8e114ac73b0ca649bf4820ca896a
      
https://github.com/qemu/qemu/commit/1990fb98934d8e114ac73b0ca649bf4820ca896a
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: define exception and add handling

Define `SimpleException` to differentiate our exceptions from generic
exceptions (IOError, etc.). Adapted simpletrace to support this and
output to stderr.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-8-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 87617b9ae63c4675460244d067e246b362dc3867
      
https://github.com/qemu/qemu/commit/87617b9ae63c4675460244d067e246b362dc3867
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: made Analyzer into context-manager

Instead of explicitly calling `begin` and `end`, we can change the class
to use the context-manager paradigm. This is mostly a styling choice,
used in modern Python code. But it also allows for more advanced analyzers
to handle exceptions gracefully in the `__exit__` method (not
demonstrated here).

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-9-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 6f53641a980df2d1b38503b10bfda9236fa075b4
      
https://github.com/qemu/qemu/commit/6f53641a980df2d1b38503b10bfda9236fa075b4
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: refactor to separate responsibilities

Moved event_mapping and event_id_to_name down one level in the function
call-stack to keep variable instantiation and usage closer (`process`
and `run` has no use of the variables; `read_trace_records` does).

Instead of passing event_mapping and event_id_to_name to the bottom of
the call-stack, we move their use to `read_trace_records`. This
separates responsibility and ownership of the information.

`read_record` now just reads the arguments from the file-object by
knowning the total number of bytes. Parsing it to specific arguments is
moved up to `read_trace_records`.

Special handling of dropped events removed, as they can be handled
by the general code.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-10-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: b78234e65cad8c4899a2cfcc5e5cd8d33fce1b95
      
https://github.com/qemu/qemu/commit/b78234e65cad8c4899a2cfcc5e5cd8d33fce1b95
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: move logic of process into internal function

To avoid duplicate code depending on input types and to better handle
open/close of log with a context-manager, we move the logic of process into
_process.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-11-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: d1f89c23bd93e40e180d4fc727e691a698a6d522
      
https://github.com/qemu/qemu/commit/d1f89c23bd93e40e180d4fc727e691a698a6d522
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: move event processing to Analyzer class

Moved event processing to the Analyzer class to separate specific analyzer
logic (like caching and function signatures) from the _process function.
This allows for new types of Analyzer-based subclasses without changing
the core code.

Note, that the fn_cache is important for performance in cases where the
analyzer is branching away from the catch-all a lot. The cache has no
measurable performance penalty.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-12-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 3470fef15a7bff730b00633346d28b889027a609
      
https://github.com/qemu/qemu/commit/3470fef15a7bff730b00633346d28b889027a609
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/simpletrace.py

  Log Message:
  -----------
  simpletrace: added simplified Analyzer2 class

By moving the dynamic argument construction to keyword-arguments,
we can remove all of the specialized handling, and streamline it.
If a tracing method wants to access these, they can define the
kwargs, or ignore it be placing `**kwargs` at the end of the
function's arguments list.

Added deprecation warning to Analyzer class to make users aware
of the Analyzer2 class. No removal date is planned.

Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-13-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 84197267d1620405c664f6d4510288d0fd3a8837
      
https://github.com/qemu/qemu/commit/84197267d1620405c664f6d4510288d0fd3a8837
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: add maintainer of simpletrace.py

In my work to refactor simpletrace.py, I noticed that there's no
maintainer of it, and has the status of "odd fixes". I'm using it from
time to time, so I'd like to maintain the script.

I've added myself as reviewer under "Tracing" to be informed of changes
that might affect simpletrace.py.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-14-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: ff014701ab0f09fdbf37b4c39334790f9b298253
      
https://github.com/qemu/qemu/commit/ff014701ab0f09fdbf37b4c39334790f9b298253
  Author: Mads Ynddal <m.ynddal@samsung.com>
  Date:   2023-09-26 (Tue, 26 Sep 2023)

  Changed paths:
    M scripts/analyse-locks-simpletrace.py

  Log Message:
  -----------
  scripts/analyse-locks-simpletrace.py: changed iteritems() to items()

Python 3 removed `dict.iteritems()` in favor of `dict.items()`. This
means the script currently doesn't work on Python 3.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Mads Ynddal <m.ynddal@samsung.com>
Message-id: 20230926103436.25700-15-mads@ynddal.dk
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: d97fa9a00d5b333c8642670b7b55f9101d495dce
      
https://github.com/qemu/qemu/commit/d97fa9a00d5b333c8642670b7b55f9101d495dce
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M tests/tcg/tricore/Makefile.softmmu-target

  Log Message:
  -----------
  tests/tcg/tricore: Bump cpu to tc37x

we don't want to exclude ISA v1.6.2 insns from our tests.

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-Id: <20230828112651.522058-2-kbastian@mail.uni-paderborn.de>


  Commit: 3e2a5107c52f5bf7ed68f4b468cff5be456f1097
      
https://github.com/qemu/qemu/commit/3e2a5107c52f5bf7ed68f4b468cff5be456f1097
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/helper.h
    M target/tricore/op_helper.c
    M target/tricore/translate.c
    M target/tricore/tricore-opcodes.h
    M tests/tcg/tricore/Makefile.softmmu-target
    A tests/tcg/tricore/asm/test_crcn.S

  Log Message:
  -----------
  target/tricore: Implement CRCN insn

reported in https://gitlab.com/qemu-project/qemu/-/issues/1667

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-3-kbastian@mail.uni-paderborn.de>


  Commit: ce64babdf60fb9a7de8bcac637243a10db1a3b26
      
https://github.com/qemu/qemu/commit/ce64babdf60fb9a7de8bcac637243a10db1a3b26
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/helper.c

  Log Message:
  -----------
  target/tricore: Correctly handle FPU RM from PSW

when we reconstructed PSW using psw_read(), we were trying to clear the
cached USB bits out of env->PSW. The mask was wrong and we would clear
PSW.RM as well.

when we write the PSW using psw_write() we update the rounding modes in
env->fp_status for softfloat. The order of bits used by TriCore is not
the one used by softfloat.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-4-kbastian@mail.uni-paderborn.de>


  Commit: 2bdbe35632fc1f5f83054427085f59d28f45660f
      
https://github.com/qemu/qemu/commit/2bdbe35632fc1f5f83054427085f59d28f45660f
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/fpu_helper.c
    M target/tricore/helper.h
    M target/tricore/translate.c
    M tests/tcg/tricore/Makefile.softmmu-target
    A tests/tcg/tricore/asm/test_ftou.S

  Log Message:
  -----------
  target/tricore: Implement FTOU insn

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-5-kbastian@mail.uni-paderborn.de>


  Commit: e43692bce684b76480df66473a9b3bec7a7d312a
      
https://github.com/qemu/qemu/commit/e43692bce684b76480df66473a9b3bec7a7d312a
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/fpu_helper.c

  Log Message:
  -----------
  target/tricore: Clarify special case for FTOUZ insn

this is not something other ISAs do, so clarify it with a comment.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-6-kbastian@mail.uni-paderborn.de>


  Commit: 815061b9da88a3a9a90fae58b5a778632e0cc2df
      
https://github.com/qemu/qemu/commit/815061b9da88a3a9a90fae58b5a778632e0cc2df
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/fpu_helper.c
    M target/tricore/helper.c
    M target/tricore/helper.h
    M target/tricore/translate.c
    M target/tricore/tricore-opcodes.h
    M tests/tcg/tricore/Makefile.softmmu-target
    A tests/tcg/tricore/asm/test_ftohp.S

  Log Message:
  -----------
  target/tricore: Implement ftohp insn

reported in https://gitlab.com/qemu-project/qemu/-/issues/1667

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-7-kbastian@mail.uni-paderborn.de>


  Commit: 5e0e06d9a2ce13d5b9832f0dddeaf5e2f4f70591
      
https://github.com/qemu/qemu/commit/5e0e06d9a2ce13d5b9832f0dddeaf5e2f4f70591
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/fpu_helper.c
    M target/tricore/helper.h
    M target/tricore/translate.c
    M target/tricore/tricore-opcodes.h
    M tests/tcg/tricore/Makefile.softmmu-target
    A tests/tcg/tricore/asm/test_hptof.S

  Log Message:
  -----------
  target/tricore: Implement hptof insn

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1667
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-8-kbastian@mail.uni-paderborn.de>


  Commit: 23fa6f56b33f8fddf86ba4d027fb7d3081440cd9
      
https://github.com/qemu/qemu/commit/23fa6f56b33f8fddf86ba4d027fb7d3081440cd9
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/translate.c
    M tests/tcg/tricore/asm/macros.h
    M tests/tcg/tricore/asm/test_insert.S

  Log Message:
  -----------
  target/tricore: Fix RCPW/RRPW_INSERT insns for width = 0

we would crash if width was 0 for these insns, as tcg_gen_deposit() is
undefined for that case. For TriCore, width = 0 is a mov from the src reg
to the dst reg, so we special case this here.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-9-kbastian@mail.uni-paderborn.de>


  Commit: 222ff2d3581e46731fe19644dfc4c4f36f39ac03
      
https://github.com/qemu/qemu/commit/222ff2d3581e46731fe19644dfc4c4f36f39ac03
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/translate.c
    M tests/tcg/tricore/asm/macros.h
    M tests/tcg/tricore/asm/test_insert.S

  Log Message:
  -----------
  target/tricore: Swap src and dst reg for RCRR_INSERT

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-10-kbastian@mail.uni-paderborn.de>


  Commit: 1f22db19533c6e8b01274d12c161c063083e2fba
      
https://github.com/qemu/qemu/commit/1f22db19533c6e8b01274d12c161c063083e2fba
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/translate.c

  Log Message:
  -----------
  target/tricore: Replace cpu_*_code with translator_*

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-11-kbastian@mail.uni-paderborn.de>


  Commit: 4f79db4750cbabed18f11cd791c5e5222a711fd5
      
https://github.com/qemu/qemu/commit/4f79db4750cbabed18f11cd791c5e5222a711fd5
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M target/tricore/translate.c

  Log Message:
  -----------
  target/tricore: Fix FTOUZ being ISA v1.3.1 up

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230828112651.522058-12-kbastian@mail.uni-paderborn.de>


  Commit: 8c3cf3f2bdf072b5ead13db81f1e6d879cd09bb6
      
https://github.com/qemu/qemu/commit/8c3cf3f2bdf072b5ead13db81f1e6d879cd09bb6
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M tests/tcg/tricore/asm/macros.h

  Log Message:
  -----------
  tests/tcg/tricore: Extended and non-extened regs now match

RSx for d regs and e regs now use the same numbering. This makes sure
that mixing d and e registers in an insn test will not overwrite data
between registers.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230913105326.40832-2-kbastian@mail.uni-paderborn.de>


  Commit: f47a90dacca8f74210a2675bdde7ab3856872b94
      
https://github.com/qemu/qemu/commit/f47a90dacca8f74210a2675bdde7ab3856872b94
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/translator.c

  Log Message:
  -----------
  accel/tcg: Avoid load of icount_decr if unused

With CF_NOIRQ and without !CF_USE_ICOUNT, the load isn't used.
Avoid emitting it.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 5d97e94638100fd3e5b8d76ab30e1066cd4b1823
      
https://github.com/qemu/qemu/commit/5d97e94638100fd3e5b8d76ab30e1066cd4b1823
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/translator.c

  Log Message:
  -----------
  accel/tcg: Hoist CF_MEMI_ONLY check outside translation loop

The condition checked is loop invariant; check it only once.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 0ca41ccf1c555f97873b8e02a47390fd6af4b18f
      
https://github.com/qemu/qemu/commit/0ca41ccf1c555f97873b8e02a47390fd6af4b18f
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/translator.c
    M include/exec/translator.h

  Log Message:
  -----------
  accel/tcg: Track current value of can_do_io in the TB

Simplify translator_io_start by recording the current
known value of can_do_io within DisasContextBase.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: a2f99d484c54adda13e62bf75ba512618a3fe470
      
https://github.com/qemu/qemu/commit/a2f99d484c54adda13e62bf75ba512618a3fe470
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/translator.c

  Log Message:
  -----------
  accel/tcg: Improve setting of can_do_io at start of TB

Initialize can_do_io to true if this the TB has CF_LAST_IO
and will consist of a single instruction.  This avoids a
set to 0 followed immediately by a set to 1.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 200c1f904f46c209cb022e711a48b89e46512902
      
https://github.com/qemu/qemu/commit/200c1f904f46c209cb022e711a48b89e46512902
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tb-maint.c

  Log Message:
  -----------
  accel/tcg: Always set CF_LAST_IO with CF_NOIRQ

Without this we can get see loops through cpu_io_recompile,
in which the cpu makes no progress.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 18a536f1f8d6222e562f59179e837fdfd8b92718
      
https://github.com/qemu/qemu/commit/18a536f1f8d6222e562f59179e837fdfd8b92718
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-09-28 (Thu, 28 Sep 2023)

  Changed paths:
    M accel/tcg/translator.c
    M target/mips/tcg/translate.c

  Log Message:
  -----------
  accel/tcg: Always require can_do_io

Require i/o as the last insn of a TranslationBlock always,
not only with icount.  This is required for i/o that alters
the address space, such as a pci config space write.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1866
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: bbde656263d80429b51017b077d9b4064ba13b01
      
https://github.com/qemu/qemu/commit/bbde656263d80429b51017b077d9b4064ba13b01
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: Fix save_page method to fail on polling error

qemu_rdma_save_page() reports polling error with error_report(), then
succeeds anyway.  This is because the variable holding the polling
status *shadows* the variable the function returns.  The latter
remains zero.

Broken since day one, and duplicated more recently.

Fixes: 2da776db4846 (rdma: core logic)
Fixes: b390afd8c50b (migration/rdma: Fix out of order wrid)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Message-ID: <20230921121312.1301864-2-armbru@redhat.com>


  Commit: 7f3de3f02f0bd0eaa3ba4506f9a60c1c35865e93
      
https://github.com/qemu/qemu/commit/7f3de3f02f0bd0eaa3ba4506f9a60c1c35865e93
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/block.c
    M migration/ram.c
    M migration/rdma.c
    M migration/vmstate.c

  Log Message:
  -----------
  migration: Clean up local variable shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: delete inner declarations when they are actually redundant,
else rename variables.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Message-ID: <20230921121312.1301864-3-armbru@redhat.com>


  Commit: e33e66b1b3655d98aadebf7e22eae18077698401
      
https://github.com/qemu/qemu/commit/e33e66b1b3655d98aadebf7e22eae18077698401
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M ui/gtk.c
    M ui/spice-display.c
    M ui/vnc-enc-zrle.c.inc
    M ui/vnc-palette.c
    M ui/vnc.c

  Log Message:
  -----------
  ui: Clean up local variable shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: delete inner declarations when they are actually redundant,
else rename variables.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230921121312.1301864-4-armbru@redhat.com>


  Commit: 6a0f7ff7dd2034fb167557f0444e1f1851dbd654
      
https://github.com/qemu/qemu/commit/6a0f7ff7dd2034fb167557f0444e1f1851dbd654
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M block/monitor/bitmap-qmp-cmds.c
    M block/qcow2-bitmap.c

  Log Message:
  -----------
  block/dirty-bitmap: Clean up local variable shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: rename both the pair of parameters and the pair of local
variables.  While there, move the local variables to function scope.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230921121312.1301864-5-armbru@redhat.com>


  Commit: d25b99c72b0178ce0e0c766b07011102dbbacf6a
      
https://github.com/qemu/qemu/commit/d25b99c72b0178ce0e0c766b07011102dbbacf6a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M block/vdi.c

  Log Message:
  -----------
  block/vdi: Clean up local variable shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: delete inner declarations when they are actually redundant,
else rename variables.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230921121312.1301864-6-armbru@redhat.com>


  Commit: fb2575f95411644abe7f0606594035b63a5132ad
      
https://github.com/qemu/qemu/commit/fb2575f95411644abe7f0606594035b63a5132ad
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M block.c
    M block/rbd.c
    M block/stream.c
    M block/vvfat.c
    M hw/block/xen-block.c

  Log Message:
  -----------
  block: Clean up local variable shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Tracked down with -Wshadow=local.
Clean up: delete inner declarations when they are actually redundant,
else rename variables.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-ID: <20230921121312.1301864-7-armbru@redhat.com>


  Commit: bb71846325e23d884ca4ff1bcc95aaead0131a5a
      
https://github.com/qemu/qemu/commit/bb71846325e23d884ca4ff1bcc95aaead0131a5a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M include/qapi/qmp/qobject.h
    M include/qemu/atomic.h
    M include/qemu/compiler.h
    M include/qemu/osdep.h

  Log Message:
  -----------
  qobject atomics osdep: Make a few macros more hygienic

Variables declared in macros can shadow other variables.  Much of the
time, this is harmless, e.g.:

    #define _FDT(exp)                                                  \
        do {                                                           \
            int ret = (exp);                                           \
            if (ret < 0) {                                             \
                error_report("error creating device tree: %s: %s",   \
                        #exp, fdt_strerror(ret));                      \
                exit(1);                                               \
            }                                                          \
        } while (0)

Harmless shadowing in h_client_architecture_support():

        target_ulong ret;

        [...]

        ret = do_client_architecture_support(cpu, spapr, vec, fdt_bufsize);
        if (ret == H_SUCCESS) {
            _FDT((fdt_pack(spapr->fdt_blob)));
            [...]
        }

        return ret;

However, we can get in trouble when the shadowed variable is used in a
macro argument:

    #define QOBJECT(obj) ({                                 \
        typeof(obj) o = (obj);                              \
        o ? container_of(&(o)->base, QObject, base) : NULL; \
     })

QOBJECT(o) expands into

    ({
--->    typeof(o) o = (o);
        o ? container_of(&(o)->base, QObject, base) : NULL;
    })

Unintended variable name capture at --->.  We'd be saved by
-Winit-self.  But I could certainly construct more elaborate death
traps that don't trigger it.

To reduce the risk of trapping ourselves, we use variable names in
macros that no sane person would use elsewhere.  Here's our actual
definition of QOBJECT():

    #define QOBJECT(obj) ({                                         \
        typeof(obj) _obj = (obj);                                   \
        _obj ? container_of(&(_obj)->base, QObject, base) : NULL;   \
    })

Works well enough until we nest macro calls.  For instance, with

    #define qobject_ref(obj) ({                     \
        typeof(obj) _obj = (obj);                   \
        qobject_ref_impl(QOBJECT(_obj));            \
        _obj;                                       \
    })

the expression qobject_ref(obj) expands into

    ({
        typeof(obj) _obj = (obj);
        qobject_ref_impl(
            ({
--->            typeof(_obj) _obj = (_obj);
                _obj ? container_of(&(_obj)->base, QObject, base) : NULL;
            }));
        _obj;
    })

Unintended variable name capture at --->.

The only reliable way to prevent unintended variable name capture is
-Wshadow.

One blocker for enabling it is shadowing hiding in function-like
macros like

     qdict_put(dict, "name", qobject_ref(...))

qdict_put() wraps its last argument in QOBJECT(), and the last
argument here contains another QOBJECT().

Use dark preprocessor sorcery to make the macros that give us this
problem use different variable names on every call.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-ID: <20230921121312.1301864-8-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 6d559996447e544e93e036fc4c87f2f64defef5e
      
https://github.com/qemu/qemu/commit/6d559996447e544e93e036fc4c87f2f64defef5e
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/tricore/tricore_testdevice.c

  Log Message:
  -----------
  hw/tricore: Log failing test in testdevice

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230913105326.40832-3-kbastian@mail.uni-paderborn.de>


  Commit: 76bc63d7eda821e0a82e0ba0a5ad1ad5c52c8d5f
      
https://github.com/qemu/qemu/commit/76bc63d7eda821e0a82e0ba0a5ad1ad5c52c8d5f
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/tcg/tricore/asm/macros.h

  Log Message:
  -----------
  tests/tcg: Reset result register after each test

some insns use the result register implicitly as an input. Thus, we
could end up with data from the previous insn spilling over.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230913105326.40832-4-kbastian@mail.uni-paderborn.de>


  Commit: 824b2cb39c3c7dfa93f50d99d8bbd0c6d217ce24
      
https://github.com/qemu/qemu/commit/824b2cb39c3c7dfa93f50d99d8bbd0c6d217ce24
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/tricore/cpu.h

  Log Message:
  -----------
  target/tricore: Remove CSFRs from cpu.h

these are already defined in 'csfr.h.inc'. We don't need to duplicate
these registers.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230913105326.40832-10-kbastian@mail.uni-paderborn.de>


  Commit: ceada000846b0cd81c578b1da9f76d0c59536654
      
https://github.com/qemu/qemu/commit/ceada000846b0cd81c578b1da9f76d0c59536654
  Author: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/tricore/op_helper.c

  Log Message:
  -----------
  target/tricore: Change effective address (ea) to target_ulong

as this is an effective address and those cannot be signed,
it should not be a signed integer.

Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Message-ID: <20230913105326.40832-11-kbastian@mail.uni-paderborn.de>


  Commit: 9a239c6eae68e0bfb989f9ebb2907e04f98fde99
      
https://github.com/qemu/qemu/commit/9a239c6eae68e0bfb989f9ebb2907e04f98fde99
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M accel/tcg/tb-maint.c
    M tcg/tcg.c

  Log Message:
  -----------
  tcg: Clean up local variable shadowing

Fix:

  tcg/tcg.c:2551:27: error: declaration shadows a local variable 
[-Werror,-Wshadow]
                    MemOp op = get_memop(oi);
                          ^
  tcg/tcg.c:2437:12: note: previous declaration is here
    TCGOp *op;
           ^
  accel/tcg/tb-maint.c:245:18: error: declaration shadows a local variable 
[-Werror,-Wshadow]
        for (int i = 0; i < V_L2_SIZE; i++) {
                 ^
  accel/tcg/tb-maint.c:210:9: note: previous declaration is here
    int i;
        ^

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-2-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: d54deb2a0723d696bc4e95265d6ccb4236cb0cf4
      
https://github.com/qemu/qemu/commit/d54deb2a0723d696bc4e95265d6ccb4236cb0cf4
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/arm/tcg/mve_helper.c
    M target/arm/tcg/translate-m-nocp.c

  Log Message:
  -----------
  target/arm/tcg: Clean up local variable shadowing

Fix:

  target/arm/tcg/translate-m-nocp.c: In function ‘gen_M_fp_sysreg_read’:
  target/arm/tcg/translate-m-nocp.c:509:18: warning: declaration of ‘tmp’ 
shadows a previous local [-Wshadow=compatible-local]
    509 |         TCGv_i32 tmp = load_cpu_field(v7m.fpdscr[M_REG_NS]);
        |                  ^~~
  target/arm/tcg/translate-m-nocp.c:433:14: note: shadowed declaration is here
    433 |     TCGv_i32 tmp;
        |              ^~~
       ---

  target/arm/tcg/mve_helper.c: In function ‘helper_mve_vqshlsb’:
  target/arm/tcg/mve_helper.c:1259:19: warning: declaration of ‘r’ shadows a 
previous local [-Wshadow=compatible-local]
   1259 |         typeof(N) r = FN(N, (int8_t)(M), sizeof(N) * 8, ROUND, 
&su32);  \
        |                   ^
  target/arm/tcg/mve_helper.c:1267:5: note: in expansion of macro 
‘WRAP_QRSHL_HELPER’
   1267 |     WRAP_QRSHL_HELPER(do_sqrshl_bhs, N, M, false, satp)
        |     ^~~~~~~~~~~~~~~~~
  target/arm/tcg/mve_helper.c:927:22: note: in expansion of macro ‘DO_SQSHL_OP’
    927 |             TYPE r = FN(n[H##ESIZE(e)], m[H##ESIZE(e)], &sat);        
  \
        |                      ^~
  target/arm/tcg/mve_helper.c:945:5: note: in expansion of macro ‘DO_2OP_SAT’
    945 |     DO_2OP_SAT(OP##b, 1, int8_t, FN)            \
        |     ^~~~~~~~~~
  target/arm/tcg/mve_helper.c:1277:1: note: in expansion of macro ‘DO_2OP_SAT_S’
   1277 | DO_2OP_SAT_S(vqshls, DO_SQSHL_OP)
        | ^~~~~~~~~~~~
       ---

  target/arm/tcg/mve_helper.c: In function ‘do_sqrshl48_d’:
  target/arm/tcg/mve_helper.c:2463:17: warning: declaration of ‘extval’ shadows 
a previous local [-Wshadow=compatible-local]
   2463 |         int64_t extval = sextract64(src << shift, 0, 48);
        |                 ^~~~~~
  target/arm/tcg/mve_helper.c:2443:18: note: shadowed declaration is here
   2443 |     int64_t val, extval;
        |                  ^~~~~~
       ---

  target/arm/tcg/mve_helper.c: In function ‘do_uqrshl48_d’:
  target/arm/tcg/mve_helper.c:2495:18: warning: declaration of ‘extval’ shadows 
a previous local [-Wshadow=compatible-local]
   2495 |         uint64_t extval = extract64(src << shift, 0, 48);
        |                  ^~~~~~
  target/arm/tcg/mve_helper.c:2479:19: note: shadowed declaration is here
   2479 |     uint64_t val, extval;
        |                   ^~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-3-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5a3d2c3562a9b35443fb4121ba6efff9d6cdbb91
      
https://github.com/qemu/qemu/commit/5a3d2c3562a9b35443fb4121ba6efff9d6cdbb91
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/arm/hvf/hvf.c

  Log Message:
  -----------
  target/arm/hvf: Clean up local variable shadowing

Per Peter Maydell analysis [*]:

  The hvf_vcpu_exec() function is not documented, but in practice
  its caller expects it to return either EXCP_DEBUG (for "this was
  a guest debug exception you need to deal with") or something else
  (presumably the intention being 0 for OK).

  The hvf_sysreg_read() and hvf_sysreg_write() functions are also not
  documented, but they return 0 on success, or 1 for a completely
  unrecognized sysreg where we've raised the UNDEF exception (but
  not if we raised an UNDEF exception for an unrecognized GIC sysreg --
  I think this is a bug). We use this return value to decide whether
  we need to advance the PC past the insn or not. It's not the same
  as the return value we want to return from hvf_vcpu_exec().

  Retain the variable as locally scoped but give it a name that
  doesn't clash with the other function-scoped variable.

This fixes:

  target/arm/hvf/hvf.c:1936:13: error: declaration shadows a local variable 
[-Werror,-Wshadow]
        int ret = 0;
            ^
  target/arm/hvf/hvf.c:1807:9: note: previous declaration is here
    int ret;
        ^
[*] 
https://lore.kernel.org/qemu-devel/CAFEAcA_e+fU6JKtS+W63wr9cCJ6btu_hT_ydZWOwC0kBkDYYYQ@mail.gmail.com/

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-4-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 92e0ef7d907a7b39d942732a29c04446a4ef5cac
      
https://github.com/qemu/qemu/commit/92e0ef7d907a7b39d942732a29c04446a4ef5cac
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/mips/tcg/msa_helper.c
    M target/mips/tcg/nanomips_translate.c.inc
    M target/mips/tcg/translate.c

  Log Message:
  -----------
  target/mips: Clean up local variable shadowing

Fix:

  target/mips/tcg/nanomips_translate.c.inc:4410:33: error: declaration shadows 
a local variable [-Werror,-Wshadow]
                        int32_t imm = extract32(ctx->opcode, 1, 13) |
                                ^
  target/mips/tcg/nanomips_translate.c.inc:3577:9: note: previous declaration 
is here
    int imm;
        ^
  target/mips/tcg/translate.c:15578:19: error: declaration shadows a local 
variable [-Werror,-Wshadow]
    for (unsigned i = 1; i < 32; i++) {
                  ^
  target/mips/tcg/translate.c:15567:9: note: previous declaration is here
    int i;
        ^
  target/mips/tcg/msa_helper.c:7478:13: error: declaration shadows a local 
variable [-Werror,-Wshadow]
            MSA_FLOAT_MAXOP(pwx->w[0], min, pws->w[0], pws->w[0], 32);
            ^
  target/mips/tcg/msa_helper.c:7434:23: note: expanded from macro 
'MSA_FLOAT_MAXOP'
        float_status *status = &env->active_tc.msa_fp_status;
                      ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-5-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 574d57254596d328d1a3c419e138e69369f2a98b
      
https://github.com/qemu/qemu/commit/574d57254596d328d1a3c419e138e69369f2a98b
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/m68k/translate.c

  Log Message:
  -----------
  target/m68k: Clean up local variable shadowing

Fix:

  target/m68k/translate.c:828:18: error: declaration shadows a local variable 
[-Werror,-Wshadow]
            TCGv tmp = tcg_temp_new();
                 ^
  target/m68k/translate.c:801:15: note: previous declaration is here
    TCGv reg, tmp, result;
              ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230904161235.84651-6-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 81b8056a41eabff08e243c80b628fc18bfac2b73
      
https://github.com/qemu/qemu/commit/81b8056a41eabff08e243c80b628fc18bfac2b73
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/tricore/translate.c

  Log Message:
  -----------
  target/tricore: Clean up local variable shadowing

Fix:

  target/tricore/translate.c:5016:18: warning: declaration of ‘temp’ shadows a 
previous local [-Wshadow=compatible-local]
   5016 |             TCGv temp = tcg_constant_i32(const9);
        |                  ^~~~
  target/tricore/translate.c:4958:10: note: shadowed declaration is here
   4958 |     TCGv temp;
        |          ^~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-7-philmd@linaro.org>
Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 807e4d1d2155b7cf4d18bf4e0a73c4e7023f0d57
      
https://github.com/qemu/qemu/commit/807e4d1d2155b7cf4d18bf4e0a73c4e7023f0d57
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/armsse.c
    M hw/arm/armv7m.c

  Log Message:
  -----------
  hw/arm/armv7m: Clean up local variable shadowing

Fix:

  hw/arm/armv7m.c: In function ‘armv7m_realize’:
  hw/arm/armv7m.c:520:27: warning: declaration of ‘sbd’ shadows a previous 
local [-Wshadow=compatible-local]
    520 |             SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]);
        |                           ^~~
  hw/arm/armv7m.c:278:19: note: shadowed declaration is here
    278 |     SysBusDevice *sbd;
        |                   ^~~
       ---

  hw/arm/armsse.c: In function ‘armsse_realize’:
  hw/arm/armsse.c:1471:27: warning: declaration of ‘mr’ shadows a previous 
local [-Wshadow=compatible-local]
   1471 |             MemoryRegion *mr;
        |                           ^~
  hw/arm/armsse.c:917:19: note: shadowed declaration is here
    917 |     MemoryRegion *mr;
        |                   ^~
       ---

  hw/arm/armsse.c:1608:22: warning: declaration of ‘dev_splitter’ shadows a 
previous local [-Wshadow=compatible-local]
   1608 |         DeviceState *dev_splitter = DEVICE(splitter);
        |                      ^~~~~~~~~~~~
  hw/arm/armsse.c:923:18: note: shadowed declaration is here
    923 |     DeviceState *dev_splitter;
        |                  ^~~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-8-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: c7f14e4898bb4fcaa1420434bf4331e2843946fd
      
https://github.com/qemu/qemu/commit/c7f14e4898bb4fcaa1420434bf4331e2843946fd
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: Clean up local variable shadowing

Fix:

  hw/arm/virt.c:821:22: error: declaration shadows a local variable 
[-Werror,-Wshadow]
            qemu_irq irq = qdev_get_gpio_in(vms->gic,
                     ^
  hw/arm/virt.c:803:13: note: previous declaration is here
        int irq;
            ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230904161235.84651-9-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 2f6037a2359fb653704ff240fb552bd77537f9ec
      
https://github.com/qemu/qemu/commit/2f6037a2359fb653704ff240fb552bd77537f9ec
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/allwinner-r40.c

  Log Message:
  -----------
  hw/arm/allwinner: Clean up local variable shadowing

Fix:

  hw/arm/allwinner-r40.c:412:14: error: declaration shadows a local variable 
[-Werror,-Wshadow]
    for (int i = 0; i < AW_R40_NUM_MMCS; i++) {
             ^
  hw/arm/allwinner-r40.c:299:14: note: previous declaration is here
    unsigned i;
             ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230904161235.84651-10-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5f87dddbc2aaa126a6c1334115a5ec9bd33fb62a
      
https://github.com/qemu/qemu/commit/5f87dddbc2aaa126a6c1334115a5ec9bd33fb62a
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/m68k/bootinfo.h

  Log Message:
  -----------
  hw/m68k: Clean up local variable shadowing

Fix:

  hw/m68k/virt.c:263:13: error: declaration shadows a local variable 
[-Werror,-Wshadow]
            BOOTINFOSTR(param_ptr, BI_COMMAND_LINE,
            ^
  hw/m68k/bootinfo.h:47:13: note: expanded from macro 'BOOTINFOSTR'
        int i; \
            ^
  hw/m68k/virt.c:130:9: note: previous declaration is here
    int i;
        ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-13-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 4705c8e5a2d0e62a276ce21e6b15bff0e7e42bdf
      
https://github.com/qemu/qemu/commit/4705c8e5a2d0e62a276ce21e6b15bff0e7e42bdf
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/microblaze/petalogix_ml605_mmu.c

  Log Message:
  -----------
  hw/microblaze: Clean up local variable shadowing

Fix:

  hw/microblaze/petalogix_ml605_mmu.c: In function ‘petalogix_ml605_init’:
  hw/microblaze/petalogix_ml605_mmu.c:186:24: warning: declaration of ‘dinfo’ 
shadows a previous local [-Wshadow=compatible-local]
    186 |             DriveInfo *dinfo = drive_get(IF_MTD, 0, i);
        |                        ^~~~~
  hw/microblaze/petalogix_ml605_mmu.c:78:16: note: shadowed declaration is here
     78 |     DriveInfo *dinfo;
        |                ^~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-14-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 09e24b10de02b19d193d85645c19a68b98263bef
      
https://github.com/qemu/qemu/commit/09e24b10de02b19d193d85645c19a68b98263bef
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/nios2/10m50_devboard.c

  Log Message:
  -----------
  hw/nios2: Clean up local variable shadowing

Fix:

  hw/nios2/10m50_devboard.c: In function ‘nios2_10m50_ghrd_init’:
  hw/nios2/10m50_devboard.c:101:22: warning: declaration of ‘dev’ shadows a 
previous local [-Wshadow=compatible-local]
    101 |         DeviceState *dev = qdev_new(TYPE_NIOS2_VIC);
        |                      ^~~
  hw/nios2/10m50_devboard.c:60:18: note: shadowed declaration is here
     60 |     DeviceState *dev;
        |                  ^~~

  hw/nios2/10m50_devboard.c:110:18: warning: declaration of ‘i’ shadows a 
previous local [-Wshadow=compatible-local]
    110 |         for (int i = 0; i < 32; i++) {
        |                  ^
  hw/nios2/10m50_devboard.c:67:9: note: shadowed declaration is here
     67 |     int i;
        |         ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-15-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 1728593a82cdd8ffcd2a5a759fb301c71ae4c251
      
https://github.com/qemu/qemu/commit/1728593a82cdd8ffcd2a5a759fb301c71ae4c251
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M net/eth.c

  Log Message:
  -----------
  net/eth: Clean up local variable shadowing

Fix:

  net/eth.c:435:20: error: declaration shadows a local variable 
[-Werror,-Wshadow]
            size_t input_size = iov_size(pkt, pkt_frags);
                   ^
  net/eth.c:413:16: note: previous declaration is here
        size_t input_size = iov_size(pkt, pkt_frags);
               ^

Suggested-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-16-philmd@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5f6d4f79af6eb4b0eed9cb3272073841514ca989
      
https://github.com/qemu/qemu/commit/5f6d4f79af6eb4b0eed9cb3272073841514ca989
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M crypto/cipher-gnutls.c.inc

  Log Message:
  -----------
  crypto/cipher-gnutls.c: Clean up local variable shadowing

Fix:

  In file included from crypto/cipher.c:140:
  crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_encrypt’:
  crypto/cipher-gnutls.c.inc:116:17: warning: declaration of ‘err’ shadows a 
previous local [-Wshadow=compatible-local]
    116 |             int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, 
NULL);
        |                 ^~~
  crypto/cipher-gnutls.c.inc:94:9: note: shadowed declaration is here
     94 |     int err;
        |         ^~~
       ---

  crypto/cipher-gnutls.c.inc: In function ‘qcrypto_gnutls_cipher_decrypt’:
  crypto/cipher-gnutls.c.inc:177:17: warning: declaration of ‘err’ shadows a 
previous local [-Wshadow=compatible-local]
    177 |             int err = gnutls_cipher_init(&handle, ctx->galg, &gkey, 
NULL);
        |                 ^~~
  crypto/cipher-gnutls.c.inc:154:9: note: shadowed declaration is here
    154 |     int err;
        |         ^~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-17-philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: fbf58f2141f670c1e4fc63be36e8a45330ab1e3d
      
https://github.com/qemu/qemu/commit/fbf58f2141f670c1e4fc63be36e8a45330ab1e3d
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M util/vhost-user-server.c

  Log Message:
  -----------
  util/vhost-user-server: Clean up local variable shadowing

Fix:

  util/vhost-user-server.c: In function ‘set_watch’:
  util/vhost-user-server.c:274:20: warning: declaration of ‘vu_fd_watch’ 
shadows a previous local [-Wshadow=compatible-local]
    274 |         VuFdWatch *vu_fd_watch = g_new0(VuFdWatch, 1);
        |                    ^~~~~~~~~~~
  util/vhost-user-server.c:271:16: note: shadowed declaration is here
    271 |     VuFdWatch *vu_fd_watch = find_vu_fd_watch(server, fd);
        |                ^~~~~~~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-18-philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 7f087a323768585bb6063a1ee05a03a52b6a0b8f
      
https://github.com/qemu/qemu/commit/7f087a323768585bb6063a1ee05a03a52b6a0b8f
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M linux-user/strace.c

  Log Message:
  -----------
  linux-user/strace: Clean up local variable shadowing

Fix:

  linux-user/strace.c: In function ‘print_sockaddr’:
  linux-user/strace.c:370:17: warning: declaration of ‘i’ shadows a previous 
local [-Wshadow=compatible-local]
    370 |             int i;
        |                 ^
  linux-user/strace.c:361:9: note: shadowed declaration is here
    361 |     int i;
        |         ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-20-philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 720d6bcdbb9fd6781025f245c8d02ce179a2fc86
      
https://github.com/qemu/qemu/commit/720d6bcdbb9fd6781025f245c8d02ce179a2fc86
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M include/sysemu/device_tree.h

  Log Message:
  -----------
  sysemu/device_tree: Clean up local variable shadowing

Fix:

  hw/mips/boston.c:472:5: error: declaration shadows a local variable 
[-Werror,-Wshadow]
    qemu_fdt_setprop_cells(fdt, name, "reg", reg_base, reg_size);
    ^
  include/sysemu/device_tree.h:129:13: note: expanded from macro 
'qemu_fdt_setprop_cells'
        int i;
            ^
  hw/mips/boston.c:461:9: note: previous declaration is here
    int i;
        ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-21-philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 083f450f659c0d34766d80a99878d2a1e5f8f495
      
https://github.com/qemu/qemu/commit/083f450f659c0d34766d80a99878d2a1e5f8f495
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M softmmu/memory.c

  Log Message:
  -----------
  softmmu/memory: Clean up local variable shadowing

Fix:

  softmmu/memory.c: In function ‘mtree_print_mr’:
  softmmu/memory.c:3236:27: warning: declaration of ‘ml’ shadows a previous 
local [-Wshadow=compatible-local]
   3236 |         MemoryRegionList *ml;
        |                           ^~
  softmmu/memory.c:3213:32: note: shadowed declaration is here
   3213 |     MemoryRegionList *new_ml, *ml, *next_ml;
        |                                ^~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-22-philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 6ba9b60a93d4f4df70205cbeb6c547a863f3c170
      
https://github.com/qemu/qemu/commit/6ba9b60a93d4f4df70205cbeb6c547a863f3c170
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M softmmu/physmem.c

  Log Message:
  -----------
  softmmu/physmem: Clean up local variable shadowing

Fix:

  softmmu/physmem.c: In function ‘cpu_physical_memory_snapshot_and_clear_dirty’:
  softmmu/physmem.c:916:27: warning: declaration of ‘offset’ shadows a 
parameter [-Wshadow=compatible-local]
    916 |             unsigned long offset = page % DIRTY_MEMORY_BLOCK_SIZE;
        |                           ^~~~~~
  softmmu/physmem.c:892:31: note: shadowed declaration is here
    892 |     (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client)
        |                        ~~~~~~~^~~~~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904161235.84651-23-philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5e0528a72570e95945eac841b0871f0cbba777b8
      
https://github.com/qemu/qemu/commit/5e0528a72570e95945eac841b0871f0cbba777b8
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/core/machine.c

  Log Message:
  -----------
  hw/core/machine: Clean up local variable shadowing

Fix:

  hw/core/machine.c: In function ‘machine_initfn’:
  hw/core/machine.c:1081:17: warning: declaration of ‘obj’ shadows a parameter 
[-Wshadow=compatible-local]
   1081 |         Object *obj = OBJECT(ms);
        |                 ^~~
  hw/core/machine.c:1065:36: note: shadowed declaration is here
   1065 | static void machine_initfn(Object *obj)
        |                            ~~~~~~~~^~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904162824.85385-2-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 1cc0c5dd38884a7c54bc806bb0ae182db275faf0
      
https://github.com/qemu/qemu/commit/1cc0c5dd38884a7c54bc806bb0ae182db275faf0
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/intc/openpic.c

  Log Message:
  -----------
  hw/intc/openpic: Clean up local variable shadowing

Fix:

  hw/intc/openpic.c: In function ‘openpic_gbl_write’:
  hw/intc/openpic.c:614:17: warning: declaration of ‘idx’ shadows a previous 
local [-Wshadow=compatible-local]
    614 |             int idx;
        |                 ^~~
  hw/intc/openpic.c:568:9: note: shadowed declaration is here
    568 |     int idx;
        |         ^~~

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230904162824.85385-3-philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 90231ce1a355ce07b71f9b82446a40ac866585de
      
https://github.com/qemu/qemu/commit/90231ce1a355ce07b71f9b82446a40ac866585de
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M include/hw/ppc/fdt.h

  Log Message:
  -----------
  hw/ppc: Clean up local variable shadowing in _FDT helper routine

this fixes numerous warnings of this type :

  In file included from ../hw/ppc/spapr_pci.c:43:
  ../hw/ppc/spapr_pci.c: In function ‘spapr_dt_phb’:
  ../include/hw/ppc/fdt.h:18:13: warning: declaration of ‘ret’ shadows a 
previous local [-Wshadow=compatible-local]
     18 |         int ret = (exp);                                           \
        |             ^~~
  ../hw/ppc/spapr_pci.c:2355:5: note: in expansion of macro ‘_FDT’
   2355 |     _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));
        |     ^~~~
  ../hw/ppc/spapr_pci.c:2311:24: note: shadowed declaration is here
   2311 |     int bus_off, i, j, ret;
        |                        ^~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-2-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 694616d68455eaa14f860e7a2bbe41043e8340d7
      
https://github.com/qemu/qemu/commit/694616d68455eaa14f860e7a2bbe41043e8340d7
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/pnv_psi.c

  Log Message:
  -----------
  pnv/psi: Clean up local variable shadowing

to fix :

  ../hw/ppc/pnv_psi.c: In function ‘pnv_psi_p9_mmio_write’:
  ../hw/ppc/pnv_psi.c:741:24: warning: declaration of ‘addr’ shadows a 
parameter [-Wshadow=compatible-local]
    741 |                 hwaddr addr = val & ~(PSIHB9_ESB_CI_VALID | 
PSIHB10_ESB_CI_64K);
        |                        ^~~~
  ../hw/ppc/pnv_psi.c:702:56: note: shadowed declaration is here
    702 | static void pnv_psi_p9_mmio_write(void *opaque, hwaddr addr,
        |                                                 ~~~~~~~^~~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-3-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: bd87a59f52c85e504323c3dbdacc84e2cefce8d1
      
https://github.com/qemu/qemu/commit/bd87a59f52c85e504323c3dbdacc84e2cefce8d1
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Clean up local variable shadowing in spapr_dt_cpus()

Introduce a helper routine defining one CPU device node to fix this
warning :

  ../hw/ppc/spapr.c: In function ‘spapr_dt_cpus’:
  ../hw/ppc/spapr.c:812:19: warning: declaration of ‘cs’ shadows a previous 
local [-Wshadow=compatible-local]
    812 |         CPUState *cs = rev[i];
        |                   ^~
  ../hw/ppc/spapr.c:786:15: note: shadowed declaration is here
    786 |     CPUState *cs;
        |               ^~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-4-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: c0b648d9e9747f44fc3c4503b3a06741b0d6e4a8
      
https://github.com/qemu/qemu/commit/c0b648d9e9747f44fc3c4503b3a06741b0d6e4a8
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Clean up local variable shadowing in spapr_init_cpus()

Remove extra 'i' variable to fix this warning :

  ../hw/ppc/spapr.c: In function ‘spapr_init_cpus’:
  ../hw/ppc/spapr.c:2668:13: warning: declaration of ‘i’ shadows a previous 
local [-Wshadow=compatible-local]
   2668 |         int i;
        |             ^
  ../hw/ppc/spapr.c:2645:9: note: shadowed declaration is here
   2645 |     int i;
        |         ^

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-5-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 01a78f23cbaf15359a051b45c1df05269d5aa4d5
      
https://github.com/qemu/qemu/commit/01a78f23cbaf15359a051b45c1df05269d5aa4d5
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr.c

  Log Message:
  -----------
  spapr: Clean up local variable shadowing in spapr_get_fw_dev_path()

Rename PCIDevice variable to avoid this warning :

  ../hw/ppc/spapr.c: In function ‘spapr_get_fw_dev_path’:
  ../hw/ppc/spapr.c:3217:20: warning: declaration of ‘pcidev’ shadows a 
previous local [-Wshadow=compatible-local]
   3217 |         PCIDevice *pcidev = CAST(PCIDevice, dev, TYPE_PCI_DEVICE);
        |                    ^~~~~~
  ../hw/ppc/spapr.c:3147:16: note: shadowed declaration is here
   3147 |     PCIDevice *pcidev = CAST(PCIDevice, dev, TYPE_PCI_DEVICE);
        |                ^~~~~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-6-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: bea3d6e745fe34ca51780b623b10675ed1975b58
      
https://github.com/qemu/qemu/commit/bea3d6e745fe34ca51780b623b10675ed1975b58
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr_drc.c

  Log Message:
  -----------
  spapr/drc: Clean up local variable shadowing in rtas_ibm_configure_connector()

Remove extra 'drc_index' variable to avoid this warning :

  ../hw/ppc/spapr_drc.c: In function ‘rtas_ibm_configure_connector’:
  ../hw/ppc/spapr_drc.c:1240:26: warning: declaration of ‘drc_index’ shadows a 
previous local [-Wshadow=compatible-local]
   1240 |                 uint32_t drc_index = spapr_drc_index(drc);
        |                          ^~~~~~~~~
  ../hw/ppc/spapr_drc.c:1155:14: note: shadowed declaration is here
   1155 |     uint32_t drc_index;
        |              ^~~~~~~~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-7-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 15675f2318142f8fbfd17b161604fb4f5e9f420e
      
https://github.com/qemu/qemu/commit/15675f2318142f8fbfd17b161604fb4f5e9f420e
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr_pci.c

  Log Message:
  -----------
  spapr/pci: Clean up local variable shadowing in spapr_phb_realize()

Rename SysBusDevice variable to avoid this warning :

  ../hw/ppc/spapr_pci.c: In function ‘spapr_phb_realize’:
  ../hw/ppc/spapr_pci.c:1872:24: warning: declaration of ‘s’ shadows a previous 
local [-Wshadow=local]
   1872 |         SpaprPhbState *s;
        |                        ^
  ../hw/ppc/spapr_pci.c:1829:19: note: shadowed declaration is here
   1829 |     SysBusDevice *s = SYS_BUS_DEVICE(dev);
        |                   ^

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-8-clg@kaod.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 8cf52ff5c727519791eb897410f31c4ad27300cc
      
https://github.com/qemu/qemu/commit/8cf52ff5c727519791eb897410f31c4ad27300cc
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/ppc/spapr_drc.c

  Log Message:
  -----------
  spapr/drc: Clean up local variable shadowing in prop_get_fdt()

Rename 'name' variable to avoid this warning :

  ../hw/ppc/spapr_drc.c: In function ‘prop_get_fdt’:
  ../hw/ppc/spapr_drc.c:344:21: warning: declaration of ‘name’ shadows a 
parameter [-Wshadow=compatible-local]
    344 |         const char *name = NULL;
        |                     ^~~~
  ../hw/ppc/spapr_drc.c:325:63: note: shadowed declaration is here
    325 | static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
        |                                                   ~~~~~~~~~~~~^~~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230918145850.241074-9-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Harsh Prateek Bora <harshpb@linux.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: d8573092a49b3133530ceee35846a54e600f8a73
      
https://github.com/qemu/qemu/commit/d8573092a49b3133530ceee35846a54e600f8a73
  Author: Alberto Garcia <berto@igalia.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/unit/test-throttle.c

  Log Message:
  -----------
  test-throttle: don't shadow 'index' variable in do_test_accounting()

Fixes build with -Wshadow=local

Signed-off-by: Alberto Garcia <berto@igalia.com>
Message-ID: <20230922105742.81317-1-berto@igalia.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 7b393b71424ba105f2b1c5f2c49f8d8710ad00eb
      
https://github.com/qemu/qemu/commit/7b393b71424ba105f2b1c5f2c49f8d8710ad00eb
  Author: Ani Sinha <anisinha@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/acpi/cpu_hotplug.c
    M hw/i386/acpi-build.c
    M hw/smbios/smbios.c

  Log Message:
  -----------
  hw/acpi: changes towards enabling -Wshadow=local

Code changes in acpi that addresses all compiler complaints coming from enabling
-Wshadow flags. Enabling -Wshadow catches cases of local variables shadowing
other local variables or parameters. These makes the code confusing and/or adds
bugs that are difficult to catch.  See also

    Subject: Help wanted for enabling -Wshadow=local
    Message-Id: <87r0mqlf9x.fsf@pond.sub.org>
    https://lore.kernel.org/qemu-devel/87r0mqlf9x.fsf@pond.sub.org

The code is tested to build with and without the flag turned on.

CC: Markus Armbruster <armbru@redhat.com>
CC: Philippe Mathieu-Daude <philmd@linaro.org>
CC: mst@redhat.com
CC: imammedo@redhat.com
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-ID: <20230922124203.127110-1-anisinha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 33b3b4aded2eb56d505d563e4788e0654a7e9f2b
      
https://github.com/qemu/qemu/commit/33b3b4aded2eb56d505d563e4788e0654a7e9f2b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/intc/arm_gicv3_its.c

  Log Message:
  -----------
  hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd()

Avoid shadowing a local variable in do_process_its_cmd():

../../hw/intc/arm_gicv3_its.c:548:17: warning: declaration of ‘ite’ shadows a 
previous local [-Wshadow=compatible-local]
  548 |         ITEntry ite = {};
      |                 ^~~
../../hw/intc/arm_gicv3_its.c:518:13: note: shadowed declaration is here
  518 |     ITEntry ite;
      |             ^~~

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230922152944.3583438-2-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: b2e7e2048bbe7a82b921d9ca71da9aec1668fcfe
      
https://github.com/qemu/qemu/commit/b2e7e2048bbe7a82b921d9ca71da9aec1668fcfe
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/misc/arm_sysctl.c

  Log Message:
  -----------
  hw/misc/arm_sysctl.c: Avoid shadowing local variable

Avoid shadowing a local variable in arm_sysctl_write():

../../hw/misc/arm_sysctl.c: In function ‘arm_sysctl_write’:
../../hw/misc/arm_sysctl.c:537:26: warning: declaration of ‘val’ shadows a 
parameter [-Wshadow=local]
  537 |                 uint32_t val;
      |                          ^~~
../../hw/misc/arm_sysctl.c:388:39: note: shadowed declaration is here
  388 |                              uint64_t val, unsigned size)
      |                              ~~~~~~~~~^~~

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230922152944.3583438-3-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 9e2135ee93ad84119642787e3fb8264b6d1c7ef5
      
https://github.com/qemu/qemu/commit/9e2135ee93ad84119642787e3fb8264b6d1c7ef5
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/smmuv3.c

  Log Message:
  -----------
  hw/arm/smmuv3.c: Avoid shadowing variable

Avoid shadowing a variable in smmuv3_notify_iova():

../../hw/arm/smmuv3.c: In function ‘smmuv3_notify_iova’:
../../hw/arm/smmuv3.c:1043:23: warning: declaration of ‘event’ shadows a 
previous local [-Wshadow=local]
 1043 |         SMMUEventInfo event = {.inval_ste_allowed = true};
      |                       ^~~~~
../../hw/arm/smmuv3.c:1038:19: note: shadowed declaration is here
 1038 |     IOMMUTLBEvent event;
      |                   ^~~~~

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230922152944.3583438-4-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 84abccdd39d6c011971a2a41e7b64f7084e28da8
      
https://github.com/qemu/qemu/commit/84abccdd39d6c011971a2a41e7b64f7084e28da8
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/smmuv3-internal.h

  Log Message:
  -----------
  hw/arm/smmuv3-internal.h: Don't use locals in statement macros

The STE_CTXPTR() and STE_S2TTB() macros both extract two halves
of an address from fields in the STE and combine them into a
single value to return. The current code for this uses a GCC
statement expression. There are two problems with this:

(1) The type chosen for the variable in the statement expr
is 'unsigned long', which might not be 64 bits

(2) the name chosen for the variable causes -Wshadow warnings
because it's the same as a variable in use at the callsite:

In file included from ../../hw/arm/smmuv3.c:34:
../../hw/arm/smmuv3.c: In function ‘smmu_get_cd’:
../../hw/arm/smmuv3-internal.h:538:23: warning: declaration of ‘addr’ shadows a 
previous local [-Wshadow=compatible-local]
  538 |         unsigned long addr;                                     \
      |                       ^~~~
../../hw/arm/smmuv3.c:339:23: note: in expansion of macro ‘STE_CTXPTR’
  339 |     dma_addr_t addr = STE_CTXPTR(ste);
      |                       ^~~~~~~~~~
../../hw/arm/smmuv3.c:339:16: note: shadowed declaration is here
  339 |     dma_addr_t addr = STE_CTXPTR(ste);
      |                ^~~~

Sidestep both of these problems by just using a single
expression rather than a statement expr.

For CMD_ADDR, we got the type of the variable right but still
run into -Wshadow problems:

In file included from ../../hw/arm/smmuv3.c:34:
../../hw/arm/smmuv3.c: In function ‘smmuv3_range_inval’:
../../hw/arm/smmuv3-internal.h:334:22: warning: declaration of ‘addr’ shadows a 
previous local [-Wshadow=compatible-local]
  334 |             uint64_t addr = high << 32 | (low << 12);         \
      |                      ^~~~
../../hw/arm/smmuv3.c:1104:28: note: in expansion of macro ‘CMD_ADDR’
 1104 |     dma_addr_t end, addr = CMD_ADDR(cmd);
      |                            ^~~~~~~~
../../hw/arm/smmuv3.c:1104:21: note: shadowed declaration is here
 1104 |     dma_addr_t end, addr = CMD_ADDR(cmd);
      |                     ^~~~

so convert it too.

CD_TTB has neither problem, but it is the only other macro in
the file that uses this pattern, so we convert it also for
consistency's sake.

We use extract64() rather than extract32() to avoid having
to explicitly cast the result to uint64_t.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-ID: <20230922152944.3583438-5-peter.maydell@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: ce6c368d96ed88c2c8505c825b771e8632e84a88
      
https://github.com/qemu/qemu/commit/ce6c368d96ed88c2c8505c825b771e8632e84a88
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/i2c/aspeed_i2c.c

  Log Message:
  -----------
  aspeed/i2c: Clean up local variable shadowing

Remove superfluous local 'data' variable and use the one define at the
top of the routine. This fixes :

  ../hw/i2c/aspeed_i2c.c: In function ‘aspeed_i2c_bus_recv’:
  ../hw/i2c/aspeed_i2c.c:315:17: warning: declaration of ‘data’ shadows a 
previous local [-Wshadow=compatible-local]
    315 |         uint8_t data;
        |                 ^~~~
  ../hw/i2c/aspeed_i2c.c:288:13: note: shadowed declaration is here
    288 |     uint8_t data;
        |             ^~~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230922155924.1172019-2-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: e8874c06a7da70a59c7c7ac2cf0c3612cbc82f6d
      
https://github.com/qemu/qemu/commit/e8874c06a7da70a59c7c7ac2cf0c3612cbc82f6d
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/arm/aspeed_ast2600.c

  Log Message:
  -----------
  aspeed: Clean up local variable shadowing

Remove superfluous local 'irq' variables and use the one define at the
top of the routine. This fixes warnings in aspeed_soc_ast2600_realize()
such as :

  ../hw/arm/aspeed_ast2600.c: In function ‘aspeed_soc_ast2600_realize’:
  ../hw/arm/aspeed_ast2600.c:420:18: warning: declaration of ‘irq’ shadows a 
previous local [-Wshadow=compatible-local]
    420 |         qemu_irq irq = aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i);
        |                  ^~~
  ../hw/arm/aspeed_ast2600.c:312:14: note: shadowed declaration is here
    312 |     qemu_irq irq;
        |              ^~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230922155924.1172019-3-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: e407513d285b96594a2710c9b37dff7ce9632f3e
      
https://github.com/qemu/qemu/commit/e407513d285b96594a2710c9b37dff7ce9632f3e
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/misc/aspeed_i3c.c

  Log Message:
  -----------
  aspeed/i3c: Rename variable shadowing a local

to fix warning :

  ../hw/i3c/aspeed_i3c.c: In function ‘aspeed_i3c_realize’:
  ../hw/i3c/aspeed_i3c.c:1959:17: warning: declaration of ‘dev’ shadows a 
parameter [-Wshadow=local]
   1959 |         Object *dev = OBJECT(&s->devices[i]);
        |                 ^~~
  ../hw/i3c/aspeed_i3c.c:1942:45: note: shadowed declaration is here
   1942 | static void aspeed_i3c_realize(DeviceState *dev, Error **errp)
        |                                ~~~~~~~~~~~~~^~~

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230922155924.1172019-4-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 62fcc4e872cf01350e4dd395c60c5c726121417f
      
https://github.com/qemu/qemu/commit/62fcc4e872cf01350e4dd395c60c5c726121417f
  Author: Cédric Le Goater <clg@kaod.org>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/timer/aspeed_timer.c

  Log Message:
  -----------
  aspeed/timer: Clean up local variable shadowing

commit 8137355e850f ("aspeed/timer: Fix behaviour running Linux")
introduced a MAX() expression to calculate the next timer deadline :

    return calculate_time(t, MAX(MAX(t->match[0], t->match[1]), 0));

The second MAX() is not necessary since the compared values are an
unsigned and 0. Simply remove it and fix warning :

  ../hw/timer/aspeed_timer.c: In function ‘calculate_next’:
  ../include/qemu/osdep.h:396:31: warning: declaration of ‘_a’ shadows a 
previous local [-Wshadow=compatible-local]
    396 |         typeof(1 ? (a) : (b)) _a = (a), _b = (b);       \
        |                               ^~
  ../hw/timer/aspeed_timer.c:170:12: note: in expansion of macro ‘MAX’
    170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
        |            ^~~
  ../hw/timer/aspeed_timer.c:170:16: note: in expansion of macro ‘MAX’
    170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
        |                ^~~
  /home/legoater/work/qemu/qemu-aspeed.git/include/qemu/osdep.h:396:31: note: 
shadowed declaration is here
    396 |         typeof(1 ? (a) : (b)) _a = (a), _b = (b);       \
        |                               ^~
  ../hw/timer/aspeed_timer.c:170:12: note: in expansion of macro ‘MAX’
    170 |     next = MAX(MAX(calculate_match(t, 0), calculate_match(t, 1)), 0);
        |            ^~~

Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-ID: <20230922155924.1172019-5-clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: a082739eb390d2aad679b5efa9afc40cfa2a496d
      
https://github.com/qemu/qemu/commit/a082739eb390d2aad679b5efa9afc40cfa2a496d
  Author: Peter Xu <peterx@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/i386/intel_iommu.c

  Log Message:
  -----------
  intel_iommu: Fix shadow local variables on "size"

This patch fixes the warning of shadowed local variable:

../hw/i386/intel_iommu.c: In function ‘vtd_address_space_unmap’:
../hw/i386/intel_iommu.c:3773:18: warning: declaration of ‘size’ shadows a 
previous local [-Wshadow=compatible-local]
 3773 |         uint64_t size = mask + 1;
      |                  ^~~~
../hw/i386/intel_iommu.c:3747:12: note: shadowed declaration is here
 3747 |     hwaddr size, remain;
      |            ^~~~

Cc: Jason Wang <jasowang@redhat.com>
Cc: Eric Auger <eric.auger@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230922160410.138786-1-peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 3cc9fe177f412494f084923149338c51dd232b9b
      
https://github.com/qemu/qemu/commit/3cc9fe177f412494f084923149338c51dd232b9b
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M crypto/tls-cipher-suites.c

  Log Message:
  -----------
  crypto: remove shadowed 'ret' variable

Both instances of 'ret' are used to store a gnutls API return code.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20230922160644.438631-2-berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 0d57919acf27ca343981f69cec33463887e0a716
      
https://github.com/qemu/qemu/commit/0d57919acf27ca343981f69cec33463887e0a716
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M softmmu/qemu-seccomp.c

  Log Message:
  -----------
  seccomp: avoid shadowing of 'action' variable

This is confusing as one 'action' variable is used for storing
a SCMP_ enum value, while the other 'action' variable is used
for storing a SECCOMP_ enum value.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20230922160644.438631-3-berrange@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: e161785c05c8a96962a0ea87a3abefe158d8b035
      
https://github.com/qemu/qemu/commit/e161785c05c8a96962a0ea87a3abefe158d8b035
  Author: Eric Blake <eblake@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M qemu-nbd.c

  Log Message:
  -----------
  qemu-nbd: changes towards enabling -Wshadow=local

Address all compiler complaints from -Wshadow in qemu-nbd.  Several
instances of 'int ret' became shadows when commit 4fbec260 added 'ret'
at a higher scope in main.  More interesting was the 'void *ret'
capturing the result of a pthread; where we were conceptually doing
'(void*)(intptr_t)EXIT_FAILURE != NULL' which just feels wrong (even
though it happens to compile correctly), so it was worth a better
cleanup.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-ID: <20230922205019.2755352-2-eblake@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 010f5557ab1d5d14c3ffc023387289c68b889cc9
      
https://github.com/qemu/qemu/commit/010f5557ab1d5d14c3ffc023387289c68b889cc9
  Author: Alistair Francis <alistair23@gmail.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/riscv/opentitan.c

  Log Message:
  -----------
  hw/riscv: opentitan: Fixup local variables shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Bugs love to hide in such code.
Evidence: "[PATCH v3 1/7] migration/rdma: Fix save_page method to fail
on polling error".

This patch removes the local variable shadowing. Tested by adding:

    --extra-cflags='-Wshadow=local -Wno-error=shadow=local 
-Wno-error=shadow=compatible-local'

To configure

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230925043023.71448-2-alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 29332994d8ebcbfad0748017c5151ed69e119212
      
https://github.com/qemu/qemu/commit/29332994d8ebcbfad0748017c5151ed69e119212
  Author: Alistair Francis <alistair23@gmail.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/riscv/cpu.c

  Log Message:
  -----------
  target/riscv: cpu: Fixup local variables shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Bugs love to hide in such code.
Evidence: "[PATCH v3 1/7] migration/rdma: Fix save_page method to fail
on polling error".

This patch removes the local variable shadowing. Tested by adding:

    --extra-cflags='-Wshadow=local -Wno-error=shadow=local 
-Wno-error=shadow=compatible-local'

To configure

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230925043023.71448-3-alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: f3f65c4022c4af793eecf8be9872510f83f98740
      
https://github.com/qemu/qemu/commit/f3f65c4022c4af793eecf8be9872510f83f98740
  Author: Alistair Francis <alistair23@gmail.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M target/riscv/vector_helper.c

  Log Message:
  -----------
  target/riscv: vector_helper: Fixup local variables shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Bugs love to hide in such code.
Evidence: "[PATCH v3 1/7] migration/rdma: Fix save_page method to fail
on polling error".

This patch removes the local variable shadowing. Tested by adding:

    --extra-cflags='-Wshadow=local -Wno-error=shadow=local 
-Wno-error=shadow=compatible-local'

To configure

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230925043023.71448-4-alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 5567fa825ab9bdc4688308bea7816e2f969b65c3
      
https://github.com/qemu/qemu/commit/5567fa825ab9bdc4688308bea7816e2f969b65c3
  Author: Alistair Francis <alistair23@gmail.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M softmmu/device_tree.c

  Log Message:
  -----------
  softmmu/device_tree: Fixup local variables shadowing

Local variables shadowing other local variables or parameters make the
code needlessly hard to understand.  Bugs love to hide in such code.
Evidence: "[PATCH v3 1/7] migration/rdma: Fix save_page method to fail
on polling error".

This patch removes the local variable shadowing. Tested by adding:

    --extra-cflags='-Wshadow=local -Wno-error=shadow=local 
-Wno-error=shadow=compatible-local'

To configure

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20230925043023.71448-5-alistair.francis@wdc.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: f193d0bde70e1be004cc4aba5aaf3ac9c459d156
      
https://github.com/qemu/qemu/commit/f193d0bde70e1be004cc4aba5aaf3ac9c459d156
  Author: Klaus Jensen <k.jensen@samsung.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M hw/nvme/ns.c

  Log Message:
  -----------
  hw/nvme: Clean up local variable shadowing in nvme_ns_init()

Fix local variable shadowing in nvme_ns_init().

Reported-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Message-ID: <20230925-fix-local-shadowing-v1-1-3a1172132377@samsung.com>
Reviewed-by: Jesper Wendel Devantier <j.devantier@samsung.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 4dba9141f97e66fdd920df37c4aa7b2ffe0d6a4a
      
https://github.com/qemu/qemu/commit/4dba9141f97e66fdd920df37c4aa7b2ffe0d6a4a
  Author: Laurent Vivier <laurent@vivier.eu>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M disas/m68k.c

  Log Message:
  -----------
  disas/m68k: clean up local variable shadowing

Fix following warnings

.../disas/m68k.c: In function ‘print_insn_arg’:
.../disas/m68k.c:1635:13: warning: declaration of ‘val’ shadows a previous 
local [-Wshadow=compatible-local]
 1635 |         int val = fetch_arg (buffer, place, 5, info);
      |             ^~~
.../disas/m68k.c:1093:7: note: shadowed declaration is here
 1093 |   int val = 0;
      |       ^~~

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20230925084455.395150-1-laurent@vivier.eu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 71d3612401b614bc64a00fafa8dd930a5672b782
      
https://github.com/qemu/qemu/commit/71d3612401b614bc64a00fafa8dd930a5672b782
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: Create kvm_opts

So arch_dirty_ring option becomes one option like the others.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-8-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 877cec63d77058c27230b33643508dfeb84d8021
      
https://github.com/qemu/qemu/commit/877cec63d77058c27230b33643508dfeb84d8021
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: bootpath is the same for all tests and for all archs

So just make it a global variable.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-9-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 0c690d3e2a3eb73a6c27afb66ec87534c1259bae
      
https://github.com/qemu/qemu/commit/0c690d3e2a3eb73a6c27afb66ec87534c1259bae
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: Add bootfile_create/delete() functions

The bootsector code is read only from the guest (otherwise we are
going to have problems with it being read from both source and
destination).

Create a single copy for all the tests.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-10-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 22d3c6e16c69ea581eef6f7ff8ebb2e63107d3f5
      
https://github.com/qemu/qemu/commit/22d3c6e16c69ea581eef6f7ff8ebb2e63107d3f5
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: dirtylimit checks for x86_64 arch before

So no need to assert we are in x86_64.
Once there, refactor the function to remove useless variables.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-11-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 0368ace8f9eb24c5959466db352e4c4afc734954
      
https://github.com/qemu/qemu/commit/0368ace8f9eb24c5959466db352e4c4afc734954
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: simplify shmem_opts handling

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-4-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: f4e1b613362e51e205081a60b94f157c16acdca3
      
https://github.com/qemu/qemu/commit/f4e1b613362e51e205081a60b94f157c16acdca3
  Author: Tejus GK <tejus.gk@nutanix.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Refactor repeated call of yank_unregister_instance

In the function qmp_migrate(), yank_unregister_instance() gets called
twice which isn't required. Hence, refactoring it so that it gets called
during the local_error cleanup.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Acked-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Tejus GK <tejus.gk@nutanix.com>
Message-ID: <20230621130940.178659-3-tejus.gk@nutanix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: f16ecfa9f9c147168630422a6f4a4c0eddfbe574
      
https://github.com/qemu/qemu/commit/f16ecfa9f9c147168630422a6f4a4c0eddfbe574
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/block.c

  Log Message:
  -----------
  migration: Use qemu_file_transferred_noflush() for block migration.

We only care about the amount of bytes transferred.  Flushing is done
by the system somewhere else.

Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230530183941.7223-4-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 67c31c9c1af1bb8f7df8275cc8731629e2690f89
      
https://github.com/qemu/qemu/commit/67c31c9c1af1bb8f7df8275cc8731629e2690f89
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/migration-stats.c
    M migration/migration-stats.h
    M migration/rdma.c
    M migration/trace-events

  Log Message:
  -----------
  migration: Don't abuse qemu_file transferred for RDMA

Just create a variable for it, the same way that multifd does.  This
way it is safe to use for other thread, etc, etc.

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-11-quintela@redhat.com>


  Commit: 19df4f3226c0f3e80291a40aec3c9c459dadfdf4
      
https://github.com/qemu/qemu/commit/19df4f3226c0f3e80291a40aec3c9c459dadfdf4
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration/RDMA: It is accounting for zero/normal pages in two places

Remove the one in control_save_page().

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-12-quintela@redhat.com>


  Commit: e33780351ceb8317dccec143e722ae8434d58c34
      
https://github.com/qemu/qemu/commit/e33780351ceb8317dccec143e722ae8434d58c34
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: Remove QEMUFile parameter when not used

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-13-quintela@redhat.com>


  Commit: 2ebe5d4d5aa4d11f02a2d52fa398a52a6a0dc2ee
      
https://github.com/qemu/qemu/commit/2ebe5d4d5aa4d11f02a2d52fa398a52a6a0dc2ee
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/ram.c

  Log Message:
  -----------
  migration/rdma: Don't use imaginary transfers

RDMA protocol is completely asynchronous, so in qemu_rdma_save_page()
they "invent" that a byte has been transferred.  And then they call
qemu_file_credit_transfer() and ram_transferred_add() with that byte.
Just remove that calls as nothing has been sent.

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-14-quintela@redhat.com>


  Commit: 9f51fe92392f601a177687bef01a545298cb47e1
      
https://github.com/qemu/qemu/commit/9f51fe92392f601a177687bef01a545298cb47e1
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h

  Log Message:
  -----------
  migration: Remove unused qemu_file_credit_transfer()

After this change, nothing abuses QEMUFile to account for data
transferrefd during migration.

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-15-quintela@redhat.com>


  Commit: 9c53d369e5903375a2e3358f739be77dcb8dae49
      
https://github.com/qemu/qemu/commit/9c53d369e5903375a2e3358f739be77dcb8dae49
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-09-29 (Fri, 29 Sep 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/ram.c
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: Simplify the function that saves a page

When we sent a page through QEMUFile hooks (RDMA) there are three
posiblities:
- We are not using RDMA. return RAM_SAVE_CONTROL_DELAYED and
  control_save_page() returns false to let anything else to proceed.
- There is one error but we are using RDMA.  Then we return a negative
  value, control_save_page() needs to return true.
- Everything goes well and RDMA start the sent of the page
  asynchronously.  It returns RAM_SAVE_CONTROL_DELAYED and we need to
  return 1 for ram_save_page_legacy.

Clear?

I know, I know, the interface is as bad as it gets.  I think that now
it is a bit clearer, but this needs to be done some other way.

Reviewed-by: Leonardo Bras <leobras@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230515195709.63843-16-quintela@redhat.com>


  Commit: 5436f1b1c36bca586a29908eff4d570e20037f6e
      
https://github.com/qemu/qemu/commit/5436f1b1c36bca586a29908eff4d570e20037f6e
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M MAINTAINERS
    M scripts/analyse-locks-simpletrace.py
    M scripts/simpletrace.py

  Log Message:
  -----------
  Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into 
staging

Pull request

- Mads Ynddal's improvements to simpletrace.py

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmUVgyAACgkQnKSrs4Gr
# c8jxkAf/TVtEZTPDvQMz7PNEsAdGLREwYKrsUXHtqOrINbVL1slrJ1qYmygeJltq
# 37CAcxBzvnaH7y2jF8JPKWK3sO3x1fc2ocA72BZt3kuim5T7MojJgFfAN/PdwRHf
# q1a+lYJHKOi0BV4yWPmPHnCSXOohHbJfRBxwZgwFEZMbWdlkAm6m+JFUqn+Vd5ee
# 4vEBxrNMY28H02OeoFNBQPCLRHrkeH4EVj+DP5TAk1H1ehoZeH45UoUsopEfD51z
# IyiXxzumtgpCMyC/jXS5BY6VStW7lDLoDscflMQ/l7ITEtm7Hj2fnPcp/aRKoEUk
# p1JuoSm8YrwnwMokFsQCbkYWkBWieQ==
# =rrnI
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 28 Sep 2023 09:44:00 EDT
# gpg:                using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [ultimate]
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>" [ultimate]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu:
  scripts/analyse-locks-simpletrace.py: changed iteritems() to items()
  MAINTAINERS: add maintainer of simpletrace.py
  simpletrace: added simplified Analyzer2 class
  simpletrace: move event processing to Analyzer class
  simpletrace: move logic of process into internal function
  simpletrace: refactor to separate responsibilities
  simpletrace: made Analyzer into context-manager
  simpletrace: define exception and add handling
  simpletrace: improved error handling on struct unpack
  simpletrace: update code for Python 3.11
  simpletrace: changed naming of edict and idtoname to improve readability
  simpletrace: improve parsing of sys.argv; fix files never closed.
  simpletrace: annotate magic constants from QEMU code
  simpletrace: add __all__ to define public interface

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 5b0d1a839513e2aa87965cb6736c8ec355742d5e
      
https://github.com/qemu/qemu/commit/5b0d1a839513e2aa87965cb6736c8ec355742d5e
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M accel/tcg/cpu-exec.c
    M accel/tcg/tb-maint.c
    M accel/tcg/translator.c
    M include/exec/translator.h
    M target/mips/tcg/translate.c

  Log Message:
  -----------
  Merge tag 'pull-tcg-20230928' of https://gitlab.com/rth7680/qemu into staging

accel/tcg: Always require can_do_io, for #1866

# -----BEGIN PGP SIGNATURE-----
#
# iQFRBAABCgA7FiEEekgeeIaLTbaoWgXAZN846K9+IV8FAmUV1sgdHHJpY2hhcmQu
# aGVuZGVyc29uQGxpbmFyby5vcmcACgkQZN846K9+IV/8UAgAjFSrUvW5cGTiaow7
# cTvvoFnQzVCM7gFbC2T9W29Hrv0s3tqJHSdUFftzzMXB1atylwb85XN5wegC98zk
# 7+OzrUvTN2fRHVTnWdUg2Tgj+pR/Sw+9HVy851c3B/e3oFegqAIQaNK5w9N3ZpWd
# gpGN8Lau6dEdte8ckMTzG0Sw4LryZyvcgz9+vDv+YX03JaiSMqziHoJGwHfjqr9Q
# FOI1f4gQw+Y2ct6Xop1vVILH2I26US40Y2DvEMEDuZpTkTN0L2V8ipz+tWgGuCMa
# 7HRySJAw5HiDdtAV9/H5dfGJVgjsgwuWoYm+viJtJKJ+X350a5YI77hkbglPxQu+
# Q+dCVA==
# =lQYd
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 28 Sep 2023 15:40:56 EDT
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" 
[full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* tag 'pull-tcg-20230928' of https://gitlab.com/rth7680/qemu:
  accel/tcg: Always require can_do_io
  accel/tcg: Always set CF_LAST_IO with CF_NOIRQ
  accel/tcg: Improve setting of can_do_io at start of TB
  accel/tcg: Track current value of can_do_io in the TB
  accel/tcg: Hoist CF_MEMI_ONLY check outside translation loop
  accel/tcg: Avoid load of icount_decr if unused

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: a3108b2d92eda76b4dbe0c95051899628e28f6ac
      
https://github.com/qemu/qemu/commit/a3108b2d92eda76b4dbe0c95051899628e28f6ac
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M hw/tricore/tricore_testdevice.c
    M target/tricore/cpu.h
    M target/tricore/fpu_helper.c
    M target/tricore/helper.c
    M target/tricore/helper.h
    M target/tricore/op_helper.c
    M target/tricore/translate.c
    M target/tricore/tricore-opcodes.h
    M tests/tcg/tricore/Makefile.softmmu-target
    M tests/tcg/tricore/asm/macros.h
    A tests/tcg/tricore/asm/test_crcn.S
    A tests/tcg/tricore/asm/test_ftohp.S
    A tests/tcg/tricore/asm/test_ftou.S
    A tests/tcg/tricore/asm/test_hptof.S
    M tests/tcg/tricore/asm/test_insert.S

  Log Message:
  -----------
  Merge tag 'pull-tricore-20230929' of https://github.com/bkoppelmann/qemu into 
staging

- Add FTOU, CRCN, FTOHP, and HPTOF insns

# -----BEGIN PGP SIGNATURE-----
#
# iQJTBAABCgA9FiEEbmNqfoPy3Qz6bm43CtLGOWtpyhQFAmUWb2sfHGtiYXN0aWFu
# QG1haWwudW5pLXBhZGVyYm9ybi5kZQAKCRAK0sY5a2nKFPn0D/0S+Zth2okyfe6H
# YdoFB49PWlcafIvZHr1TDswp3LvSDnrjHLJfEW1Gx3mtDkw+/7uid0eMTQ8sDlxJ
# t7spJdZDZ5dkm+9K5MzGkW0zo0jDY6kbS1A3HJRPcpJJJk4zBBL1K4KC1FBUD6IK
# 7n41f5vExgWhIhOgZmT9WTMbBfh73/+Cu8h6M9RAI1VI0O6N5jOETpKTBFsPOx+A
# Kd429cB1c9QeAj0iEXdMn2/Xg2cAII86jrOcYkLYltxir/r6Cia9hfp/F6OXpcZI
# QqKzn11djvbCCL7m9OXhuI3ZP+TIcX7QOabSstfghHlNG1qs/RkXwIRqKHsfRXNG
# nywBTjwIDSiZ4cbZVJ6OjXxbU9OBRkmDgh+SYEVMlFi4E+t3WeTMC8gxUsjfITpK
# JXFoduN2P0yKRjkWQ2OSQ7xX4StFPikXBH1eC8RNnW4IY00wMiJ0tM/0+j+qJLLM
# Ft/bceIZhnGs+axN0jF1EtR03uLZ0kmy3YqsH/KnBnufrag3ytpC/kAtl9Scd6m+
# N4pAT9cfgxqXv/yXAKGupoNPwPGvvSKV6XQTJt2Hn7PBadHWlvlBkgYqGIejpHDM
# x9EghA8o4q5rTu9zTqBv36bOHJEDbJhmq5dYqJTS/q1ORjnWQQsLxv+6XGN3wrbb
# OuexPdD8fH3mWrjeJJ3KDKojOYyGyg==
# =gUyL
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 29 Sep 2023 02:32:11 EDT
# gpg:                using RSA key 6E636A7E83F2DD0CFA6E6E370AD2C6396B69CA14
# gpg:                issuer "kbastian@mail.uni-paderborn.de"
# gpg: Good signature from "Bastian Koppelmann 
<kbastian@mail.uni-paderborn.de>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6E63 6A7E 83F2 DD0C FA6E  6E37 0AD2 C639 6B69 CA14

* tag 'pull-tricore-20230929' of https://github.com/bkoppelmann/qemu:
  target/tricore: Change effective address (ea) to target_ulong
  target/tricore: Remove CSFRs from cpu.h
  tests/tcg: Reset result register after each test
  hw/tricore: Log failing test in testdevice
  tests/tcg/tricore: Extended and non-extened regs now match
  target/tricore: Fix FTOUZ being ISA v1.3.1 up
  target/tricore: Replace cpu_*_code with translator_*
  target/tricore: Swap src and dst reg for RCRR_INSERT
  target/tricore: Fix RCPW/RRPW_INSERT insns for width = 0
  target/tricore: Implement hptof insn
  target/tricore: Implement ftohp insn
  target/tricore: Clarify special case for FTOUZ insn
  target/tricore: Implement FTOU insn
  target/tricore: Correctly handle FPU RM from PSW
  target/tricore: Implement CRCN insn
  tests/tcg/tricore: Bump cpu to tc37x

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 5d7e601df37d8bdd490472fd4cfe3e4ca258df09
      
https://github.com/qemu/qemu/commit/5d7e601df37d8bdd490472fd4cfe3e4ca258df09
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M accel/tcg/tb-maint.c
    M block.c
    M block/monitor/bitmap-qmp-cmds.c
    M block/qcow2-bitmap.c
    M block/rbd.c
    M block/stream.c
    M block/vdi.c
    M block/vvfat.c
    M crypto/cipher-gnutls.c.inc
    M crypto/tls-cipher-suites.c
    M disas/m68k.c
    M hw/acpi/cpu_hotplug.c
    M hw/arm/allwinner-r40.c
    M hw/arm/armsse.c
    M hw/arm/armv7m.c
    M hw/arm/aspeed_ast2600.c
    M hw/arm/smmuv3-internal.h
    M hw/arm/smmuv3.c
    M hw/arm/virt.c
    M hw/block/xen-block.c
    M hw/core/machine.c
    M hw/i2c/aspeed_i2c.c
    M hw/i386/acpi-build.c
    M hw/i386/intel_iommu.c
    M hw/intc/arm_gicv3_its.c
    M hw/intc/openpic.c
    M hw/m68k/bootinfo.h
    M hw/microblaze/petalogix_ml605_mmu.c
    M hw/misc/arm_sysctl.c
    M hw/misc/aspeed_i3c.c
    M hw/nios2/10m50_devboard.c
    M hw/nvme/ns.c
    M hw/ppc/pnv_psi.c
    M hw/ppc/spapr.c
    M hw/ppc/spapr_drc.c
    M hw/ppc/spapr_pci.c
    M hw/riscv/opentitan.c
    M hw/smbios/smbios.c
    M hw/timer/aspeed_timer.c
    M include/hw/ppc/fdt.h
    M include/qapi/qmp/qobject.h
    M include/qemu/atomic.h
    M include/qemu/compiler.h
    M include/qemu/osdep.h
    M include/sysemu/device_tree.h
    M linux-user/strace.c
    M migration/block.c
    M migration/ram.c
    M migration/rdma.c
    M migration/vmstate.c
    M net/eth.c
    M qemu-nbd.c
    M softmmu/device_tree.c
    M softmmu/memory.c
    M softmmu/physmem.c
    M softmmu/qemu-seccomp.c
    M target/arm/hvf/hvf.c
    M target/arm/tcg/mve_helper.c
    M target/arm/tcg/translate-m-nocp.c
    M target/m68k/translate.c
    M target/mips/tcg/msa_helper.c
    M target/mips/tcg/nanomips_translate.c.inc
    M target/mips/tcg/translate.c
    M target/riscv/cpu.c
    M target/riscv/vector_helper.c
    M target/tricore/translate.c
    M tcg/tcg.c
    M tests/unit/test-throttle.c
    M ui/gtk.c
    M ui/spice-display.c
    M ui/vnc-enc-zrle.c.inc
    M ui/vnc-palette.c
    M ui/vnc.c
    M util/vhost-user-server.c

  Log Message:
  -----------
  Merge tag 'pull-shadow-2023-09-29' of https://repo.or.cz/qemu/armbru into 
staging

-Wshadow=local patches patches for 2023-09-29

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmUWhnsSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTDBkP/2E8cyH+fn7yehNAZT8fjBuDBaj0x3wf
# Bs4++bMEZpgfA/11le/Mm+N9BFDtoGj4dnDwQ0yN6bcKcfmNvxh+M+lNaRO+xvXA
# qs/kJtFYkJYuEj1wgKK2XXd4YcD/S4Qap+FSuUBv8KE/oeALkB1fEpvMcwtJtQqc
# 7POQEqYNQfUe+MX/wKZ+qditbbrFRwX69dAd8+nGTbFestXd2uFA5I5kv3ebxELg
# VjTBgQdp7s82iTvoXpTtmQ6A9ba13zmelxmsAMLlAihkbffMwbtbrkQ7qIIUOW1o
# I4WPxhIXXyZbB48qARUq5G3GQuh+7dRArcpYWaFel2a6cjm2Z6NmWJeRAr0cIaWV
# P5B79k7DO551YsBZn+ubH0U+qwMLw+zq2apQ+SeH/loE0pP/c2OBOPtaVI46D0Dh
# 2kgaSuTIy9AByAHoYBxKnxy4TVwPKzk8hdzCQdiRSO7KJdMqMsV+/w1eR4oH9dsf
# CAvJXVzLicFMMABA/4O99K+1yjIOQpwmiqAjc+gV6FdhwllSH3yQDiK4RMWNAwRu
# bRQHBCk143t7cM3ts09T+5QxkWB3U0iGMJ4rpn43yjH5xwlWmpTlztvd7XlXwyTR
# 8j2Z+8qxe992HmVk34rKdkGnu0qz4AhJBgAEEk2e0oepZvjfigqodQwEMCQsse5t
# cH51HzTDuen/
# =XVKC
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 29 Sep 2023 04:10:35 EDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-shadow-2023-09-29' of https://repo.or.cz/qemu/armbru: (56 commits)
  disas/m68k: clean up local variable shadowing
  hw/nvme: Clean up local variable shadowing in nvme_ns_init()
  softmmu/device_tree: Fixup local variables shadowing
  target/riscv: vector_helper: Fixup local variables shadowing
  target/riscv: cpu: Fixup local variables shadowing
  hw/riscv: opentitan: Fixup local variables shadowing
  qemu-nbd: changes towards enabling -Wshadow=local
  seccomp: avoid shadowing of 'action' variable
  crypto: remove shadowed 'ret' variable
  intel_iommu: Fix shadow local variables on "size"
  aspeed/timer: Clean up local variable shadowing
  aspeed/i3c: Rename variable shadowing a local
  aspeed: Clean up local variable shadowing
  aspeed/i2c: Clean up local variable shadowing
  hw/arm/smmuv3-internal.h: Don't use locals in statement macros
  hw/arm/smmuv3.c: Avoid shadowing variable
  hw/misc/arm_sysctl.c: Avoid shadowing local variable
  hw/intc/arm_gicv3_its: Avoid shadowing variable in do_process_its_cmd()
  hw/acpi: changes towards enabling -Wshadow=local
  test-throttle: don't shadow 'index' variable in do_test_accounting()
  ...

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


  Commit: 50d0bfd0ed78209f003e8f7b9ac25edaa0399157
      
https://github.com/qemu/qemu/commit/50d0bfd0ed78209f003e8f7b9ac25edaa0399157
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2023-10-02 (Mon, 02 Oct 2023)

  Changed paths:
    M migration/block.c
    M migration/migration-stats.c
    M migration/migration-stats.h
    M migration/migration.c
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/ram.c
    M migration/rdma.c
    M migration/trace-events
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge tag 'migration-20231002-pull-request' of 
https://gitlab.com/juan.quintela/qemu into staging

Migration Pull request (20231002)

In this migration pull request:

- Refactor repeated call of yank_unregister_instance (tejus)
- More migraton-test changes

Please, apply.

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmUatX4ACgkQ9IfvGFhy
# 1yMlbQ/+Kp7m1Mr5LUM/8mvh9LZTVvWauBHch1pdvpCsJO+Grdtv6MtZL5UKT2ue
# xYksZvf/rT4bdt2H1lSsG1o2GOcIf4qyWICgYNDo8peaxm1IrvgAbimaWHWLeORX
# sBxKcBBuTac55vmEKzbPSbwGCGGTU/11UGXQ4ruGN3Hwbd2JZHAK6GxGIzANToZc
# JtwBr/31SxJ2YndNLaPMEnD3cHbRbD2UyODeTt1KI5LdTGgXHoB6PgCk2AMQP1Ko
# LlaPLsrEKC06h2CJ27BB36CNVEGMN2iFa3aKz1FC85Oj2ckatspAFw78t9guj6eM
# MYxn0ipSsjjWjMsc3zEDxi7JrA///5bp1e6e7WdLpOaMBPpV4xuvVvA6Aku2es7D
# fMPOMdftBp6rrXp8edBMTs1sOHdE1k8ZsyJ90m96ckjfLX39TPAiJRm4pWD2UuP5
# Wjr+/IU+LEp/KCqimMj0kYMRz4rM3PP8hOakPZLiRR5ZG6sgbHZK44iPXB/Udz/g
# TCZ87siIpI8YHb3WCaO5CvbdjPrszg1j9v7RimtDeGLDR/hNokkQ1EEeszDTGpgt
# xst4S4wVmex2jYyi53woH4V1p8anP7iqa8elPehAaYPobp47pmBV53ZaSwibqzPN
# TmO7P9rfyQGCiXXZRvrAQJa+gmAkQlSEI7mSssV77pU+1gdEj9c=
# =hD/8
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 02 Oct 2023 08:20:14 EDT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* tag 'migration-20231002-pull-request' of 
https://gitlab.com/juan.quintela/qemu:
  migration/rdma: Simplify the function that saves a page
  migration: Remove unused qemu_file_credit_transfer()
  migration/rdma: Don't use imaginary transfers
  migration/rdma: Remove QEMUFile parameter when not used
  migration/RDMA: It is accounting for zero/normal pages in two places
  migration: Don't abuse qemu_file transferred for RDMA
  migration: Use qemu_file_transferred_noflush() for block migration.
  migration: Refactor repeated call of yank_unregister_instance
  migration-test: simplify shmem_opts handling
  migration-test: dirtylimit checks for x86_64 arch before
  migration-test: Add bootfile_create/delete() functions
  migration-test: bootpath is the same for all tests and for all archs
  migration-test: Create kvm_opts

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>


Compare: https://github.com/qemu/qemu/compare/36e9aab3c569...50d0bfd0ed78



reply via email to

[Prev in Thread] Current Thread [Next in Thread]