qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 705f7f: Fix parameter type in vhost migration


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 705f7f: Fix parameter type in vhost migration log path
Date: Thu, 11 Jun 2020 13:30:31 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 705f7f2fce25e774e19f6853cd92ebaf909958f3
      
https://github.com/qemu/qemu/commit/705f7f2fce25e774e19f6853cd92ebaf909958f3
  Author: Raphael Norwitz <raphael.s.norwitz@gmail.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/virtio/vhost.c

  Log Message:
  -----------
  Fix parameter type in vhost migration log path

The ‘enable’ parameter to the vhost_migration_log() function is given as
an int, but "true"/"false" values are passed in wherever it is invoked.
Inside the function itself it is only ever compared with bool values.
Therefore the parameter value itself should be changed to bool.

Signed-off-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <CAFubqFtqNZw=Y-ar3N=3zTQi6LkKg_G-7W7OOHHbE7Y1fV7HAQ@mail.gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 0561dfac082becdd9e89110249a27b309b62aa9f
      
https://github.com/qemu/qemu/commit/0561dfac082becdd9e89110249a27b309b62aa9f
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M net/net.c

  Log Message:
  -----------
  net: Do not include a newline in the id of -nic devices

The '\n' sneaked in by accident here, an "id" string should really
not contain a newline character at the end.

Fixes: 78cd6f7bf6b ('net: Add a new convenience option "--nic" ...')
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200518074352.23125-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 449fd1fc0041facd8c9bef0c7eb8d63fd0418a6a
      
https://github.com/qemu/qemu/commit/449fd1fc0041facd8c9bef0c7eb8d63fd0418a6a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M .mailmap

  Log Message:
  -----------
  .mailmap: Update Fred Konrad email address

Update Fred Konrad email address to avoid emails bouncing.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20200518103920.10699-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3b34ee6780f5ebf4c641a7522288b9e7e4e123d6
      
https://github.com/qemu/qemu/commit/3b34ee6780f5ebf4c641a7522288b9e7e4e123d6
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/dma/puv3_dma.c
    M hw/gpio/puv3_gpio.c
    M hw/intc/puv3_intc.c
    M hw/misc/puv3_pm.c
    M hw/timer/puv3_ost.c
    M hw/unicore32/puv3.c

  Log Message:
  -----------
  hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf()

Replace some debug printf() calls by qemu_log_mask(LOG_GUEST_ERROR).

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


  Commit: 18cdeb72bb9ad7a574be68175e72068ced70e443
      
https://github.com/qemu/qemu/commit/18cdeb72bb9ad7a574be68175e72068ced70e443
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/isa/apm.c
    M hw/isa/trace-events

  Log Message:
  -----------
  hw/isa/apm: Convert debug printf()s to trace events

Convert APM_DPRINTF() to trace events and remove ifdef'ry.

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


  Commit: d263425bce8620d608410e68e492adb7ef072465
      
https://github.com/qemu/qemu/commit/d263425bce8620d608410e68e492adb7ef072465
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/misc/auxbus.c

  Log Message:
  -----------
  hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf

Replace a deprecated DPRINTF() call by qemu_log_mask(LOG_UNIMP).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200606070216.30952-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 547f8f6452579506fbde2f0a1aa5fc0469dc45a3
      
https://github.com/qemu/qemu/commit/547f8f6452579506fbde2f0a1aa5fc0469dc45a3
  Author: Eric Blake <eblake@redhat.com>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M docs/tools/qemu-img.rst

  Log Message:
  -----------
  qemu-img: Fix doc typo for 'bitmap' subcommand

Prefer a consistent naming for the --merge argument.

Fixes: 3b51ab4bf
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200529144527.1943527-1-eblake@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 7df9f0283905c25d9c317f782cde9f52bb1916ce
      
https://github.com/qemu/qemu/commit/7df9f0283905c25d9c317f782cde9f52bb1916ce
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/arm/aspeed.c

  Log Message:
  -----------
  hw/arm/aspeed: Correct DRAM container region size

