The following changes since commit 2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f:

  Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into staging (2022-02-14 19:54:00 +0000)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 3dd33fd665e7fb041350849e35408f679dfa7383:

  configure, meson: move CONFIG_IASL to a Meson option (2022-02-15 09:36:13 +0100)

----------------------------------------------------------------
* More Meson conversions (0.59.x now required rather than suggested)
* UMIP support for TCG x86
* Fix migration crash
* Restore error output for check-block

----------------------------------------------------------------
Gareth Webb (1):
      target/i386: add TCG support for UMIP

Marc-André Lureau (9):
      qga/vss-win32: fix midl arguments
      meson: drop --with-win-sdk
      qga/vss-win32: use widl if available
      qga/vss: use standard windows headers location
      configure, meson: replace VSS SDK checks and options with --enable-vss-sdk
      meson: do not make qga/vss-win32/meson.build conditional on C++ presence
      qga/vss-win32: require widl/midl, remove pre-built TLB file
      meson: require dynamic linking for VSS support
      meson, configure: move ntddscsi API check to meson

Paolo Bonzini (18):
      meson: use .allowed() method for features
      meson: use .require() and .disable_auto_if() method for features
      configure, meson: move AVX tests to meson
      configure, meson: move membarrier test to meson
      configure, meson: move AF_ALG test to meson
      configure, meson: move libnuma detection to meson
      configure, meson: move TPM check to meson
      configure, meson: cleanup qemu-ga libraries
      configure, meson: move image format options to meson_options.txt
      configure, meson: move block layer options to meson_options.txt
      meson: define qemu_cflags/qemu_ldflags
      configure, meson: move some default-disabled options to meson_options.txt
      configure, meson: move coroutine options to meson_options.txt
      configure, meson: move smbd options to meson_options.txt
      configure, meson: move guest-agent, tools to meson
      meson: refine check for whether to look for virglrenderer
      configure, meson: move OpenGL check to meson
      configure, meson: move CONFIG_IASL to a Meson option

Peter Xu (1):
      memory: Fix qemu crash on starting dirty log twice with stopped VM

Thomas Huth (1):
      tests/qemu-iotests/testrunner: Print diff to stderr in TAP mode

 backends/tpm/meson.build           |  14 +-
 block/meson.build                  |  51 ++-
 configure                          | 638 +------------------------------------
 contrib/vhost-user-gpu/meson.build |   3 +-
 crypto/meson.build                 |   6 +-
 docs/devel/kconfig.rst             |   2 +-
 docs/meson.build                   |   2 -
 hw/acpi/meson.build                |   4 +-
 meson.build                        | 445 +++++++++++++++++---------
 meson_options.txt                  |  66 ++++
 migration/meson.build              |   4 +-
 net/slirp.c                        |  16 +-
 qga/commands-win32.c               |   6 +-
 qga/meson.build                    |  55 +++-
 qga/vss-win32/install.cpp          |   2 +-
 qga/vss-win32/meson.build          |  52 +--
 qga/vss-win32/provider.cpp         |   4 +-
 qga/vss-win32/qga-vss.tlb          | Bin 1528 -> 0 bytes
 qga/vss-win32/requester.cpp        |   4 +-
 qga/vss-win32/vss-common.h         |   6 +-
 scripts/meson-buildoptions.py      |   2 +
 scripts/meson-buildoptions.sh      |  92 ++++++
 softmmu/memory.c                   |  65 ++--
 softmmu/meson.build                |   5 +-
 target/i386/cpu.c                  |   2 +-
 target/i386/cpu.h                  |   4 +-
 target/i386/helper.c               |   8 +-
 target/i386/tcg/translate.c        |  15 +
 tests/Makefile.include             |   2 +-
 tests/check-block.sh               |   4 -
 tests/meson.build                  |   2 +-
 tests/qemu-iotests/meson.build     |   2 +-
 tests/qemu-iotests/testrunner.py   |   5 +-
 tests/unit/meson.build             |   6 +-
 tools/meson.build                  |  31 +-
 ui/meson.build                     |  16 +-
 util/meson.build                   |   4 +-
 37 files changed, 714 insertions(+), 931 deletions(-)
 delete mode 100644 qga/vss-win32/qga-vss.tlb
-- 
2.34.1

On Tue, 15 Feb 2022 at 09:35, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 2d88a3a595f1094e3ecc6cd2fd1e804634c84b0f:
>
>   Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upstream' into staging (2022-02-14 19:54:00 +0000)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 3dd33fd665e7fb041350849e35408f679dfa7383:
>
>   configure, meson: move CONFIG_IASL to a Meson option (2022-02-15 09:36:13 +0100)
>
> ----------------------------------------------------------------
> * More Meson conversions (0.59.x now required rather than suggested)
> * UMIP support for TCG x86
> * Fix migration crash
> * Restore error output for check-block
>
> ----------------------------------------------------------------

