[Qemu-commits] [qemu/qemu] 5e4b6b: hw/mips/fuloong2e: Convert pointless error message...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5e4b6bb1e8afb4cc2fcaaa6f3e57a6ec5184953f
      
https://github.com/qemu/qemu/commit/5e4b6bb1e8afb4cc2fcaaa6f3e57a6ec5184953f
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M hw/mips/fuloong2e.c

  Log Message:
  -----------
  hw/mips/fuloong2e: Convert pointless error message to an assert()

Displaying "vt82c686b_init error" doesn't give any hint about why
this call failed. As this message targets developers and not users,
replace the pointless error message by a call to assert() which
will provide more useful information.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Huacai Chen <chenhc@lemote.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200901104043.91383-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 0c66619835a8f5a2884e783500944924d9f52bc8
      
https://github.com/qemu/qemu/commit/0c66619835a8f5a2884e783500944924d9f52bc8
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M hw/isa/isa-bus.c

  Log Message:
  -----------
  hw/isa/isa-bus: Replace hw_error() by assert()

As we can never have more than ISA_NUM_IRQS (16) ISA IRQs,
replace the not very interesting hw_error() call by an
assert() which is more useful to debug condition that can
not happen.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200901104043.91383-6-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8ff362df0fdc18a8edca7992ecb056bcf2cc8374
      
https://github.com/qemu/qemu/commit/8ff362df0fdc18a8edca7992ecb056bcf2cc8374
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M hw/acpi/tco.c

  Log Message:
  -----------
  hw/acpi/tco: Remove unused definitions

TCO_DEBUG() and DEBUG definitions are not used, remove them.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200901101951.85892-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: dfd4981a6867890f1ed60ca0eac1cf97d6ec23dc
      
https://github.com/qemu/qemu/commit/dfd4981a6867890f1ed60ca0eac1cf97d6ec23dc
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M hw/gpio/omap_gpio.c

  Log Message:
  -----------
  hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)

Replace fprintf() by qemu_log_mask(LOG_GUEST_ERROR).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200901104234.92159-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 1c3bd33a5e8beab591dd2d33b1e958496ea0464e
      
https://github.com/qemu/qemu/commit/1c3bd33a5e8beab591dd2d33b1e958496ea0464e
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-09 (Wed, 09 Sep 2020)

  Changed paths:
    M hw/gpio/max7310.c

  Log Message:
  -----------
  hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)

Replace disabled printf() by qemu_log_mask(UNIMP).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200901104234.92159-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8dc746b2ae247a20ad4672704d24872f15fcb24f
      
https://github.com/qemu/qemu/commit/8dc746b2ae247a20ad4672704d24872f15fcb24f
  Author: Greg Kurz <groug@kaod.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: Drop extra phony cscope

Commit d79864058a64 added a dedicated phony line for cscope.

Fixes: d79864058a64 ("Makefile: Add back TAGS/ctags/cscope rules")
Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <159916246865.691541.16619858522304817323.stgit@bahia.lan>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: c857f9050cff9eb02ff05e901152dc1570f798bd
      
https://github.com/qemu/qemu/commit/c857f9050cff9eb02ff05e901152dc1570f798bd
  Author: Greg Kurz <groug@kaod.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: Skip the meson subdir in cscope/TAGS/ctags

If the meson submodule is present, we don't really want to index its
source code. Consolidate the find command in a single place and use
it for cscope, ctags and etags. Note that this now causes ctags and
etags to also index assembly files, but this is okay since they both
have been supporting assembly since 2001 at least.

Signed-off-by: Greg Kurz <groug@kaod.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <159916247553.691541.10480293747685886851.stgit@bahia.lan>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 4a4a604cc60cb94525fc4c2d1230557c1e7d166d
      
https://github.com/qemu/qemu/commit/4a4a604cc60cb94525fc4c2d1230557c1e7d166d
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M hw/net/e1000e_core.c

  Log Message:
  -----------
  hw/net/e1000e: Remove overwritten read handler for STATUS register

