[Qemu-commits] [qemu/qemu] 4b870f: vhost-vdpa: fix indentation in vdpa_ops

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 4b870f1a05336690b169512ef9f3c93fee8fde34
      
https://github.com/qemu/qemu/commit/4b870f1a05336690b169512ef9f3c93fee8fde34
  Author: Stefano Garzarella <sgarzare@redhat.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

  Log Message:
  -----------
  vhost-vdpa: fix indentation in vdpa_ops

This patch fixes wrong indentation of some vdpa_ops fields introduced
with the initial commit 108a64818e ("vhost-vdpa: introduce vhost-vdpa
backend")

Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200916152634.56917-1-sgarzare@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 3e8529dd8554d77467734db6f84b3619eeeb6895
      
https://github.com/qemu/qemu/commit/3e8529dd8554d77467734db6f84b3619eeeb6895
  Author: Laurent Vivier <lvivier@redhat.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: fix static flag summary

'static build:' must display value of CONFIG_STATIC rather than value of
CONFIG_TOOLS.

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


  Commit: 986d4f78742b7419f01d8ede242abde6f2f74cf2
      
https://github.com/qemu/qemu/commit/986d4f78742b7419f01d8ede242abde6f2f74cf2
  Author: Li Qiang <liq3ea@163.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

  Log Message:
  -----------
  virtio: vdpa: omit check return of g_malloc

If g_malloc fails, the application will be terminated.
No need to check the return value of g_malloc.

Signed-off-by: Li Qiang <liq3ea@163.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200819144309.67579-1-liq3ea@163.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: ab800bb38b2d275209071e6c4f38c4269c178102
      
https://github.com/qemu/qemu/commit/ab800bb38b2d275209071e6c4f38c4269c178102
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add *.pyc back to the .gitignore file

Python still dumps its bytecode into the source directory, so
we should continue to ignore the *.pyc files.

Fixes: 0e72b7df4d ("Simplify the .gitignore file")
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200919101859.28739-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: 9e32d4ead3531f70d26e374219884d42e5d8b170
      
https://github.com/qemu/qemu/commit/9e32d4ead3531f70d26e374219884d42e5d8b170
  Author: Laurent Vivier <lvivier@redhat.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M hw/virtio/vhost-vdpa.c

  Log Message:
  -----------
  vhost-vdpa: remove useless variable

in vhost_vdpa_listener_region_del(), try_unmap is always true and so,
vhost_vdpa_dma_unmap() is always called. We can remove the variable

Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200920152024.860172-1-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


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

  Changed paths:
    M include/qemu/timer.h

  Log Message:
  -----------
  timer: Fix timer_mod_anticipate() documentation

timer_mod_anticipate() will be scaled to the timer unit,
which is not always nanosecond. Fix the documentation.

Fixes: add40e9777d ("timer: add timer_mod_anticipate*")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200920155042.400737-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


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

  Changed paths:
    M migration/multifd.c

  Log Message:
  -----------
  migration/multifd: Remove superfluous semicolons

checkpatch.pl report superfluous semicolons since commit
ee0f3c09e01, but this one was missed:

  scripts/checkpatch.pl d32ca5ad798~..d32ca5ad798
  ERROR: superfluous trailing semicolon
  #498: FILE: migration/multifd.c:308:
  +    ram_counters.transferred += transferred;;
  total: 1 errors, 1 warnings, 2073 lines checked

Fixes: d32ca5ad798 ("multifd: Split multifd code into its own file")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Message-Id: <20200921040231.437653-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>


  Commit: c66790b5dfc2430c04bf5876cf485e1f538af7f2
      
https://github.com/qemu/qemu/commit/c66790b5dfc2430c04bf5876cf485e1f538af7f2
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-09-23 (Wed, 23 Sep 2020)

  Changed paths:
    M docs/system/deprecated.rst

  Log Message:
  -----------
  docs/system/deprecated: Move lm32 and unicore32 to the right section

lm32 and unicore32 are softmmut targets, and not linux-user targets.

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


  Commit: 92d09502676678c8ebb1ad830666b323d3c88f9d
      
https://github.com/qemu/qemu/commit/92d09502676678c8ebb1ad830666b323d3c88f9d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-09-28 (Mon, 28 Sep 2020)

  Changed paths:
    M .gitignore
    M docs/system/deprecated.rst
    M hw/virtio/vhost-vdpa.c
    M include/qemu/timer.h
    M meson.build
    M migration/multifd.c

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

Trivial Patches Pull request 20200928

# gpg: Signature made Mon 28 Sep 2020 10:15:00 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:
  docs/system/deprecated: Move lm32 and unicore32 to the right section
  migration/multifd: Remove superfluous semicolons
  timer: Fix timer_mod_anticipate() documentation
  vhost-vdpa: remove useless variable
  Add *.pyc back to the .gitignore file
  virtio: vdpa: omit check return of g_malloc
  meson: fix static flag summary
  vhost-vdpa: fix indentation in vdpa_ops

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


Compare: https://github.com/qemu/qemu/compare/8d16e72f2d4d...92d095026766