qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 861aa7: build-sys: fix a meson deprecation wa


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 861aa7: build-sys: fix a meson deprecation warning
Date: Fri, 28 Jan 2022 09:00:12 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 861aa79ad8bc1769b6eaf4bdde426decd3d947b8
      
https://github.com/qemu/qemu/commit/861aa79ad8bc1769b6eaf4bdde426decd3d947b8
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M tests/qtest/meson.build

  Log Message:
  -----------
  build-sys: fix a meson deprecation warning

WARNING: Deprecated features used:
 * 0.56.0: {'meson.source_root'}

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220113162148.3621818-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6bee09602100081c25e81573deb92cd22a6d7fec
      
https://github.com/qemu/qemu/commit/6bee09602100081c25e81573deb92cd22a6d7fec
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M qga/meson.build

  Log Message:
  -----------
  build-sys: fix undefined ARCH error

../qga/meson.build:76:4: ERROR: Key ARCH is not in the dictionary.

Fixes commit 823eb013 ("configure, meson: move ARCH to meson.build")

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220114084312.3725242-1-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b422da4b3fb077469f3af480eb8c489abd480cf9
      
https://github.com/qemu/qemu/commit/b422da4b3fb077469f3af480eb8c489abd480cf9
  Author: Marc-André Lureau <marcandre.lureau@redhat.com>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M tests/docker/dockerfiles/fedora-win32-cross.docker
    M tests/docker/dockerfiles/fedora-win64-cross.docker

  Log Message:
  -----------
  docker: add msitools to Fedora/mingw cross

That should help catch build issues/regressions with wixl.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220114084312.3725242-2-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 1206a1ec59e06f0107e40713d63e232135ea577e
      
https://github.com/qemu/qemu/commit/1206a1ec59e06f0107e40713d63e232135ea577e
  Author: Bernhard Beschow <shentey@gmail.com>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M hw/intc/i8259_common.c
    M hw/intc/ioapic_common.c
    M include/hw/i386/ioapic_internal.h
    M include/hw/isa/i8259_internal.h

  Log Message:
  -----------
  intc: Unexport InterruptStatsProviderClass-related functions

The functions are only used within their respective source files, so no
need for exporting.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20220116122327.73048-1-shentey@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: de47b0ff40cae050a1ab674d7f4f097c12c527c6
      
https://github.com/qemu/qemu/commit/de47b0ff40cae050a1ab674d7f4f097c12c527c6
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson.build: Use a function from libfdt 1.5.1 for the library check

The fdt version test in meson.build uses a function from libfdt v1.4.7,
but we require version 1.5.1 nowadays. Thus use a function that has
been introduced in that version instead.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/822
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220118170548.97288-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b269a70810aabe1dd5b2e475a25976fb7d6a0f3b
      
https://github.com/qemu/qemu/commit/b269a70810aabe1dd5b2e475a25976fb7d6a0f3b
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-27 (Thu, 27 Jan 2022)

  Changed paths:
    M include/exec/cpu-all.h
    M include/exec/cpu-common.h

  Log Message:
  -----------
  exec/cpu: Make host pages variables / macros 'target agnostic'

"host" pages are related to the *host* not the *target*,
thus the qemu_host_page_size / qemu_host_page_mask variables
and the HOST_PAGE_ALIGN() / REAL_HOST_PAGE_ALIGN() macros
can be moved to "exec/cpu-common.h" which is target agnostic.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20220120000836.229419-1-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 235b523dba80bec984a96ffc83893d0ccff18312
      
https://github.com/qemu/qemu/commit/235b523dba80bec984a96ffc83893d0ccff18312
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: Use find_program() to resolve the entitlement.sh script

Using ../configure without any particular option generates 31 targets
on Darwin, and meson search for the entitlement.sh script 31 times:

  Program nm found: YES
  Program scripts/undefsym.py found: YES 