memory_region_set_size() handle the 16 Exabytes limit by
special-casing the UINT64_MAX value. This is not a problem
for the 32-bit maximum, 4 GiB.
By using the UINT32_MAX value, the aspeed-ram-container
MemoryRegion ends up missing 1 byte:

 $ qemu-system-arm -M ast2600-evb -S -monitor stdio
 (qemu) info mtree

  address-space: aspeed.fmc-ast2600-dma-dram
    0000000080000000-000000017ffffffe (prio 0, i/o): aspeed-ram-container
      0000000080000000-00000000bfffffff (prio 0, ram): ram
      00000000c0000000-ffffffffffffffff (prio 0, i/o): max_ram

Fix by using the correct value. We now have:

  address-space: aspeed.fmc-ast2600-dma-dram
    0000000080000000-000000017fffffff (prio 0, i/o): aspeed-ram-container
      0000000080000000-00000000bfffffff (prio 0, ram): ram
      00000000c0000000-ffffffffffffffff (prio 0, i/o): max_ram

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601142930.29408-2-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 94c1253e3e55d82806d00a94cbbde209738ed1a6
      
https://github.com/qemu/qemu/commit/94c1253e3e55d82806d00a94cbbde209738ed1a6
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/hppa/dino.c

  Log Message:
  -----------
  hw/hppa/dino: Use the IEC binary prefix definitions

IEC binary prefixes ease code review: the unit is explicit.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601142930.29408-7-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 039a93b02f37a23f49e4b1d0c4a075829a9d49d3
      
https://github.com/qemu/qemu/commit/039a93b02f37a23f49e4b1d0c4a075829a9d49d3
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M hw/i386/xen/xen-hvm.c

  Log Message:
  -----------
  hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions

IEC binary prefixes ease code review: the unit is explicit.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Paul Durrant <paul@xen.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601142930.29408-8-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3fb79344bd41bed9e2975dab49d7d1c8fde9a37a
      
https://github.com/qemu/qemu/commit/3fb79344bd41bed9e2975dab49d7d1c8fde9a37a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M target/i386/cpu.c

  Log Message:
  -----------
  target/i386/cpu: Use the IEC binary prefix definitions

IEC binary prefixes ease code review: the unit is explicit.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200601142930.29408-9-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: c421f81826386687ace2066c81ef661e81a8d0a2
      
https://github.com/qemu/qemu/commit/c421f81826386687ace2066c81ef661e81a8d0a2
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M target/unicore32/helper.c

  Log Message:
  -----------
  target/unicore32: Remove unused headers

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


  Commit: 7a7b66323435c998c63797e33bb5403bc31e2570
      
https://github.com/qemu/qemu/commit/7a7b66323435c998c63797e33bb5403bc31e2570
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M target/unicore32/helper.c

  Log Message:
  -----------
  target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR)

Replace disabled DPRINTF() by qemu_log_mask(GUEST_ERROR).

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


  Commit: c7a856b42e403e2b86c8ed026a3cd31e0a04973d
      
https://github.com/qemu/qemu/commit/c7a856b42e403e2b86c8ed026a3cd31e0a04973d
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

  Changed paths:
    M default-configs/unicore32-softmmu.mak
    M target/unicore32/helper.c

  Log Message:
  -----------
  target/unicore32: Prefer qemu_semihosting_log_out() over curses

Use the common API for semihosting logging.

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


  Commit: 1db889c71f37d5bad411b2ef83a69739d9d598f9
      
https://github.com/qemu/qemu/commit/1db889c71f37d5bad411b2ef83a69739d9d598f9
  Author: Philippe Mathieu-Daudé <philmd@redhat.com>
  Date:   2020-06-10 (Wed, 10 Jun 2020)

  Changed paths:
    M hw/openrisc/openrisc_sim.c

  Log Message:
  -----------
  hw/openrisc/openrisc_sim: Add assertion to silence GCC warning

When compiling with GCC 10 (Fedora 32) using CFLAGS=-O2 we get:

    CC      or1k-softmmu/hw/openrisc/openrisc_sim.o
  hw/openrisc/openrisc_sim.c: In function ‘openrisc_sim_init’:
  hw/openrisc/openrisc_sim.c:87:42: error: ‘cpu_irqs[0]’ may be used 
