qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 068dee: oslib-win32: do not rely on macro to


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 068dee: oslib-win32: do not rely on macro to get redefined...
Date: Sat, 01 May 2021 06:10:09 -0700

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 068dee2ba38c03cf7c0d97c490a08e5078014583
      
https://github.com/qemu/qemu/commit/068dee2ba38c03cf7c0d97c490a08e5078014583
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-21 (Wed, 21 Apr 2021)

  Changed paths:
    M util/oslib-win32.c

  Log Message:
  -----------
  oslib-win32: do not rely on macro to get redefined function name

On Windows with glib <2.50, g_poll is redefined to use the variant
defined in util/oslib-win32.c.  Use the same name in the declaration
and definition for ease of grepping.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 2521674eb903cc70ed603ae7614eb400ce72e7c2
      
https://github.com/qemu/qemu/commit/2521674eb903cc70ed603ae7614eb400ce72e7c2
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M accel/Kconfig
    M configure
    M meson.build
    M meson_options.txt
    M qemu-options.hx

  Log Message:
  -----------
  Add NVMM accelerator: configure and build logic

Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>

Message-Id: <20210402202535.11550-2-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: ba09dc4faea6f4fd90658253eb0322dc60913dc6
      
https://github.com/qemu/qemu/commit/ba09dc4faea6f4fd90658253eb0322dc60913dc6
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M target/i386/meson.build
    A target/i386/nvmm/meson.build
    A target/i386/nvmm/nvmm-accel-ops.c
    A target/i386/nvmm/nvmm-accel-ops.h
    A target/i386/nvmm/nvmm-all.c

  Log Message:
  -----------
  Add NVMM accelerator: x86 CPU support

Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>

Message-Id: <20210402202535.11550-3-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: dd0ae4da2a2b5e02b77d3d5710d912af152863ae
      
https://github.com/qemu/qemu/commit/dd0ae4da2a2b5e02b77d3d5710d912af152863ae
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M include/sysemu/hw_accel.h
    A include/sysemu/nvmm.h
    M target/i386/helper.c

  Log Message:
  -----------
  Add NVMM accelerator: acceleration enlightenments

Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>

Message-Id: <20210402202535.11550-4-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: e04aefa0c99834267bd680377b9bb10234d5eaaf
      
https://github.com/qemu/qemu/commit/e04aefa0c99834267bd680377b9bb10234d5eaaf
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  Add NVMM Accelerator: add maintainers for NetBSD/NVMM

Signed-off-by: Kamil Rytarowski <kamil@NetBSD.org>
Signed-off-by: Reinoud Zandijk <reinoud@NetBSD.org>

Message-Id: <20210402202535.11550-5-reinoud@NetBSD.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 41d34e89152def31925a38f62edfaf2e433e4592
      
https://github.com/qemu/qemu/commit/41d34e89152def31925a38f62edfaf2e433e4592
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M block/block-copy.c
    M blockjob.c
    M include/qemu/ratelimit.h

  Log Message:
  -----------
  ratelimit: protect with a mutex

Right now, rate limiting is protected by the AioContext mutex, which is
taken for example both by the block jobs and by qmp_block_job_set_speed
(via find_block_job).

We would like to remove the dependency of block layer code on the
AioContext mutex, since most drivers and the core I/O code are already
not relying on it.  However, there is no existing lock that can easily
be taken by both ratelimit_set_speed and ratelimit_calculate_delay,
especially because the latter might run in coroutine context (and
therefore under a CoMutex) but the former will not.

Since concurrent calls to ratelimit_calculate_delay are not possible,
one idea could be to use a seqlock to get a snapshot of slice_ns and
slice_quota.  But for now keep it simple, and just add a mutex to the
RateLimit struct; block jobs are generally not performance critical to
the point of optimizing the clock cycles spent in synchronization.

This also requires the introduction of init/destroy functions, so
add them to the two users of ratelimit.h.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 02bf70bbf0a9c74789a2fb16b36267de81043b70
      
https://github.com/qemu/qemu/commit/02bf70bbf0a9c74789a2fb16b36267de81043b70
  Author: Joelle van Dyne <j@getutm.app>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M configure
    M meson.build
    M net/slirp.c

  Log Message:
  -----------
  slirp: add configure option to disable smbd

Replace Windows specific macro with a more generic feature detection
macro. Allows slirp smb feature to be disabled manually as well.

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Joelle van Dyne <j@getutm.app>
Message-Id: <20210315180341.31638-5-j@getutm.app>
[Use $default_feature as the default. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b059c89866e95ffc7450e69146b93ea85a3bf6e2
      
https://github.com/qemu/qemu/commit/b059c89866e95ffc7450e69146b93ea85a3bf6e2
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: reindent meson invocation

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4477a59f66a8e5f241ee8e15dad33d8a089d1e93
      
https://github.com/qemu/qemu/commit/4477a59f66a8e5f241ee8e15dad33d8a089d1e93
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: handle meson options that have changed type

Usually Meson uses pre-serialized information in meson-private to
speed up re-runs.  This is not possible for version changes, where
Meson instead rebuilds the serialized information using cmd_line.txt.
In some cases cmd_line.txt can contain stale information, since it
is not rebuild except when "meson setup" is invoked.  Update it in
the configure script to allow upgrading our Meson version.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 29740bdf1418c1193524356389cec825051c7a64
      
https://github.com/qemu/qemu/commit/29740bdf1418c1193524356389cec825051c7a64
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-04-30 (Fri, 30 Apr 2021)

  Changed paths:
    M .gitlab-ci.yml

  Log Message:
  -----------
  gitlab-ci: use --meson=internal for CFI jobs

If we use the system Meson but it is too old, the subsequent "meson configure"
will fail.  Always use the submodule when building with CFI.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a31aa2127edea24a76f5a1ec1eea1869a1a1a55f
      
https://github.com/qemu/qemu/commit/a31aa2127edea24a76f5a1ec1eea1869a1a1a55f
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-01 (Sat, 01 May 2021)

  Changed paths:
    M .gitlab-ci.yml
    M MAINTAINERS
    M accel/Kconfig
    M block/block-copy.c
    M blockjob.c
    M configure
    M include/qemu/ratelimit.h
    M include/sysemu/hw_accel.h
    A include/sysemu/nvmm.h
    M meson.build
    M meson_options.txt
    M net/slirp.c
    M qemu-options.hx
    M target/i386/helper.c
    M target/i386/meson.build
    A target/i386/nvmm/meson.build
    A target/i386/nvmm/nvmm-accel-ops.c
    A target/i386/nvmm/nvmm-accel-ops.h
    A target/i386/nvmm/nvmm-all.c
    M util/oslib-win32.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

* NetBSD NVMM support
* RateLimit mutex
* Prepare for Meson 0.57 upgrade

# gpg: Signature made Fri 30 Apr 2021 20:40:04 BST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini-gitlab/tags/for-upstream:
  gitlab-ci: use --meson=internal for CFI jobs
  configure: handle meson options that have changed type
  configure: reindent meson invocation
  slirp: add configure option to disable smbd
  ratelimit: protect with a mutex
  Add NVMM Accelerator: add maintainers for NetBSD/NVMM
  Add NVMM accelerator: acceleration enlightenments
  Add NVMM accelerator: x86 CPU support
  Add NVMM accelerator: configure and build logic
  oslib-win32: do not rely on macro to get redefined function name

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


Compare: https://github.com/qemu/qemu/compare/752f26d69b2d...a31aa2127ede



reply via email to

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