The STATUS register readop handler is initialized first with
the generic e1000e_mac_readreg() handler:

  2861 #define e1000e_getreg(x)    [x] = e1000e_mac_readreg
  2862 typedef uint32_t (*readops)(E1000ECore *, int);
  2863 static const readops e1000e_macreg_readops[] = {
  ....
  2919     e1000e_getreg(STATUS),

Then overwritten with the specific e1000e_get_status handler:

  3018     [STATUS]  = e1000e_get_status,

To avoid confusion, remove the overwritten initialization.

6f3fbe4ed0 ("net: Introduce e1000e device emulation")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200904131402.590055-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: fb1953b22a871d5b4f049d1f2fbf2ff00b4a0c50
      
https://github.com/qemu/qemu/commit/fb1953b22a871d5b4f049d1f2fbf2ff00b4a0c50
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M hw/net/e1000e_core.c

  Log Message:
  -----------
  hw/net/e1000e: Remove duplicated write handler for FLSWDATA register

The FLSWDATA register writeop handler is initialized twice:

  3067 #define e1000e_putreg(x)    [x] = e1000e_mac_writereg
  3068 typedef void (*writeops)(E1000ECore *, int, uint32_t);
  3069 static const writeops e1000e_macreg_writeops[] = {
  ....
  3102     e1000e_putreg(FLSWDATA),
  ....
  3145     e1000e_putreg(FLSWDATA),

To avoid confusion, remove the duplicated initialization.

Fixes: 6f3fbe4ed0 ("net: Introduce e1000e device emulation")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200904131402.590055-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: a8dc2aceabb58e23286f4d84c955832e8a21d1f5
      
https://github.com/qemu/qemu/commit/a8dc2aceabb58e23286f4d84c955832e8a21d1f5
  Author: Sergei Trofimovich <slyfox@gentoo.org>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: tweak sdl-image error message

Before the change missing SDL was reported as:

    ../meson.build:253:4: ERROR: Expected 1 arguments, got 2.

After the error as:

    ../meson.build:258:4: ERROR: Problem encountered: sdl-image required, but 
SDL was not found

CC: Paolo Bonzini <pbonzini@redhat.com>
CC: "Marc-André Lureau" <marcandre.lureau@redhat.com>
CC: "Philippe Mathieu-Daudé" <philmd@redhat.com>
CC: Rafael Kitover <rkitover@gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908074016.2593596-1-slyfox@gentoo.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 231073f7fb09452af40a7a708ad689a70120c75b
      
https://github.com/qemu/qemu/commit/231073f7fb09452af40a7a708ad689a70120c75b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M Kconfig.host

  Log Message:
  -----------
  kconfig: fix comment referring to old Makefiles

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200908094244.26327-1-pbonzini@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8b39aa90e90e9c04d07b0fbb583195237f3f11fe
      
https://github.com/qemu/qemu/commit/8b39aa90e90e9c04d07b0fbb583195237f3f11fe
  Author: Jon Doron <arilou@gmail.com>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M hw/hyperv/vmbus.c

  Log Message:
  -----------
  hw: hyperv: vmbus: Fix 32bit compilation

Fix 32-bit build error for vmbus:

  hw/hyperv/vmbus.c: In function ‘gpadl_iter_io’:
  hw/hyperv/vmbus.c:383:13: error: cast to pointer from integer of different 
size [-Werror=int-to-pointer-cast]
  383 |         p = (void *)(((uintptr_t)iter->map & TARGET_PAGE_MASK) | 
off_in_page);
      |             ^
  cc1: all warnings being treated as errors

Fixes: 0d71f7082d7 ("vmbus: vmbus implementation")
Signed-off-by: Jon Doron <arilou@gmail.com>
Tested-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20200715084326.678715-3-arilou@gmail.com>
[lv: updated with commit description from 
<20200906050113.2783642-1-richard.henderson@linaro.org>]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 712f1974360027c7addf8366b48476b7bf684997
      
https://github.com/qemu/qemu/commit/712f1974360027c7addf8366b48476b7bf684997
  Author: Pan Nengyuan <pannengyuan@huawei.com>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M tests/test-vmstate.c

  Log Message:
  -----------
  test-vmstate: remove unnecessary code in match_interval_mapping_node

'str' is not used in match_interval_mapping_node(), remove it.

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200910023818.11880-1-pannengyuan@huawei.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: b199c682f1f0aaee22b2170a5fb885250057eec2
      
https://github.com/qemu/qemu/commit/b199c682f1f0aaee22b2170a5fb885250057eec2
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-09-10 (Thu, 10 Sep 2020)

  Changed paths:
    M target/i386/kvm.c

  Log Message:
  -----------
  target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()

In order to use inclusive terminology, rename host_tsx_blacklisted()
as host_tsx_broken().

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200910070131.435543-7-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 5ace4cc0e8d818d578b3777a23d477a5e42070eb
      
https://github.com/qemu/qemu/commit/5ace4cc0e8d818d578b3777a23d477a5e42070eb
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:
    M hw/arm/pxa2xx.c

  Log Message:
  -----------
  hw/arm/pxa2xx: Add missing fallthrough comment

Let's make this file compilable with -Werror=implicit-fallthrough :
Looking at the code, it seems like the fallthrough is intended here,
so we should add the corresponding "/* fallthrough */" comment here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200911121844.404434-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 67263b33af9506d78558b1edfa5a9bf976dc7b3d
      
https://github.com/qemu/qemu/commit/67263b33af9506d78558b1edfa5a9bf976dc7b3d
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:
    M hw/dma/xlnx_dpdma.c
    M hw/net/fsl_etsec/etsec.c
    M hw/sd/sd.c
    M hw/usb/redirect.c
    M include/qemu-common.h
    M net/colo-compare.c
    M net/net.c
    M util/hexdump.c

  Log Message:
  -----------
  util/hexdump: Convert to take a void pointer argument

Most uses of qemu_hexdump() do not take an array of char
as input, forcing use of cast. Since we can use this
helper to dump any kind of buffer, use a pointer to void
argument instead.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200822180950.1343963-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: b42581f5bb40489cb172829e9ab0d6d6dfa37026
      
https://github.com/qemu/qemu/commit/b42581f5bb40489cb172829e9ab0d6d6dfa37026
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:
    M hw/dma/xlnx_dpdma.c
    M hw/net/fsl_etsec/etsec.c
    M hw/net/fsl_etsec/rings.c
    M hw/sd/sd.c
    M hw/usb/redirect.c
    M include/qemu-common.h
    M net/colo-compare.c
    M net/net.c
    M util/hexdump.c
    M util/iov.c

  Log Message:
  -----------
  util/hexdump: Reorder qemu_hexdump() arguments

qemu_hexdump()'s pointer to the buffer and length of the
buffer are closely related arguments but are widely separated
in the argument list order (also, the format of <stdio.h>
function prototypes is usually to have the FILE* argument
coming first).

Reorder the arguments as "fp, prefix, buf, size" which is
more logical.

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200822180950.1343963-3-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 8821e21414468b1810f0ccf38bcbfa5c0bd1d56b
      
https://github.com/qemu/qemu/commit/8821e21414468b1810f0ccf38bcbfa5c0bd1d56b
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-11 (Fri, 11 Sep 2020)

  Changed paths:
    M target/i386/kvm.c

  Log Message:
  -----------
  target/i386/kvm: Add missing fallthrough comment

Let's make this file compilable with -Werror=implicit-fallthrough :
Looking at the code, it seems like the fallthrough is intended here,
so we should add the corresponding "/* fallthrough */" comment here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200911125301.413081-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 842038f55c69673d2983f269be2845e8e18cda05
      
https://github.com/qemu/qemu/commit/842038f55c69673d2983f269be2845e8e18cda05
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-12 (Sat, 12 Sep 2020)

  Changed paths:
    M Kconfig.host
    M Makefile
    M hw/acpi/tco.c
    M hw/arm/pxa2xx.c
    M hw/dma/xlnx_dpdma.c
    M hw/gpio/max7310.c
    M hw/gpio/omap_gpio.c
    M hw/hyperv/vmbus.c
    M hw/isa/isa-bus.c
    M hw/mips/fuloong2e.c
    M hw/net/e1000e_core.c
    M hw/net/fsl_etsec/etsec.c
    M hw/net/fsl_etsec/rings.c
    M hw/sd/sd.c
    M hw/usb/redirect.c
    M include/qemu-common.h
    M meson.build
    M net/colo-compare.c
    M net/net.c
    M target/i386/kvm.c
    M tests/test-vmstate.c
    M util/hexdump.c
    M util/iov.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging

trivial patches pull request 20200911

# gpg: Signature made Fri 11 Sep 2020 20:32:27 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" 
[full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-5.2-pull-request:
  target/i386/kvm: Add missing fallthrough comment
  util/hexdump: Reorder qemu_hexdump() arguments
  util/hexdump: Convert to take a void pointer argument
  hw/arm/pxa2xx: Add missing fallthrough comment
  target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()
  test-vmstate: remove unnecessary code in match_interval_mapping_node
  hw: hyperv: vmbus: Fix 32bit compilation
  kconfig: fix comment referring to old Makefiles
  meson.build: tweak sdl-image error message
  hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
  hw/net/e1000e: Remove overwritten read handler for STATUS register
  Makefile: Skip the meson subdir in cscope/TAGS/ctags
  Makefile: Drop extra phony cscope
  hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)
  hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)
  hw/acpi/tco: Remove unused definitions
  hw/isa/isa-bus: Replace hw_error() by assert()
  hw/mips/fuloong2e: Convert pointless error message to an assert()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#       net/colo-compare.c


Compare: https://github.com/qemu/qemu/compare/f4ef8c9cc10b...842038f55c69