Hi; this fails to build on OpenBSD (on the tests/vm/ setup).

Meson thinks it's found OpenGL:
    OpenGL support (epoxy)       : YES 1.5.4

but either it's wrong or else it's not putting the right
include directory onto the path, because the compiler
fails to find the headers:

In file included from ../src/hw/arm/virt.c:42:
In file included from
/home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-calxeda-xgmac.h:17:
In file included from
/home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-platform.h:20:
In file included from
/home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-common.h:27:
/home/qemu/qemu-test.sr5128/src/include/ui/console.h:11:11: fatal
error: 'epoxy/gl.h' file not found
# include <epoxy/gl.h>
          ^~~~~~~~~~~~
1 error generated.

thanks
-- PMM

On 2/16/22 10:56, Peter Maydell wrote:
> Hi; this fails to build on OpenBSD (on the tests/vm/ setup).
> 
> Meson thinks it's found OpenGL:
>      OpenGL support (epoxy)       : YES 1.5.4
> 
> but either it's wrong or else it's not putting the right
> include directory onto the path, because the compiler
> fails to find the headers:
> 
> In file included from ../src/hw/arm/virt.c:42:
> In file included from
> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-calxeda-xgmac.h:17:
> In file included from
> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-platform.h:20:
> In file included from
> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-common.h:27:
> /home/qemu/qemu-test.sr5128/src/include/ui/console.h:11:11: fatal
> error: 'epoxy/gl.h' file not found
> # include <epoxy/gl.h>
>            ^~~~~~~~~~~~
> 1 error generated.

Yeah, there's a lot of uses of ui/console.h and they all need 
epoxy/gl.h.  That's in need of some cleanup.

Paolo

On Wed, 16 Feb 2022 at 14:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> On 2/16/22 10:56, Peter Maydell wrote:
> > Hi; this fails to build on OpenBSD (on the tests/vm/ setup).
> >
> > Meson thinks it's found OpenGL:
> >      OpenGL support (epoxy)       : YES 1.5.4
> >
> > but either it's wrong or else it's not putting the right
> > include directory onto the path, because the compiler
> > fails to find the headers:
> >
> > In file included from ../src/hw/arm/virt.c:42:
> > In file included from
> > /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-calxeda-xgmac.h:17:
> > In file included from
> > /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-platform.h:20:
> > In file included from
> > /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-common.h:27:
> > /home/qemu/qemu-test.sr5128/src/include/ui/console.h:11:11: fatal
> > error: 'epoxy/gl.h' file not found
> > # include <epoxy/gl.h>
> >            ^~~~~~~~~~~~
> > 1 error generated.
>
> Yeah, there's a lot of uses of ui/console.h and they all need
> epoxy/gl.h.  That's in need of some cleanup.

Why can't meson just do the same thing configure was doing,
ie add the include path to the cflags and the library path
to the linker flags?

thanks
-- PMM

On 2/16/22 15:41, Peter Maydell wrote:
> On Wed, 16 Feb 2022 at 14:03, Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> On 2/16/22 10:56, Peter Maydell wrote:
>>> Hi; this fails to build on OpenBSD (on the tests/vm/ setup).
>>>
>>> Meson thinks it's found OpenGL:
>>>       OpenGL support (epoxy)       : YES 1.5.4
>>>
>>> but either it's wrong or else it's not putting the right
>>> include directory onto the path, because the compiler
>>> fails to find the headers:
>>>
>>> In file included from ../src/hw/arm/virt.c:42:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-calxeda-xgmac.h:17:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-platform.h:20:
>>> In file included from
>>> /home/qemu/qemu-test.sr5128/src/include/hw/vfio/vfio-common.h:27:
>>> /home/qemu/qemu-test.sr5128/src/include/ui/console.h:11:11: fatal
>>> error: 'epoxy/gl.h' file not found
>>> # include <epoxy/gl.h>
>>>             ^~~~~~~~~~~~
>>> 1 error generated.
>>
>> Yeah, there's a lot of uses of ui/console.h and they all need
>> epoxy/gl.h.  That's in need of some cleanup.
> 
> Why can't meson just do the same thing configure was doing,
> ie add the include path to the cflags and the library path
> to the linker flags?

Yes, it can do that as well.  I found it now:

@@ -43,7 +43,6 @@ vnc_ss.add(zlib, png, jpeg, gnutls)
  vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
  softmmu_ss.add_all(when: vnc, if_true: vnc_ss)
  softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c'))
-specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl)

  ui_modules = {}


Paolo