uninitialized in this function [-Werror=maybe-uninitialized]
     87 |         sysbus_connect_irq(s, i, cpu_irqs[i][irq_pin]);
        |                                  ~~~~~~~~^~~

While humans can tell smp_cpus will always be in the [1, 2] range,
(openrisc_sim_machine_init sets mc->max_cpus = 2), the compiler
can't.

Add an assertion to give the compiler a hint there's no use of
uninitialized data.

Buglink: https://bugs.launchpad.net/qemu/+bug/1874073
Reported-by: Martin Liška <mliska@suse.cz>
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Stafford Horne <shorne@gmail.com>
Message-Id: <20200608160611.16966-1-philmd@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: fe18e6eecdd45d3dff0c8968cbb07c5e02fbe4c8
      
https://github.com/qemu/qemu/commit/fe18e6eecdd45d3dff0c8968cbb07c5e02fbe4c8
  Author: KONRAD Frederic <frederic.konrad@adacore.com>
  Date:   2020-06-10 (Wed, 10 Jun 2020)

  Changed paths:
    M hw/semihosting/console.c

  Log Message:
  -----------
  semihosting: remove the pthread include which seems unused

This have been introduced by:
  8de702cb677c8381fb702cae252d6b69aa4c653b

It doesn't seem to be used so remove it.

Signed-off-by: KONRAD Frederic <frederic.konrad@adacore.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <1589806958-23511-1-git-send-email-frederic.konrad@adacore.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 77c9e078b4da58b5fcdeaefec03f68407d8bb53a
      
https://github.com/qemu/qemu/commit/77c9e078b4da58b5fcdeaefec03f68407d8bb53a
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-06-11 (Thu, 11 Jun 2020)

  Changed paths:
    M .mailmap
    M default-configs/unicore32-softmmu.mak
    M hw/arm/aspeed.c
    M hw/dma/puv3_dma.c
    M hw/gpio/puv3_gpio.c
    M hw/hppa/dino.c
    M hw/i386/xen/xen-hvm.c
    M hw/intc/puv3_intc.c
    M hw/isa/apm.c
    M hw/isa/trace-events
    M hw/misc/auxbus.c
    M hw/misc/puv3_pm.c
    M hw/openrisc/openrisc_sim.c
    M hw/semihosting/console.c
    M hw/timer/puv3_ost.c
    M hw/unicore32/puv3.c
    M hw/virtio/vhost.c
    M net/net.c
    M target/i386/cpu.c
    M target/unicore32/helper.c

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

Trivial branch pull request 20200610

Convert DPRINTF() to traces or qemu_logs
Use IEC binary prefix definitions
Use qemu_semihosting_log_out() in target/unicore32
Some code and doc cleanup

# gpg: Signature made Wed 10 Jun 2020 14:08:36 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.1-pull-request:
  semihosting: remove the pthread include which seems unused
  hw/openrisc/openrisc_sim: Add assertion to silence GCC warning
  target/unicore32: Prefer qemu_semihosting_log_out() over curses
  target/unicore32: Replace DPRINTF() by qemu_log_mask(GUEST_ERROR)
  target/unicore32: Remove unused headers
  target/i386/cpu: Use the IEC binary prefix definitions
  hw/i386/xen/xen-hvm: Use the IEC binary prefix definitions
  hw/hppa/dino: Use the IEC binary prefix definitions
  hw/arm/aspeed: Correct DRAM container region size
  qemu-img: Fix doc typo for 'bitmap' subcommand
  hw/misc/auxbus: Use qemu_log_mask(UNIMP) instead of debug printf
  hw/isa/apm: Convert debug printf()s to trace events
  hw/unicore32/puv3: Use qemu_log_mask(ERROR) instead of debug printf()
  .mailmap: Update Fred Konrad email address
  net: Do not include a newline in the id of -nic devices
  Fix parameter type in vhost migration log path

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

# Conflicts:
#       .mailmap


Compare: https://github.com/qemu/qemu/compare/3666f684761a...77c9e078b4da



reply via email to

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