On 5/4/22 16:06, Paolo Bonzini wrote:
> The following changes since commit f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65:
>
> Merge tag 'pull-9p-20220501' of https://github.com/cschoenebeck/qemu into staging (2022-05-01 07:48:11 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to ec7bd939178789b371df86276ba1d983f2de07ce:
>
> pc: remove -soundhw pcspk (2022-05-01 23:06:15 +0200)
>
> ----------------------------------------------------------------
> * WHPX support for xcr0
> * qga-wss fixes
> * Meson conversions
> * Removed -soundhw pcspk
>
> ----------------------------------------------------------------
> Konstantin Kostiuk (2):
> configure: Add cross prefix for widl tool
> qga-vss: always build qga-vss.tlb when qga-vss.dll is built
>
> Paolo Bonzini (22):
> meson-buildoptions: add support for string options
> meson, configure: move Xen detection to meson
> configure, meson: move iasl detection to meson
> configure: move Windows flags detection to meson
> configure: switch string options to automatic parsing
> meson, configure: move --tls-priority to meson
> meson, configure: move bdrv whitelists to meson
> meson, configure: move --with-pkgversion, CONFIG_STAMP to meson
> meson, configure: move --interp-prefix to meson
> meson: always combine directories with prefix
> configure: switch directory options to automatic parsing
> meson: pass more options directly as -D
> configure: omit options with default values from meson command line
> meson, virtio: place all virtio-pci devices under virtio_pci_ss
> configure: simplify vhost-net-{user, vdpa} configuration
> build: move vhost-vsock configuration to Kconfig
> build: move vhost-scsi configuration to Kconfig
> build: move vhost-user-fs configuration to Kconfig
> meson: create have_vhost_* variables
> meson: use have_vhost_* variables to pick sources
> configure, meson: move vhost options to Meson
> pc: remove -soundhw pcspk
>
> Sunil Muthuswamy (1):
> WHPX: support for xcr0
>
> Kconfig.host | 3 -
> backends/meson.build | 8 +-
> configure | 673 ++----------------------
> docs/meson.build | 2 +-
> hw/audio/pcspk.c | 10 -
> hw/audio/soundhw.c | 27 +-
> hw/net/meson.build | 8 +-
> hw/scsi/Kconfig | 5 +
> hw/virtio/Kconfig | 18 +-
> hw/virtio/meson.build | 34 +-
> include/hw/audio/soundhw.h | 3 -
> include/hw/virtio/virtio-scsi.h | 2 -
> meson.build | 256 ++++++---
> meson_options.txt | 28 +-
> net/meson.build | 12 +-
> qga/vss-win32/meson.build | 4 +-
> scripts/ci/org.centos/stream/8/x86_64/configure | 3 -
> scripts/meson-buildoptions.py | 86 ++-
> scripts/meson-buildoptions.sh | 74 ++-
> scripts/qemu-stamp.py | 24 +
> scripts/xen-detect.c | 203 +++++++
> target/i386/whpx/whpx-all.c | 87 +++
> target/i386/whpx/whpx-internal.h | 3 +
> tests/meson.build | 2 +-
> tests/qtest/meson.build | 4 +-
> tools/meson.build | 2 +-
> 26 files changed, 776 insertions(+), 805 deletions(-)
> create mode 100644 scripts/qemu-stamp.py
> create mode 100644 scripts/xen-detect.c
New errors today:
In file included from
/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
from ../block.c:26:
../block.c: In function ‘bdrv_format_is_whitelisted’:
./config-host.h:44:163: error: called object is not a function or function pointer
#define CONFIG_BDRV_RW_WHITELIST "qcow2", "raw", "file", "host_device", "nbd", "iscsi",
"rbd", "blkdebug", "luks", "null-co", "nvme", "copy-on-read", "throttle", "gluster"
^~~~~~~~~
../block.c:478:9: note: in expansion of macro ‘CONFIG_BDRV_RW_WHITELIST’
CONFIG_BDRV_RW_WHITELIST
^~~~~~~~~~~~~~~~~~~~~~~~
In file included from
/home/gitlab-runner/builds/Jpwtyaz7/0/qemu-project/qemu/include/qemu/osdep.h:30,
from ../block.c:26:
./config-host.h:42:66: error: called object is not a function or function pointer
#define CONFIG_BDRV_RO_WHITELIST "vmdk", "vhdx", "vpc", "https", "ssh"
^~~~~
../block.c:482:9: note: in expansion of macro ‘CONFIG_BDRV_RO_WHITELIST’
CONFIG_BDRV_RO_WHITELIST
^~~~~~~~~~~~~~~~~~~~~~~~
https://gitlab.com/qemu-project/qemu/-/jobs/2418086124
r~