qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 62cbfd: oslib-win32: do not rely on macro to get redefined...
Date: Thu, 06 May 2021 11:02:04 -0700 
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 62cbfdd2c51d95b70caea783daa67273d9ba55a8
      
https://github.com/qemu/qemu/commit/62cbfdd2c51d95b70caea783daa67273d9ba55a8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 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: 74a414a1dfdd7a9aa2d716f991c8a5c0853250ad
      
https://github.com/qemu/qemu/commit/74a414a1dfdd7a9aa2d716f991c8a5c0853250ad
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-05-04 (Tue, 04 May 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>
[Check for nvmm_vcpu_stop. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fdc8635e870b7396a8e2fe4fadfdbec0060d5ef4
      
https://github.com/qemu/qemu/commit/fdc8635e870b7396a8e2fe4fadfdbec0060d5ef4
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-05-04 (Tue, 04 May 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: b9bc6169dee36186237f898b41f48956f59a01b1
      
https://github.com/qemu/qemu/commit/b9bc6169dee36186237f898b41f48956f59a01b1
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-05-04 (Tue, 04 May 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: 39becfce13e7de74045002950d899d91190a224b
      
https://github.com/qemu/qemu/commit/39becfce13e7de74045002950d899d91190a224b
  Author: Reinoud Zandijk <reinoud@NetBSD.org>
  Date:   2021-05-04 (Tue, 04 May 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: 4951967d84a0acbf47895add9158e2d4c6056ea0
      
https://github.com/qemu/qemu/commit/4951967d84a0acbf47895add9158e2d4c6056ea0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 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: b8e0c4938b610a56028303dd8a2429cf1de71bb8
      
https://github.com/qemu/qemu/commit/b8e0c4938b610a56028303dd8a2429cf1de71bb8
  Author: Joelle van Dyne <j@getutm.app>
  Date:   2021-05-04 (Tue, 04 May 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: d77e90fa0e987d0fa7611dd399eedc93cf787caa
      
https://github.com/qemu/qemu/commit/d77e90fa0e987d0fa7611dd399eedc93cf787caa
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M configure

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

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


  Commit: 699d388430287b71c0d7ccf76986058259ac7342
      
https://github.com/qemu/qemu/commit/699d388430287b71c0d7ccf76986058259ac7342
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 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: 1b874108a514a359939d12e973ddbba2dcaa3abc
      
https://github.com/qemu/qemu/commit/1b874108a514a359939d12e973ddbba2dcaa3abc
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 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: 9ba5db49aea924175b8f23edd388fa2452206d20
      
https://github.com/qemu/qemu/commit/9ba5db49aea924175b8f23edd388fa2452206d20
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M include/glib-compat.h

  Log Message:
  -----------
  glib-compat: accept G_TEST_SLOW environment variable

Provide an alternative way to pass the desired thoroughness of the
test.

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


  Commit: 4cc10cae64c51e17844dc4358481c393d7bf1ed4
      
https://github.com/qemu/qemu/commit/4cc10cae64c51e17844dc4358481c393d7bf1ed4
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-06 (Thu, 06 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/glib-compat.h
    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 Tue 04 May 2021 13:15:37 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:
  glib-compat: accept G_TEST_SLOW environment variable
  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/d90f154867ec...4cc10cae64c5
reply via email to
[Prev in Thread] Current Thread [Next in Thread]