(/opt/homebrew/opt/python@3.9/bin/python3.9 /Code/qemu/scripts/undefsym.py)
  Program scripts/feature_to_c.sh found: YES (/bin/sh 
/Code/qemu/scripts/feature_to_c.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Program scripts/entitlement.sh found: YES (/Code/qemu/scripts/entitlement.sh)
  Configuring 50-edk2-i386-secure.json using configuration
  Configuring 50-edk2-x86_64-secure.json using configuration

Use find_program() which seems to cache the script path once found.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220122002052.83745-1-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: bcda7b178fde7797f476e3b066fe5fc76bfa1c43
      
https://github.com/qemu/qemu/commit/bcda7b178fde7797f476e3b066fe5fc76bfa1c43
  Author: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M tests/check-block.sh

  Log Message:
  -----------
  check-block.sh: passthrough -jN flag of make to -j N flag of check

This improves performance of running iotests during "make -jN check".

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211223183933.1497037-1-vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3e233e29178dd9ebd3b3c3382a2e0ebea9e8127d
      
https://github.com/qemu/qemu/commit/3e233e29178dd9ebd3b3c3382a2e0ebea9e8127d
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M meson.build
    M scripts/mtest2make.py

  Log Message:
  -----------
  scripts/mtest2make: add support for SPEED=thorough

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


  Commit: 98487b9035d8540376024df74ab5510fdc37f12e
      
https://github.com/qemu/qemu/commit/98487b9035d8540376024df74ab5510fdc37f12e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M meson.build
    M scripts/mtest2make.py
    M tests/Makefile.include
    M tests/check-block.sh
    M tests/meson.build
    A tests/qemu-iotests/meson.build

  Log Message:
  -----------
  build: make check-block a meson test

"meson test" can be asked to run tests verbosely; this makes it usable
also for qemu-iotests's own harness, and it lets "make check-block"
reuse mtest2make.py's infrastructure to find and build test dependencies.

Adjust check-block.sh to use the standard exit code that reports a test
as skipped.  Alternatively, in the future we could make it produce TAP
output, which is consistent with all other "make check" tests.

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


  Commit: 18c1cdd21d318adf2d02d90e25e9c04f33db76e8
      
https://github.com/qemu/qemu/commit/18c1cdd21d318adf2d02d90e25e9c04f33db76e8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M tests/check-block.sh

  Log Message:
  -----------
  qemu-iotests: require at least an argument to check-block.sh

This is anyway how check-block.sh is used in practice, and by removing the
list of formats in the script we avoid duplication between meson.build
and check-block.sh.

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


  Commit: d316859f4e28c74ab8b618895d2a5e0a865d3cf1
      
https://github.com/qemu/qemu/commit/d316859f4e28c74ab8b618895d2a5e0a865d3cf1
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M tests/check-block.sh
    M tests/qemu-iotests/check
    M tests/qemu-iotests/meson.build
    M tests/qemu-iotests/testenv.py
    M tests/qemu-iotests/testrunner.py

  Log Message:
  -----------
  check-block: replace -makecheck with TAP output

Let "meson test" take care of showing the results of the individual tests,
consistently with other output from "make check V=1".

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


  Commit: a66bd91f030827742778a9e0da19fe55716b4a60
      
https://github.com/qemu/qemu/commit/a66bd91f030827742778a9e0da19fe55716b4a60
  Author: Yang Zhong <yang.zhong@intel.com>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M docs/about/deprecated.rst
    M hw/i386/sgx.c
    M qapi/machine.json
    M qapi/misc-target.json

  Log Message:
  -----------
  qapi: Cleanup SGX related comments and restore @section-size

The SGX NUMA patches were merged into Qemu 7.0 release, we need
clarify detailed version history information and also change
some related comments, which make SGX related comments clearer.

The QMP command schema promises backwards compatibility as standard.
We temporarily restore "@section-size", which can avoid incompatible
API breakage. The "@section-size" will be deprecated in 7.2 version.

Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220120223104.437161-1-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 479ca4ccd54afcd54b0163532709079233d64b97
      
https://github.com/qemu/qemu/commit/479ca4ccd54afcd54b0163532709079233d64b97
  Author: Matheus Ferst <matheus.ferst@eldorado.org.br>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M configure
    M docs/devel/testing.rst

  Log Message:
  -----------
  configure: fix parameter expansion of --cross-cc-cflags options

Without this fix, any use of --cross-cc-cflags-* causes a message like:
$ ../configure --cross-cc-ppc64le=clang --cross-cc-cflags-ppc64le="-target 
powerpc64le-unknown-linux-gnu -sysroot ..."
../configure: 1: eval: cross_cc_cflags_--cross-cc-cflags-ppc64le=-target: not 
found
../configure: 3816: export: cross_cc_cflags_--cross-cc-cflags-ppc64le: bad 
variable name

Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20220120173142.2755077-1-matheus.ferst@eldorado.org.br>
[Fix other occurrences too, noted by Philippe Mathieu-Daudé. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7a1043cef91739ff4b59812d30f1ed2850d3d34e
      
https://github.com/qemu/qemu/commit/7a1043cef91739ff4b59812d30f1ed2850d3d34e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-28 (Fri, 28 Jan 2022)

  Changed paths:
    M configure
    M docs/about/deprecated.rst
    M docs/devel/testing.rst
    M hw/i386/sgx.c
    M hw/intc/i8259_common.c
    M hw/intc/ioapic_common.c
    M include/exec/cpu-all.h
    M include/exec/cpu-common.h
    M include/hw/i386/ioapic_internal.h
    M include/hw/isa/i8259_internal.h
    M meson.build
    M qapi/machine.json
    M qapi/misc-target.json
    M qga/meson.build
    M scripts/mtest2make.py
    M tests/Makefile.include
    M tests/check-block.sh
    M tests/docker/dockerfiles/fedora-win32-cross.docker
    M tests/docker/dockerfiles/fedora-win64-cross.docker
    M tests/meson.build
    M tests/qemu-iotests/check
    A tests/qemu-iotests/meson.build
    M tests/qemu-iotests/testenv.py
    M tests/qemu-iotests/testrunner.py
    M tests/qtest/meson.build

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

* configure and meson fixes
* "meson test" switch for iotests
* deprecation of old SGX QAPI
* unexport InterruptStatsProviderClass-related functions

# gpg: Signature made Fri 28 Jan 2022 10:13:36 GMT
# 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:
  configure: fix parameter expansion of --cross-cc-cflags options
  qapi: Cleanup SGX related comments and restore @section-size
  check-block: replace -makecheck with TAP output
  qemu-iotests: require at least an argument to check-block.sh
  build: make check-block a meson test
  scripts/mtest2make: add support for SPEED=thorough
  check-block.sh: passthrough -jN flag of make to -j N flag of check
  meson: Use find_program() to resolve the entitlement.sh script
  exec/cpu: Make host pages variables / macros 'target agnostic'
  meson.build: Use a function from libfdt 1.5.1 for the library check
  intc: Unexport InterruptStatsProviderClass-related functions
  docker: add msitools to Fedora/mingw cross
  build-sys: fix undefined ARCH error
  build-sys: fix a meson deprecation warning

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


Compare: https://github.com/qemu/qemu/compare/b367db48126d...7a1043cef917



reply via email to

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